framework/source/layoutmanager/layoutmanager.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 3a072652730f54454820f1f8045d292685c555d6 Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Tue Feb 19 10:24:46 2019 +0100 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Tue Feb 19 13:46:32 2019 +0100 MSForms: Fix a regression in inplace menu handling We should not call implts_resetInplaceMenuBar() unconditionally. The problem which was fixed by that call can be solved by setting m_bInplaceMenuSet to false, which is the proper solution. So after the menu cleared up (inplace menu too), this indicator flag also contains the right value. Regression from: dc3a2546bd0ad0afe20cba9940934405174fd593 Change-Id: I85243417eb273629cc57b762b98fdd32dc9b1dd5 Reviewed-on: https://gerrit.libreoffice.org/68009 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 5cb364df9285..1b60c9e82d04 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -218,8 +218,6 @@ void LayoutManager::impl_clearUpMenuBar() { implts_lock(); - implts_resetInplaceMenuBar(); - // Clear up VCL menu bar to prepare shutdown if ( m_xContainerWindow.is() ) { @@ -270,6 +268,7 @@ void LayoutManager::impl_clearUpMenuBar() m_xInplaceMenuBar.clear(); } pMenuBar.disposeAndClear(); + m_bInplaceMenuSet = false; Reference< XComponent > xComp( m_xMenuBar, UNO_QUERY ); if ( xComp.is() ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits