diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:21:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:21:20 +0000 |
| commit | 03011c4517eaccd5c44f72796b47402191a73e88 (patch) | |
| tree | b1bd3b1ba39c0cd4958e1f3d92abb93bbe0e4384 /sfx2/source/control/statcach.cxx | |
| parent | 11ca14bcaa3bdcb7f5653b7ef0d958c29148dbb4 (diff) | |
INTEGRATION: CWS impress15 (1.20.124); FILE MERGED
2004/10/19 16:33:03 af 1.20.124.1: #i35805# Removed assertion that warns about missing controller from SetCachedState().
Diffstat (limited to 'sfx2/source/control/statcach.cxx')
| -rw-r--r-- | sfx2/source/control/statcach.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index e27fe96921da..d528a0d0088c 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -2,9 +2,9 @@ * * $RCSfile: statcach.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2004-07-06 13:34:57 $ + * last change: $Author: obo $ $Date: 2004-11-16 16:21:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -503,8 +503,7 @@ void SfxStateCache::SetCachedState( BOOL bAlways ) { DBG_MEMTEST(); DBG_CHKTHIS(SfxStateCache, 0); - DBG_ASSERT( pController, "Cache ohne ControllerItem" ); - DBG_ASSERT( pController->GetId()==nId, "Cache mit falschem ControllerItem" ); + DBG_ASSERT(pController==NULL||pController->GetId()==nId, "Cache mit falschem ControllerItem" ); DBG_PROFSTART(SfxStateCacheSetState); // nur updaten wenn cached item vorhanden und auch verarbeitbar |