vcl/source/window/menufloatingwindow.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a89c3dc4b0a2ec846af387833474b543b3f149ad
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Mon Sep 4 18:41:27 2017 +0200
tdf#39468 Translate German comments/terms
Change-Id: I528e7e4b4d365ff512cd03ea22f7517319541e05
Reviewed-on: https://gerrit.libreoffice.org/41907
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/vcl/source/window/menufloatingwindow.cxx
b/vcl/source/window/menufloatingwindow.cxx
index 0204828574e5..d6dd08d4e17e 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -280,7 +280,6 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd,
FloatingWindow*, void)
End();
if ( pActivePopup )
{
- //SAL_WARN_IF( pActivePopup->ImplGetWindow(), "vcl", "PopupEnd,
obwohl pActivePopup MIT Window!" );
KillActivePopup(); // should be ok to just remove it
//pActivePopup->bCanceled = true;
}
@@ -357,7 +356,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*,
pTimer, void )
sal_uInt16 nRet = pActivePopup->ImplExecute( this,
tools::Rectangle( aItemTopLeft, aItemBottomRight ), FloatWinPopupFlags::Right,
pMenu, pTimer == nullptr );
SetPopupModeFlags( nOldFlags );
- // nRet != 0, wenn es waerend Activate() abgeschossen wurde...
+ // nRet != 0, if it was stopped during Activate()...
if ( !nRet && ( pActivePopup == pTest ) &&
pActivePopup->ImplGetWindow() )
pActivePopup->ImplGetFloatingWindow()->AddPopupModeWindow(
this );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
