[Libreoffice-commits] core.git: vcl/source

Adolfo Jayme Barrientos fitojb at ubuntu.com
Tue Feb 3 00:25:27 PST 2015


 vcl/source/window/accessibility.cxx |   37 ------------------------------------
 1 file changed, 37 deletions(-)

New commits:
commit e4f496854092eff196c07fb5be2d3c54af3b4179
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Thu Jan 29 20:26:22 2015 -0600

    vcl: Remove commented-out code
    
    Change-Id: I4bd2cf8a920c119d508e3316107fa2a616472ba2
    Reviewed-on: https://gerrit.libreoffice.org/14259
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 9a662f9..e21197d 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -260,22 +260,6 @@ sal_uInt16 Window::GetAccessibleChildWindowCount()
         pChild = pChild->mpWindowImpl->mpNext;
     }
 
-    // #107176# ignore overlapwindows
-    // this only affects non-system floating windows
-    // which are either not accessible (like the HelpAgent) or should be changed to system windows anyway
-    /*
-    if( ImplIsOverlapWindow() )
-    {
-        vcl::Window* pOverlap = GetWindow( WINDOW_FIRSTOVERLAP );
-        while ( pOverlap )
-        {
-            if( pOverlap->IsVisible() )
-                nChildren++;
-            pOverlap = pOverlap->GetWindow( WINDOW_NEXT );
-        }
-    }
-    */
-
     // report the menubarwindow as a child of THE workwindow
     if( GetType() == WINDOW_BORDERWINDOW )
     {
@@ -332,28 +316,7 @@ vcl::Window* Window::GetAccessibleChildWindow( sal_uInt16 n )
         do pChild = pChild->mpWindowImpl->mpNext; while( pChild && ! pChild->IsVisible() );
         DBG_ASSERT( pChild, "GetAccessibleChildWindow(): wrong index in border window");
     }
-    if ( !pChild )
-    {
-        // #107176# ignore overlapwindows
-        /*
-        if( ImplIsOverlapWindow() )
-        {
-            vcl::Window* pOverlap = GetWindow( WINDOW_FIRSTOVERLAP );
-            while ( !pChild && pOverlap )
-            {
-                if ( !nChildren && pOverlap->IsVisible() )
-                {
-                    pChild = pOverlap;
-                    break;
-                }
-                pOverlap = pOverlap->GetWindow( WINDOW_NEXT );
-                if( pOverlap && pOverlap->IsVisible() )
-                    nChildren--;
-            }
-        }
-        */
 
-    }
     if ( pChild && ( pChild->GetType() == WINDOW_BORDERWINDOW ) && ( pChild->GetChildCount() == 1 ) )
     {
         pChild = pChild->GetChild( 0 );


More information about the Libreoffice-commits mailing list