Kaydet (Commit) 6b0ae6c6 authored tarafından Caolán McNamara's avatar Caolán McNamara

the only GraphicManager is the mpGlobalMgr, so simplify accordingly

Change-Id: I5b237e27815e138cdcab75b1b9f657882ae8a37b
üst 439b2a13
......@@ -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 );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment