diff options
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/imagemgr.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index d6d3fe8a1112..56862e94e601 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -138,14 +138,14 @@ Image SAL_CALL GetImage( } } - static WeakReference< XModuleManager2 > m_xModuleManager; + static WeakReference< XModuleManager2 > s_xModuleManager; - Reference< XModuleManager2 > xModuleManager = m_xModuleManager; + Reference< XModuleManager2 > xModuleManager = s_xModuleManager; if ( !xModuleManager.is() ) { xModuleManager = ModuleManager::create(::comphelper::getProcessComponentContext()); - m_xModuleManager = xModuleManager; + s_xModuleManager = xModuleManager; } try @@ -155,28 +155,28 @@ Image SAL_CALL GetImage( Reference< XImageManager > xModuleImageManager; OUString aModuleId = xModuleManager->identify( rFrame ); - static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap; + static ModuleIdToImagegMgr s_aModuleIdToImageMgrMap; - ModuleIdToImagegMgr::iterator pIter = m_aModuleIdToImageMgrMap.find( aModuleId ); - if ( pIter != m_aModuleIdToImageMgrMap.end() ) + ModuleIdToImagegMgr::iterator pIter = s_aModuleIdToImageMgrMap.find( aModuleId ); + if ( pIter != s_aModuleIdToImageMgrMap.end() ) xModuleImageManager = pIter->second; else { - static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSupplier; + static WeakReference< XModuleUIConfigurationManagerSupplier > s_xModuleCfgMgrSupplier; - Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier = m_xModuleCfgMgrSupplier; + Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier = s_xModuleCfgMgrSupplier; if ( !xModuleCfgMgrSupplier.is() ) { xModuleCfgMgrSupplier = theModuleUIConfigurationManagerSupplier::get( ::comphelper::getProcessComponentContext() ); - m_xModuleCfgMgrSupplier = xModuleCfgMgrSupplier; + s_xModuleCfgMgrSupplier = xModuleCfgMgrSupplier; } Reference< XUIConfigurationManager > xUICfgMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( aModuleId ); xModuleImageManager.set( xUICfgMgr->getImageManager(), UNO_QUERY ); - m_aModuleIdToImageMgrMap.insert( ModuleIdToImagegMgr::value_type( aModuleId, xModuleImageManager )); + s_aModuleIdToImageMgrMap.insert( ModuleIdToImagegMgr::value_type( aModuleId, xModuleImageManager )); } Sequence< Reference< css::graphic::XGraphic > > aGraphicSeq; |