diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-08-22 17:17:57 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-08-22 22:38:17 +0000 |
commit | e2deb53e673fa2d6d61a528fe398806c453356d8 (patch) | |
tree | 66bca8ca627ff604c72f87e160497f0dc10594a2 /framework | |
parent | 31d39c24e1ff2d3602e0212eeeecd8de88da6d38 (diff) |
tdf#101658 Don't show embedded frames in Window menu
Change-Id: I3e22a92815624cd9b287623c4958cf2df611bb97
Reviewed-on: https://gerrit.libreoffice.org/28325
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index fdeda1fbc2b2..560db8086fd7 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -2007,11 +2007,17 @@ void MenuBarManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XComp nActiveItemId = nItemId; vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + OUString sWindowTitle; if ( pWin && pWin->IsVisible() ) - { - aNewWindowListVector.push_back( pWin->GetText() ); - ++nItemId; - } + sWindowTitle = pWin->GetText(); + + // tdf#101658 In case the frame is embedded somewhere, LO has no control over it. + // So we just skip it. + if ( sWindowTitle.isEmpty() ) + continue; + + aNewWindowListVector.push_back( sWindowTitle ); + ++nItemId; } } |