diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 15:42:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 15:42:29 +0000 |
| commit | d47468cfd2ab6e27a5a8beb6887284e5f3e607e4 (patch) | |
| tree | 6be0b127d75528f61621c0bd48d8d7c7e9b89ab3 /svx/source/svdraw/svdmodel.cxx | |
| parent | c8323184ecc8f9fc4e978b45a4ad8fc35bfcd940 (diff) | |
INTEGRATION: CWS cl01 (1.47.26); FILE MERGED
2003/04/22 17:20:59 cl 1.47.26.1: #108934# added flag for drawing model destruction
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 2cc8c9a83843..b7970a5720f9 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdmodel.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: hr $ $Date: 2003-03-27 15:04:31 $ + * last change: $Author: rt $ $Date: 2003-04-24 16:42:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -334,6 +334,7 @@ TYPEINIT1(SdrModel,SfxBroadcaster); void SdrModel::ImpCtor(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, FASTBOOL bLoadRefCounts) { + mbInDestruction=false; aObjUnit=SdrEngineDefaults::GetMapFraction(); eObjUnit=SdrEngineDefaults::GetMapUnit(); eUIUnit=FUNIT_MM; @@ -518,6 +519,9 @@ SdrModel::~SdrModel() #endif DBG_DTOR(SdrModel,NULL); + + mbInDestruction = true; + Broadcast(SdrHint(HINT_MODELCLEARED)); delete mpOutlinerCache; @@ -578,6 +582,11 @@ SdrModel::~SdrModel() delete mpNumberFormatter; } +bool SdrModel::IsInDestruction() const +{ + return mbInDestruction; +} + const SvNumberFormatter& SdrModel::GetNumberFormatter() const { if(!mpNumberFormatter) @@ -834,6 +843,8 @@ void SdrModel::ImpCreateTables() void SdrModel::Clear() { + mbInDestruction = true; + sal_Int32 i; // delete all drawing pages sal_Int32 nAnz=GetPageCount(); |