Clean up (calls to) ToolBarManager::RemoveControllers

...which turns out to be only called with SolarMutex locked

Change-Id: I3264b0a043da7111b8ca12c59ee7a590f1a43b8e

framework/source/uielement/toolbarmanager.cxx

@@ -401,16 +401,13 @@ throw ( RuntimeException, std::exception )
 
 void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception )
 {
-    {
     SolarMutexGuard g;
+
     if ( m_bDisposed )
         return;
-    }
 
     RemoveControllers();
 
-    {
-        SolarMutexGuard g;
     if ( m_xDocImageManager.is() )
     {
         try
@@ -444,7 +441,6 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run
         m_xFrame.clear();
 
     m_xContext.clear();
-    }
 }
 
 // XComponent
@@ -619,7 +615,7 @@ void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent
 
 void ToolBarManager::RemoveControllers()
 {
-    SolarMutexGuard g;
+    DBG_TESTSOLARMUTEX();
 
     if ( m_bDisposed )
         return;