diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-03 15:24:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-03 15:24:21 +0000 |
| commit | 2113c83828c49351559b592a27f84ad832923214 (patch) | |
| tree | 38ed6a3f368476b6699085dff9b5ba4a921de17a /sd/source/ui/tools/SdGlobalResourceContainer.cxx | |
| parent | 09a8257856ed15ff95e585835dcf0a4ece25ecff (diff) | |
INTEGRATION: CWS components1 (1.4.52); FILE MERGED
2006/09/25 17:34:49 af 1.4.52.2: RESYNC: (1.4-1.5); FILE MERGED
2006/08/22 12:34:28 af 1.4.52.1: #i68075# Extended the releasing of shared resources that are not unique.
Diffstat (limited to 'sd/source/ui/tools/SdGlobalResourceContainer.cxx')
| -rw-r--r-- | sd/source/ui/tools/SdGlobalResourceContainer.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index f11a929f1405..9b64297d98bb 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SdGlobalResourceContainer.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:22:21 $ + * last change: $Author: rt $ $Date: 2007-04-03 16:24:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -189,8 +189,13 @@ SdGlobalResourceContainer::~SdGlobalResourceContainer (void) iSharedResource != mpImpl->maSharedResources.rend(); ++iSharedResource) { - DBG_ASSERT((*iSharedResource).unique(), - "SdGlobalResource still held in ~SdGlobalResourceContainer"); + if ( ! iSharedResource->unique()) + { + SdGlobalResource* pResource = iSharedResource->get(); + OSL_TRACE(" %p %d", pResource, iSharedResource->use_count()); + DBG_ASSERT(iSharedResource->unique(), + "SdGlobalResource still held in ~SdGlobalResourceContainer"); + } } DBG_ASSERT(Implementation::mpInstance == this, |