[Libreoffice-commits] core.git: Branch 'feature/vclref' - framework/source

[Michael Meeks]

 framework/source/uielement/buttontoolbarcontroller.cxx  |    2 +-
 framework/source/uielement/complextoolbarcontroller.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ee53e27b6c8ce05d0ffb20b5ceb38c06b0745b7
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Mar 17 17:53:33 2015 +0000

    couple more instances of = 0 should be .clear() not disposeAndClear().
    
    Otherwise we change the ordering of shutdown quite seriously.
    
    Change-Id: Icf60649c5a6d61914b182321f18ae80a0eb76af4

diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 6e142df..aaf0685 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -152,7 +152,7 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R
         m_xContext.clear();
         m_xURLTransformer.clear();
         m_xFrame.clear();
-        m_pToolbar.disposeAndClear();
+        m_pToolbar.clear();
         m_bDisposed = true;
     }
 }
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 79b759f..8f15b13 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -76,7 +76,7 @@ throw ( RuntimeException, std::exception )
     svt::ToolboxController::dispose();
 
     m_xURLTransformer.clear();
-    m_pToolbar.disposeAndClear();
+    m_pToolbar.clear();
     m_nID = 0;
 }