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

[Michael Meeks]

 svtools/source/uno/generictoolboxcontroller.cxx |    2 +-
 vcl/source/window/toolbox.cxx                   |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9cdbc51a8ecd4835bed3e7805425c2ecb0cb0721
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Apr 1 13:36:01 2015 +0100

    Remove erroneous disposeAndClear.
    
    Change-Id: Ibc091cefab7fb0b628db0896af077a03fcda4094

diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index 61793b2..04e6203 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -74,7 +74,7 @@ void SAL_CALL GenericToolboxController::dispose()
 throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
-    m_pToolbox.disposeAndClear();
+    m_pToolbox.clear();
     m_nID = 0;
     svt::ToolboxController::dispose();
 }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 69e8a32..e53d779 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1623,6 +1623,9 @@ void ToolBox::dispose()
 
 ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const
 {
+    if (!mpData)
+        return NULL;
+
     std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
     while ( it != mpData->m_aItems.end() )
     {