Kaydet (Commit) 551f76f4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Drop unnecessary SfxApplication::CreateResManager wrapper

Change-Id: I2b8662ec85b8f710aa17a2c6f59c4b35af7685f3
üst 7dad0652
...@@ -153,7 +153,6 @@ public: ...@@ -153,7 +153,6 @@ public:
// Resource Manager // Resource Manager
ResMgr* GetSfxResManager(); ResMgr* GetSfxResManager();
static ResMgr* CreateResManager( const char *pPrefix );
// DDE // DDE
#if defined( WNT ) #if defined( WNT )
......
...@@ -130,7 +130,7 @@ void ScModule::InitInterface_Impl() ...@@ -130,7 +130,7 @@ void ScModule::InitInterface_Impl()
} }
ScModule::ScModule( SfxObjectFactory* pFact ) : ScModule::ScModule( SfxObjectFactory* pFact ) :
SfxModule( SfxApplication::CreateResManager( "sc" ), false, pFact, NULL ), SfxModule( ResMgr::CreateResMgr( "sc" ), false, pFact, NULL ),
mpDragData(new ScDragData), mpDragData(new ScDragData),
mpClipData(new ScClipData), mpClipData(new ScClipData),
pSelTransfer( NULL ), pSelTransfer( NULL ),
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <unotools/ucbstreamhelper.hxx> #include <unotools/ucbstreamhelper.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <vcl/virdev.hxx> #include <vcl/virdev.hxx>
#include <sfx2/app.hxx>
#include <vcl/status.hxx> #include <vcl/status.hxx>
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
#include <sfx2/msg.hxx> #include <sfx2/msg.hxx>
...@@ -68,7 +67,7 @@ void SdModule::InitInterface_Impl() ...@@ -68,7 +67,7 @@ void SdModule::InitInterface_Impl()
// Ctor // Ctor
SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
: SfxModule( SfxApplication::CreateResManager("sd"), false, : SfxModule( ResMgr::CreateResMgr("sd"), false,
pFact1, pFact2, NULL ), pFact1, pFact2, NULL ),
pTransferClip(NULL), pTransferClip(NULL),
pTransferDrag(NULL), pTransferDrag(NULL),
......
...@@ -375,15 +375,6 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame ) ...@@ -375,15 +375,6 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
pFrame->GetViewShell()->SetCurrentDocument(); pFrame->GetViewShell()->SetCurrentDocument();
} }
ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
{
return ResMgr::CreateResMgr(pPrefix);
}
ResMgr* SfxApplication::GetSfxResManager() ResMgr* SfxApplication::GetSfxResManager()
{ {
return SfxResId::GetResMgr(); return SfxResId::GetResMgr();
......
...@@ -228,9 +228,9 @@ bool SfxApplication::Initialize_Impl() ...@@ -228,9 +228,9 @@ bool SfxApplication::Initialize_Impl()
RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1); RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1);
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
pAppData_Impl->pBasicResMgr = CreateResManager("sb"); pAppData_Impl->pBasicResMgr = ResMgr::CreateResMgr("sb");
#endif #endif
pAppData_Impl->pSvtResMgr = CreateResManager("svt"); pAppData_Impl->pSvtResMgr = ResMgr::CreateResMgr("svt");
pAppData_Impl->m_pSoErrorHdl = new SfxErrorHandler( pAppData_Impl->m_pSoErrorHdl = new SfxErrorHandler(
RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END, pAppData_Impl->pSvtResMgr ); RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END, pAppData_Impl->pSvtResMgr );
......
...@@ -884,7 +884,7 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChoose ...@@ -884,7 +884,7 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChoose
ResMgr* SfxApplication::GetOffResManager_Impl() ResMgr* SfxApplication::GetOffResManager_Impl()
{ {
if ( !pAppData_Impl->pOfaResMgr ) if ( !pAppData_Impl->pOfaResMgr )
pAppData_Impl->pOfaResMgr = CreateResManager( "ofa"); pAppData_Impl->pOfaResMgr = ResMgr::CreateResMgr( "ofa");
return pAppData_Impl->pOfaResMgr; return pAppData_Impl->pOfaResMgr;
} }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <sfx2/sfxresid.hxx> #include <sfx2/sfxresid.hxx>
#include <sfx2/app.hxx>
#include "tools/resmgr.hxx" #include "tools/resmgr.hxx"
...@@ -36,7 +35,7 @@ ResMgr* SfxResId::GetResMgr() ...@@ -36,7 +35,7 @@ ResMgr* SfxResId::GetResMgr()
{ {
if ( !pMgr ) if ( !pMgr )
{ {
pMgr = SfxApplication::CreateResManager("sfx"); pMgr = ResMgr::CreateResMgr("sfx");
} }
return pMgr; return pMgr;
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <tools/globname.hxx> #include <tools/globname.hxx>
#include <vcl/status.hxx> #include <vcl/status.hxx>
#include <sfx2/msg.hxx> #include <sfx2/msg.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx> #include <sfx2/objface.hxx>
#include <svl/whiter.hxx> #include <svl/whiter.hxx>
#include <sfx2/request.hxx> #include <sfx2/request.hxx>
...@@ -164,7 +163,7 @@ void SmModule::InitInterface_Impl() ...@@ -164,7 +163,7 @@ void SmModule::InitInterface_Impl()
} }
SmModule::SmModule(SfxObjectFactory* pObjFact) : SmModule::SmModule(SfxObjectFactory* pObjFact) :
SfxModule(SfxApplication::CreateResManager("sm"), false, pObjFact, NULL), SfxModule(ResMgr::CreateResMgr("sm"), false, pObjFact, NULL),
pColorConfig( 0 ), pColorConfig( 0 ),
pConfig( 0 ), pConfig( 0 ),
pLocSymbolData( 0 ), pLocSymbolData( 0 ),
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "dialmgr.hxx" #include "dialmgr.hxx"
#include <sfx2/app.hxx> #include <tools/resmgr.hxx>
#ifndef DISABLE_DYNLOADING #ifndef DISABLE_DYNLOADING
ResMgr* pSwResMgr=0; ResMgr* pSwResMgr=0;
...@@ -30,7 +30,7 @@ ResMgr* SwDialogsResMgr::GetResMgr() ...@@ -30,7 +30,7 @@ ResMgr* SwDialogsResMgr::GetResMgr()
{ {
if ( !pSwResMgr ) if ( !pSwResMgr )
{ {
pSwResMgr = SfxApplication::CreateResManager( "sw" ); pSwResMgr = ResMgr::CreateResMgr( "sw" );
} }
return pSwResMgr; return pSwResMgr;
......
...@@ -150,7 +150,7 @@ using namespace ::com::sun::star::uno; ...@@ -150,7 +150,7 @@ using namespace ::com::sun::star::uno;
SwModule::SwModule( SfxObjectFactory* pWebFact, SwModule::SwModule( SfxObjectFactory* pWebFact,
SfxObjectFactory* pFact, SfxObjectFactory* pFact,
SfxObjectFactory* pGlobalFact ) SfxObjectFactory* pGlobalFact )
: SfxModule( SfxApplication::CreateResManager( "sw" ), false, pWebFact, : SfxModule( ResMgr::CreateResMgr( "sw" ), false, pWebFact,
pFact, pGlobalFact, NULL ), pFact, pGlobalFact, NULL ),
pModuleConfig(0), pModuleConfig(0),
pUsrPref(0), pUsrPref(0),
......
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