[Libreoffice-commits] core.git: include/svtools svtools/source

[Caolán McNamara]

 include/svtools/grfmgr.hxx         |    1 -
 svtools/source/graphic/grfmgr.cxx  |    7 -------
 svtools/source/graphic/grfmgr2.cxx |    4 +---
 3 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 3a44ef1d5de57022ad2f5339dbcbfa534174eb9f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 15:58:45 2017 +0000

    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

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 7a8291f..9c3ddc9 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 f480537..2682e95 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 e2608bb..f71c67a 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;
 }