fwk139: #i111034# integrate patch

1 files changed, 25 insertions, 10 deletions

diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 8d8fc095b5be..653208aaf250 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -765,16 +765,31 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
             DELETEZ(pWebToolbarConfig)  ;
             DELETEZ(pAuthorNames)       ;
             DELETEZ(pDBConfig);
-            pColorConfig->RemoveListener(this);
-            DELETEZ(pColorConfig);
-            pAccessibilityOptions->RemoveListener(this);
-            DELETEZ(pAccessibilityOptions);
-            pCTLOptions->RemoveListener(this);
-            DELETEZ(pCTLOptions);
-            pUserOptions->RemoveListener(this);
-            DELETEZ(pUserOptions);
-            pUndoOptions->RemoveListener(this);
-            DELETEZ(pUndoOptions);
+            if( pColorConfig )
+            {
+                pColorConfig->RemoveListener(this);
+                DELETEZ(pColorConfig);
+            }
+            if( pAccessibilityOptions )
+            {
+                pAccessibilityOptions->RemoveListener(this);
+                DELETEZ(pAccessibilityOptions);
+            }
+            if( pCTLOptions )
+            {
+                pCTLOptions->RemoveListener(this);
+                DELETEZ(pCTLOptions);
+            }
+            if( pUserOptions )
+            {
+                pUserOptions->RemoveListener(this);
+                DELETEZ(pUserOptions);
+            }
+            if( pUndoOptions )
+            {
+                pUndoOptions->RemoveListener(this);
+                DELETEZ(pUndoOptions);
+            }
         }
     }
 }