diff options
author | Dieter Loeschky <dl@openoffice.org> | 2001-03-29 10:40:36 +0000 |
---|---|---|
committer | Dieter Loeschky <dl@openoffice.org> | 2001-03-29 10:40:36 +0000 |
commit | 4a82a7c2553e2e473245b510b2bd90e6a0aeb991 (patch) | |
tree | d2a8ac997b43126ef703d1dbfc5814f2142c8fd6 /svx/source/svdraw/svdoole2.cxx | |
parent | 01c0116a23a11410cdd726be2911603b0591d25c (diff) |
#85226# calling SetDeleted() if page is removed
Diffstat (limited to 'svx/source/svdraw/svdoole2.cxx')
-rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 1e5d1317d96a..628a32f7ae8a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdoole2.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dl $ $Date: 2001-03-12 14:53:05 $ + * last change: $Author: dl $ $Date: 2001-03-29 11:40:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -301,6 +301,7 @@ FASTBOOL SdrOle2Obj::IsEmpty() const void SdrOle2Obj::ImpAnmeldung() { #ifndef SVX_LIGHT + GetObjRef(); // try to load inplace object if(pModel && aName.Len()) { SvPersist* pPers=pModel->GetPersist(); @@ -376,9 +377,7 @@ void SdrOle2Obj::ImpAbmeldung() if (pModel && aName.Len() ) { - // Aus Cache entfernen - GetSdrGlobalData().GetOLEObjCache().RemoveObj(this); - + GetObjRef(); // try to load inplace object if ( ppObjRef->Is() ) { (*ppObjRef)->DoClose(); @@ -395,6 +394,9 @@ void SdrOle2Obj::ImpAbmeldung() } } } + + // Aus Cache entfernen + GetSdrGlobalData().GetOLEObjCache().RemoveObj(this); } #endif // SVX_LIGHT } @@ -698,6 +700,7 @@ FASTBOOL SdrOle2Obj::HasSpecialDrag() const void SdrOle2Obj::ImpSetVisAreaSize() { #ifndef SVX_LIGHT + GetObjRef(); // try to load inplace object SvInPlaceObjectRef& rIPRef=*ppObjRef; if (rIPRef.Is()) |