[Libreoffice-commits] core.git: framework/source

[Samuel Mehrbrodt]

 framework/source/layoutmanager/layoutmanager.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 53f66fa6793d96f410acc7a256beb3284d65f296
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Nov 11 08:49:53 2015 +0100

    Fix NotebookBar not showing up when directly opening a document
    
    Change-Id: I6bb154102d5e58e7c7e1f1b0d68629555a6d1697

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index fe10f2e..1c15c9f 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -784,11 +784,6 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible )
             if ( bSetVisible )
             {
                 pSysWindow->SetMenuBar(pMenuBar);
-                if (getenv("LO_USE_NOTEBOOKBAR"))
-                {
-                    pSysWindow->CreateNotebookBar("vcl/ui/notebookbar.ui", m_xFrame);
-                    pSysWindow->SetMenuBarMode(MenuBarMode::Hide);
-                }
             }
             else
                 pSysWindow->SetMenuBar( nullptr );
@@ -1466,7 +1461,7 @@ throw (RuntimeException, std::exception)
         {
             // #i38743# don't create a menubar if frame isn't top
             if ( !bInPlaceMenu && !m_xMenuBar.is() && implts_isFrameOrWindowTop( xFrame ))
-                {
+            {
                 m_xMenuBar = implts_createElement( aName );
                 if ( m_xMenuBar.is() )
                 {
@@ -1508,6 +1503,11 @@ throw (RuntimeException, std::exception)
                                 }
                             }
                         }
+                        if (getenv("LO_USE_NOTEBOOKBAR"))
+                        {
+                            pSysWindow->CreateNotebookBar("vcl/ui/notebookbar.ui", m_xFrame);
+                            pSysWindow->SetMenuBarMode(MenuBarMode::Hide);
+                        }
                     }
                 }
             }