vcl/source/window/window.cxx | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 9acc48f904317cc51f6de2c0e530366f4a1246fe
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Sat May 24 16:42:46 2014 +1000
vcl: remove comments about old tasks in Window::ImplCallActivateListeners()
Change-Id: I61cf227712c6cd9c9c817a451d6b2c5ccb57368b
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 09e43ed..cddcd9d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3303,23 +3303,13 @@ void Window::ImplCallActivateListeners( Window *pOld )
if( aDogtag.IsDead() )
return;
- // #106298# revoke the change for 105369, because this change
- // disabled the activate event for the parent,
- // if the parent is a compound control
- //if( !GetParent() || !GetParent()->IsCompoundControl() )
- //{
- // #100759#, avoid walking the wrong frame's hierarchy
- // eg, undocked docking windows (ImplDockFloatWin)
- // #104714#, revert the changes for 100759 because it has a side
effect when pOld is a dialog
- // additionally the gallery is not dockable anymore, so
100759 canot occur
- if ( ImplGetParent() ) /* && mpWindowImpl->mpFrameWindow ==
ImplGetParent()->mpWindowImpl->mpFrameWindow ) */
+ if ( ImplGetParent() )
ImplGetParent()->ImplCallActivateListeners( pOld );
else if( (mpWindowImpl->mnStyle & WB_INTROWIN) == 0 )
{
// top level frame reached: store hint for DefModalDialogParent
ImplGetSVData()->maWinData.mpActiveApplicationFrame =
mpWindowImpl->mpFrameWindow;
}
- //}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
