diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 15:58:45 +0000 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-11-28 00:13:20 -0500 |
| commit | 4ba98391b536997413be837803566a7d03ba8d4c (patch) | |
| tree | d7213b32dff7855a686373304dfde087b8d2d558 | |
| parent | 21d4a03363b776109deaa6cef541a071f244d7a5 (diff) | |
GraphicManagerDestroyed would just set the default manager again
which is the only one that could already be set. Seeing
as the manager is always there if a Graphic exists then
the maObjList must be empty at the dtor time
Change-Id: Id447d1e62a4b94b0ef986edf3cc05629c90e511b
(cherry picked from commit 3a44ef1d5de57022ad2f5339dbcbfa534174eb9f)
| -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 c59fdf0cc9a6..87d7fb4e5d29 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; } |