[Libreoffice-commits] core.git: include/sfx2 sc/source sd/source sfx2/source starmath/source sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Jul 29 05:28:35 PDT 2014
include/sfx2/app.hxx | 1 -
sc/source/ui/app/scmod.cxx | 2 +-
sd/source/ui/app/sdmod.cxx | 3 +--
sfx2/source/appl/app.cxx | 9 ---------
sfx2/source/appl/appinit.cxx | 4 ++--
sfx2/source/appl/appserv.cxx | 2 +-
sfx2/source/bastyp/sfxresid.cxx | 3 +--
starmath/source/smmod.cxx | 3 +--
sw/source/ui/dialog/swdialmgr.cxx | 4 ++--
sw/source/uibase/app/swmodule.cxx | 2 +-
10 files changed, 10 insertions(+), 23 deletions(-)
New commits:
commit 551f76f410c5a2b8efb7e4736ca0e1440bd58276
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jul 29 14:27:34 2014 +0200
Drop unnecessary SfxApplication::CreateResManager wrapper
Change-Id: I2b8662ec85b8f710aa17a2c6f59c4b35af7685f3
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 0928635..0a11a06 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -153,7 +153,6 @@ public:
// Resource Manager
ResMgr* GetSfxResManager();
- static ResMgr* CreateResManager( const char *pPrefix );
// DDE
#if defined( WNT )
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index d534592..84eddf0 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -130,7 +130,7 @@ void ScModule::InitInterface_Impl()
}
ScModule::ScModule( SfxObjectFactory* pFact ) :
- SfxModule( SfxApplication::CreateResManager( "sc" ), false, pFact, NULL ),
+ SfxModule( ResMgr::CreateResMgr( "sc" ), false, pFact, NULL ),
mpDragData(new ScDragData),
mpClipData(new ScClipData),
pSelTransfer( NULL ),
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 9bd820d..8bde8c4 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -22,7 +22,6 @@
#include <unotools/ucbstreamhelper.hxx>
#include <tools/urlobj.hxx>
#include <vcl/virdev.hxx>
-#include <sfx2/app.hxx>
#include <vcl/status.hxx>
#include <svl/intitem.hxx>
#include <sfx2/msg.hxx>
@@ -68,7 +67,7 @@ void SdModule::InitInterface_Impl()
// Ctor
SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
-: SfxModule( SfxApplication::CreateResManager("sd"), false,
+: SfxModule( ResMgr::CreateResMgr("sd"), false,
pFact1, pFact2, NULL ),
pTransferClip(NULL),
pTransferDrag(NULL),
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index e30cd78..848c7a4 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -375,15 +375,6 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
pFrame->GetViewShell()->SetCurrentDocument();
}
-
-
-ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
-{
- return ResMgr::CreateResMgr(pPrefix);
-}
-
-
-
ResMgr* SfxApplication::GetSfxResManager()
{
return SfxResId::GetResMgr();
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 9f2c548..7ee6c22 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -228,9 +228,9 @@ bool SfxApplication::Initialize_Impl()
RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1);
#ifndef DISABLE_SCRIPTING
- pAppData_Impl->pBasicResMgr = CreateResManager("sb");
+ pAppData_Impl->pBasicResMgr = ResMgr::CreateResMgr("sb");
#endif
- pAppData_Impl->pSvtResMgr = CreateResManager("svt");
+ pAppData_Impl->pSvtResMgr = ResMgr::CreateResMgr("svt");
pAppData_Impl->m_pSoErrorHdl = new SfxErrorHandler(
RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END, pAppData_Impl->pSvtResMgr );
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f3aaed6..90ca409 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -884,7 +884,7 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChoose
ResMgr* SfxApplication::GetOffResManager_Impl()
{
if ( !pAppData_Impl->pOfaResMgr )
- pAppData_Impl->pOfaResMgr = CreateResManager( "ofa");
+ pAppData_Impl->pOfaResMgr = ResMgr::CreateResMgr( "ofa");
return pAppData_Impl->pOfaResMgr;
}
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 32487df..69de5b7 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -19,7 +19,6 @@
#include <sfx2/sfxresid.hxx>
-#include <sfx2/app.hxx>
#include "tools/resmgr.hxx"
@@ -36,7 +35,7 @@ ResMgr* SfxResId::GetResMgr()
{
if ( !pMgr )
{
- pMgr = SfxApplication::CreateResManager("sfx");
+ pMgr = ResMgr::CreateResMgr("sfx");
}
return pMgr;
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 8bc1ddc..7a746f4 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -20,7 +20,6 @@
#include <tools/globname.hxx>
#include <vcl/status.hxx>
#include <sfx2/msg.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <svl/whiter.hxx>
#include <sfx2/request.hxx>
@@ -164,7 +163,7 @@ void SmModule::InitInterface_Impl()
}
SmModule::SmModule(SfxObjectFactory* pObjFact) :
- SfxModule(SfxApplication::CreateResManager("sm"), false, pObjFact, NULL),
+ SfxModule(ResMgr::CreateResMgr("sm"), false, pObjFact, NULL),
pColorConfig( 0 ),
pConfig( 0 ),
pLocSymbolData( 0 ),
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index fb6ed35..405e083 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/sw/source/ui/dialog/swdialmgr.cxx
@@ -18,7 +18,7 @@
*/
#include "dialmgr.hxx"
-#include <sfx2/app.hxx>
+#include <tools/resmgr.hxx>
#ifndef DISABLE_DYNLOADING
ResMgr* pSwResMgr=0;
@@ -30,7 +30,7 @@ ResMgr* SwDialogsResMgr::GetResMgr()
{
if ( !pSwResMgr )
{
- pSwResMgr = SfxApplication::CreateResManager( "sw" );
+ pSwResMgr = ResMgr::CreateResMgr( "sw" );
}
return pSwResMgr;
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 8a48251..acc4d05 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -150,7 +150,7 @@ using namespace ::com::sun::star::uno;
SwModule::SwModule( SfxObjectFactory* pWebFact,
SfxObjectFactory* pFact,
SfxObjectFactory* pGlobalFact )
- : SfxModule( SfxApplication::CreateResManager( "sw" ), false, pWebFact,
+ : SfxModule( ResMgr::CreateResMgr( "sw" ), false, pWebFact,
pFact, pGlobalFact, NULL ),
pModuleConfig(0),
pUsrPref(0),
More information about the Libreoffice-commits
mailing list