diff options
| -rw-r--r-- | include/svtools/grfmgr.hxx | 1 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 7a8291f2fc75..9c3ddc9e6bcc 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -315,7 +315,6 @@ private: void SVT_DLLPRIVATE ImplAfterDataChange(); protected: - void GraphicManagerDestroyed(); SvStream* GetSwapStream() const; void SetSwapState(); diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index f480537c325f..2682e9562134 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -447,13 +447,6 @@ void GraphicObject::FireSwapOutRequest() ImplAutoSwapOutHdl( nullptr ); } -void GraphicObject::GraphicManagerDestroyed() -{ - // we're alive, but our manager doesn't live anymore ==> connect to default manager - mpMgr = nullptr; - ImplSetGraphicManager(); -} - bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags ) const { diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index e2608bbe6cb5..f71c67a31a30 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -49,9 +49,7 @@ GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize GraphicManager::~GraphicManager() { - for(GraphicObject* i : maObjList) - i->GraphicManagerDestroyed(); - + assert(maObjList.empty()); delete mpCache; } |