summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-02-15 10:24:00 +0100
committerOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-02-15 10:24:00 +0100
commit0d16f5fa42b9b7f734ee626a30fed79e0e6366bc (patch)
tree0fbaa0c203cdaac67edcd629d649c5e553f2c071 /sw/source
parentb36241988ea99ba2a9d290ec838a3557d0333d63 (diff)
parentad3524adac606b2b06b5d98f9c5193f1fb40dfa1 (diff)
Automated merge with http://hg.services.openoffice.org/cws/dba33f
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/app/apphdl.cxx15
1 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 2d4615bba585..ed26c3470fbd 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -768,15 +768,20 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
DELETEZ(pWebToolbarConfig) ;
DELETEZ(pAuthorNames) ;
DELETEZ(pDBConfig);
- pColorConfig->RemoveListener(this);
+ if ( pColorConfig )
+ pColorConfig->RemoveListener(this);
DELETEZ(pColorConfig);
- pAccessibilityOptions->RemoveListener(this);
+ if ( pAccessibilityOptions )
+ pAccessibilityOptions->RemoveListener(this);
DELETEZ(pAccessibilityOptions);
- pCTLOptions->RemoveListener(this);
+ if ( pCTLOptions )
+ pCTLOptions->RemoveListener(this);
DELETEZ(pCTLOptions);
- pUserOptions->RemoveListener(this);
+ if ( pUserOptions )
+ pUserOptions->RemoveListener(this);
DELETEZ(pUserOptions);
- pUndoOptions->RemoveListener(this);
+ if ( pUndoOptions )
+ pUndoOptions->RemoveListener(this);
DELETEZ(pUndoOptions);
}
}