manage m_xInplaceMenuBar with rtl::Reference

instead of both a raw pointer and an uno::Reference

Change-Id: I44111694671371fac5c4207d1c46f99761bf10eb

2 files changed, 13 insertions, 37 deletions

diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index deeb04933a7b..85cde4bdb26a 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -278,8 +278,7 @@ namespace framework
             bool                                                           m_bMenuBarCloseButton;
             css::awt::Rectangle                                            m_aDockingArea;
             css::uno::Reference< css::ui::XDockingAreaAcceptor >           m_xDockingAreaAcceptor;
-            css::uno::Reference< css::lang::XComponent >                   m_xInplaceMenuBar;
-            MenuBarManager*                                                m_pInplaceMenuBar;
+            rtl::Reference< MenuBarManager >                               m_xInplaceMenuBar;
             css::uno::Reference< css::ui::XUIElement >                     m_xMenuBar;
             UIElement                                                      m_aStatusBarElement;
             UIElement                                                      m_aProgressBarElement;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index bf1e8dbe7fbd..4f3f86aef942 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -123,7 +123,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
         , m_bGlobalSettings( false )
         , m_bPreserveContentSize( false )
         , m_bMenuBarCloseButton( false )
-        , m_pInplaceMenuBar( nullptr )
         , m_xModuleManager( ModuleManager::create( xContext ))
         , m_xUIElementFactoryManager( ui::theUIElementFactoryManager::get(xContext) )
         , m_xPersistentWindowStateSupplier( ui::theWindowStateConfiguration::get( xContext ) )
@@ -172,7 +171,7 @@ void LayoutManager::impl_clearUpMenuBar()
         {
             MenuBar* pSetMenuBar = nullptr;
             if ( m_xInplaceMenuBar.is() )
-                pSetMenuBar = static_cast<MenuBar *>(m_pInplaceMenuBar->GetMenuBar());
+                pSetMenuBar = static_cast<MenuBar *>(m_xInplaceMenuBar->GetMenuBar());
             else
             {
                 Reference< awt::XMenuBar > xMenuBar;
@@ -205,13 +204,9 @@ void LayoutManager::impl_clearUpMenuBar()
 
     // reset inplace menubar manager
     VclPtr<Menu> pMenuBar;
-    if (m_pInplaceMenuBar)
-    {
-        pMenuBar = m_pInplaceMenuBar->GetMenuBar();
-        m_pInplaceMenuBar = nullptr;
-    }
-    if ( m_xInplaceMenuBar.is() )
+    if (m_xInplaceMenuBar.is())
     {
+        pMenuBar = m_xInplaceMenuBar->GetMenuBar();
         m_xInplaceMenuBar->dispose();
         m_xInplaceMenuBar.clear();
     }
@@ -761,8 +756,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible )
     SolarMutexResettableGuard aWriteLock;
     Reference< XUIElement >   xMenuBar( m_xMenuBar, UNO_QUERY );
     Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
-    Reference< XComponent >   xInplaceMenuBar( m_xInplaceMenuBar );
-    MenuBarManager*           pInplaceMenuBar( m_pInplaceMenuBar );
+    rtl::Reference< MenuBarManager > xInplaceMenuBar( m_xInplaceMenuBar );
     aWriteLock.clear();
 
     if (( xMenuBar.is() || xInplaceMenuBar.is() ) && xContainerWindow.is() )
@@ -771,7 +765,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible )
 
         MenuBar* pMenuBar( nullptr );
         if ( xInplaceMenuBar.is() )
