INTEGRATION: CWS fwk13 (1.17.10); FILE MERGED

2005/05/02 14:32:09 cd 1.17.10.1: #i48553# Check reference before using it

framework/source/uielement/toolbarmanager.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: toolbarmanager.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: obo $ $Date: 2005-04-18 14:35:29 $
+ *  last change: $Author: obo $ $Date: 2005-05-06 09:36:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -576,6 +576,9 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run
             {
             }
         }
+
+        if ( m_xModuleImageManager.is() )
+        {
             try
             {
                 m_xModuleImageManager->removeConfigurationListener(
@@ -585,6 +588,7 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run
             catch ( Exception& )
             {
             }
+        }
 
         if ( m_xImageOrientationListener.is() )
         {