[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - framework/source

[Libreoffice Gerrit user]

 framework/source/layoutmanager/layoutmanager.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit bbf4f2594b114a72d718e292fc18581200bc2e37
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Feb 19 10:24:46 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Feb 19 16:12:55 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/68010
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 1ed8fe5cd6f9..d7c3cfa8f893 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -220,8 +220,6 @@ void LayoutManager::impl_clearUpMenuBar()
 {
     implts_lock();
 
-    implts_resetInplaceMenuBar();
-
     // Clear up VCL menu bar to prepare shutdown
     if ( m_xContainerWindow.is() )
     {
@@ -272,6 +270,7 @@ void LayoutManager::impl_clearUpMenuBar()
         m_xInplaceMenuBar.clear();
     }
     pMenuBar.disposeAndClear();
+    m_bInplaceMenuSet = false;
 
     Reference< XComponent > xComp( m_xMenuBar, UNO_QUERY );
     if ( xComp.is() )