-            pMenuBar = static_cast<MenuBar *>(pInplaceMenuBar->GetMenuBar());
+            pMenuBar = static_cast<MenuBar *>(xInplaceMenuBar->GetMenuBar());
         else
         {
             MenuBarWrapper* pMenuBarWrapper = (static_cast< MenuBarWrapper* >(xMenuBar.get()) );
@@ -1151,13 +1145,9 @@ throw (uno::RuntimeException, std::exception)
 
         // Reset old inplace menubar!
         VclPtr<Menu> pOldMenuBar;
-        if (m_pInplaceMenuBar)
-        {
-            pOldMenuBar = m_pInplaceMenuBar->GetMenuBar();
-            m_pInplaceMenuBar = nullptr;
-        }
         if (m_xInplaceMenuBar.is())
         {
+            pOldMenuBar = m_xInplaceMenuBar->GetMenuBar();
             m_xInplaceMenuBar->dispose();
             m_xInplaceMenuBar.clear();
         }
@@ -1171,15 +1161,14 @@ throw (uno::RuntimeException, std::exception)
             Reference< XDispatchProvider > xDispatchProvider;
 
             VclPtr<MenuBar> pMenuBar = VclPtr<MenuBar>::Create();
-            m_pInplaceMenuBar = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer, xDispatchProvider, aModuleIdentifier, pMenuBar, true );
-            m_pInplaceMenuBar->SetItemContainer( xMergedMenuBar );
+            m_xInplaceMenuBar = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer, xDispatchProvider, aModuleIdentifier, pMenuBar, true );
+            m_xInplaceMenuBar->SetItemContainer( xMergedMenuBar );
 
             SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
             if ( pSysWindow )
                 pSysWindow->SetMenuBar(pMenuBar);
 
             m_bInplaceMenuSet = true;
-            m_xInplaceMenuBar.set( static_cast<OWeakObject *>(m_pInplaceMenuBar), UNO_QUERY );
         }
 
         aWriteLock.clear();
@@ -1211,13 +1200,9 @@ throw (uno::RuntimeException)
 
     // Remove inplace menu bar
     VclPtr<Menu> pMenuBar;
-    if (m_pInplaceMenuBar)
-    {
-        pMenuBar = m_pInplaceMenuBar->GetMenuBar();
-        m_pInplaceMenuBar = nullptr;
-    }
     if (m_xInplaceMenuBar.is())
     {
+        pMenuBar = m_xInplaceMenuBar->GetMenuBar();
         m_xInplaceMenuBar->dispose();
         m_xInplaceMenuBar.clear();
     }
@@ -2588,7 +2573,7 @@ bool LayoutManager::implts_resetMenuBar()
 
     MenuBar* pSetMenuBar = nullptr;
     if ( m_xInplaceMenuBar.is() )
-        pSetMenuBar = static_cast<MenuBar *>(m_pInplaceMenuBar->GetMenuBar());
+        pSetMenuBar = static_cast<MenuBar *>(m_xInplaceMenuBar->GetMenuBar());
     else
     {
         MenuBarWrapper* pMenuBarWrapper = static_cast< MenuBarWrapper* >( m_xMenuBar.get() );
@@ -2831,13 +2816,9 @@ throw( RuntimeException, std::exception )
         impl_clearUpMenuBar();
         m_xMenuBar.clear();
         VclPtr<Menu> pMenuBar;
-        if (m_pInplaceMenuBar)
-        {
-            pMenuBar = m_pInplaceMenuBar->GetMenuBar();
-            m_pInplaceMenuBar = nullptr;
-        }
         if (m_xInplaceMenuBar.is())
         {
+            pMenuBar = m_xInplaceMenuBar->GetMenuBar();
             m_xInplaceMenuBar->dispose();
             m_xInplaceMenuBar.clear();
         }
@@ -2895,13 +2876,9 @@ throw( RuntimeException, std::exception )
         impl_clearUpMenuBar();
         m_xMenuBar.clear();
         VclPtr<Menu> pMenuBar;
-        if (m_pInplaceMenuBar)
-        {
-            pMenuBar = m_pInplaceMenuBar->GetMenuBar();
-            m_pInplaceMenuBar = nullptr;
-        }
         if (m_xInplaceMenuBar.is())
         {
+            pMenuBar = m_xInplaceMenuBar->GetMenuBar();
             m_xInplaceMenuBar->dispose();
             m_xInplaceMenuBar.clear();
         }