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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |   53 ++++++++++++--------------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

New commits:
commit 6b0ae6c674e0216bc916232e500515f9eb764664
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 15:50:56 2017 +0000

    the only GraphicManager is the mpGlobalMgr, so simplify accordingly
    
    Change-Id: I5b237e27815e138cdcab75b1b9f657882ae8a37b

diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 8507c00..2577393 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -163,51 +163,34 @@ void GraphicObject::ImplAssignGraphicData()
 
 void GraphicObject::ImplSetGraphicManager(const OString* pID, const GraphicObject* pCopyObj)
 {
-    if (mpMgr && mpMgr == mpGlobalMgr)
+    if (mpMgr)
         return;
     else
     {
-        if( mpMgr )
+        if( !mpGlobalMgr )
         {
-            mpMgr->ImplUnregisterObj( *this );
-
-            if( ( mpMgr == mpGlobalMgr ) && !mpGlobalMgr->ImplHasObjects() )
+            if (!utl::ConfigManager::IsAvoidConfig())
             {
-                delete mpGlobalMgr;
-                mpGlobalMgr = nullptr;
+                mpGlobalMgr = new GraphicManager(
+                    (officecfg::Office::Common::Cache::GraphicManager::
+                     TotalCacheSize::get()),
+                    (officecfg::Office::Common::Cache::GraphicManager::
+                     ObjectCacheSize::get()));
+                mpGlobalMgr->SetCacheTimeout(
+                    officecfg::Office::Common::Cache::GraphicManager::
+                    ObjectReleaseTime::get());
             }
-        }
-
-        if (true)
-        {
-            if( !mpGlobalMgr )
+            else
             {
-                if (!utl::ConfigManager::IsAvoidConfig())
-                {
-                    mpGlobalMgr = new GraphicManager(
-                        (officecfg::Office::Common::Cache::GraphicManager::
-                         TotalCacheSize::get()),
-                        (officecfg::Office::Common::Cache::GraphicManager::
-                         ObjectCacheSize::get()));
-                    mpGlobalMgr->SetCacheTimeout(
-                        officecfg::Office::Common::Cache::GraphicManager::
-                        ObjectReleaseTime::get());
-                }
-                else
-                {
-                    mpGlobalMgr = new GraphicManager(
-                        20000,
-                        20000);
-                    mpGlobalMgr->SetCacheTimeout(
-                        20000);
-                }
+                mpGlobalMgr = new GraphicManager(
+                    20000,
+                    20000);
+                mpGlobalMgr->SetCacheTimeout(
+                    20000);
             }
-
-            mpMgr = mpGlobalMgr;
         }
-        else
-            mpMgr = nullptr;
 
+        mpMgr = mpGlobalMgr;
         mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
     }
 }