summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-10-22 20:44:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2010-10-22 20:44:02 +0100
commit00d7db406ac1d4ed6a5e0526c92b1b4f6db340de (patch)
tree67d86b8fea570e34cf37097da71f74d7b580f988 /sfx2
parent9f51107d0b2a824208b4849f252e968bfed53fab (diff)
startup optimization, move static objects to first use point
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/imagemgr.cxx27
1 files changed, 7 insertions, 20 deletions
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index b9f770038863..85810cd95a17 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -67,10 +67,6 @@ typedef std::hash_map< ::rtl::OUString,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr;
-static WeakReference< XModuleManager > m_xModuleManager;
-static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSupplier;
-static WeakReference< XURLTransformer > m_xURLTransformer;
-static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap;
Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
{
@@ -91,22 +87,6 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
rtl::OUString aCommandURL( aURL );
if ( nProtocol == INET_PROT_SLOT )
{
- /*
- // Support old way to retrieve image via slot URL
- Reference< XURLTransformer > xURLTransformer = m_xURLTransformer;
- if ( !xURLTransformer.is() )
- {
- xURLTransformer = Reference< XURLTransformer >(
- ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
- UNO_QUERY );
- m_xURLTransformer = xURLTransformer;
- }
-
- URL aTargetURL;
- aTargetURL.Complete = aURL;
- xURLTransformer->parseStrict( aTargetURL );
- USHORT nId = ( USHORT ) aTargetURL.Path.toInt32();*/
USHORT nId = ( USHORT ) String(aURL).Copy(5).ToInt32();
const SfxSlot* pSlot = 0;
if ( xModel.is() )
@@ -171,6 +151,8 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
}
}
+ static WeakReference< XModuleManager > m_xModuleManager;
+
Reference< XModuleManager > xModuleManager = m_xModuleManager;
if ( !xModuleManager.is() )
@@ -189,11 +171,16 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
{
Reference< XImageManager > xModuleImageManager;
rtl::OUString aModuleId = xModuleManager->identify( rFrame );
+
+ static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap;
+
ModuleIdToImagegMgr::iterator pIter = m_aModuleIdToImageMgrMap.find( aModuleId );
if ( pIter != m_aModuleIdToImageMgrMap.end() )
xModuleImageManager = pIter->second;
else
{
+ static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSupplier;
+
Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier = m_xModuleCfgMgrSupplier;
if ( !xModuleCfgMgrSupplier.is() )