diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:32:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:32:25 +0000 |
| commit | de920f5cbcfa901e5c4da3b7d34901c44b6c5e35 (patch) | |
| tree | a6f3065ec0b9b6379ac922f98b739162d0cff024 /svx/source/svdraw/svdmodel.cxx | |
| parent | de3e043fadc2480865cddc24aa0f110b74cee4d2 (diff) | |
INTEGRATION: CWS aw009 (1.53.76); FILE MERGED
2004/04/26 11:44:58 aw 1.53.76.1: #116235#, #116168#
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index c18fd03843da..a06cfdb594a3 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdmodel.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: rt $ $Date: 2004-04-02 14:13:02 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:32:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -544,7 +544,10 @@ SdrModel::~SdrModel() } #endif if (pAktUndoGroup!=NULL) delete pAktUndoGroup; - Clear(); + + // #116168# + ClearModel(sal_True); + delete pLayerAdmin; // Den DrawOutliner erst nach dem ItemPool loeschen, da @@ -846,9 +849,13 @@ void SdrModel::ImpCreateTables() #endif } -void SdrModel::Clear() +// #116168# +void SdrModel::ClearModel(sal_Bool bCalledFromDestructor) { - mbInDestruction = true; + if(bCalledFromDestructor) + { + mbInDestruction = true; + } sal_Int32 i; // delete all drawing pages @@ -2400,7 +2407,10 @@ SvStream& operator>>(SvStream& rIn, SdrModel& rMod) rMod.nProgressOfs=rIn.Tell(); rMod.nProgressMax=0xFFFFFFFF; // Vorlaeufiger Wert rMod.DoProgress(0); - rMod.Clear(); + + // #116168# + rMod.ClearModel(sal_False); + SdrIOHeader aHead(rIn,STREAM_READ); rMod.nLoadVersion=aHead.GetVersion(); if (!aHead.IsMagic()) { |