dlgctrl.cxx (9f62ea84) dlgctrl.cxx (ad3a95a3)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 821 unchanged lines hidden (view full) ---

830 {
831 pWindow = pWindow->ImplGetWindow();
832
833 nStyle = pWindow->GetStyle();
834
835 if ( nStyle & WB_GROUP )
836 break;
837
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 821 unchanged lines hidden (view full) ---

830 {
831 pWindow = pWindow->ImplGetWindow();
832
833 nStyle = pWindow->GetStyle();
834
835 if ( nStyle & WB_GROUP )
836 break;
837
838 if ( pWindow->IsVisible() && pWindow->IsEnabled() && pWindow->IsInputEnabled() )
838//IAccessibility2 Implementation 2009-----
839 //Solution:Pure window shouldn't get window after controls such as buttons.
840 //if ( pWindow->IsVisible() && pWindow->IsEnabled() && pWindow->IsInputEnabled() )
841 if ( pWindow->IsVisible() && pWindow->IsEnabled() &&
842 pWindow->IsInputEnabled() && (
843 pWindow->GetType() != WINDOW_WINDOW &&
844 pWindow->GetType() != WINDOW_SYSWINDOW &&
845 pWindow->GetType() != WINDOW_WORKWINDOW &&
846 pWindow->GetType() != WINDOW_CONTROL
847 )
848 )
849//-----IAccessibility2 Implementation 2009
839 {
840 pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD );
841 return sal_True;
842 }
843
844 pWindow = pWindow->GetWindow( WINDOW_NEXT );
845 }
846 }

--- 487 unchanged lines hidden --- 		850 {
851 pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD );
852 return sal_True;
853 }
854
855 pWindow = pWindow->GetWindow( WINDOW_NEXT );
856 }
857 }

--- 487 unchanged lines hidden ---