diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 15:51:58 +0000 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:39 -0500 |
| commit | efa845e1cac2ff1fc6619aa774ab56e57034497d (patch) | |
| tree | 85df1aaac040d37d430a723ca5af91c43e6314b0 /svtools | |
| parent | d761953d4f4b7588a55b4a2e5be33ed7c4c1fe68 (diff) | |
unfold and unindent else cause
Change-Id: I22131a477547ac08b0c6b762353c9796f80c3666
(cherry picked from commit 9d138866d269eea262b22497af62b09570bd7a05)
(cherry picked from commit 21d4a03363b776109deaa6cef541a071f244d7a5)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 2577393465e1..f480537c325f 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -165,34 +165,32 @@ void GraphicObject::ImplSetGraphicManager(const OString* pID, const GraphicObjec { if (mpMgr) return; - else + + if (!mpGlobalMgr) { - if( !mpGlobalMgr ) + if (!utl::ConfigManager::IsAvoidConfig()) { - 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( + (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); } - - mpMgr = mpGlobalMgr; - mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj ); } + + mpMgr = mpGlobalMgr; + mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj ); } void GraphicObject::ImplAutoSwapIn() |