summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-03-01 12:20:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-03-01 20:38:36 +0000
commit5abed4b1538490bf3f0419c26f3a4296d5642cdd (patch)
tree3c49f4635b0183082d58eadced2e8d48ff97426f
parentbdf245c0685427c53c2f515524b33b3d9036384a (diff)
Pointless to convert char* to OString and back
-rw-r--r--svx/source/dialog/dialmgr.cxx5
-rw-r--r--svx/source/form/datanavi.cxx4
-rw-r--r--svx/source/gallery2/galmisc.cxx3
-rw-r--r--svx/source/svdraw/svdetc.cxx3
4 files changed, 4 insertions, 11 deletions
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index b2d0ba368a..0b3c259338 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -46,10 +46,7 @@ static ResMgr* pResMgr=0;
ResMgr* DialogsResMgr::GetResMgr()
{
if ( !pResMgr )
- {
- ByteString aName( "svx" );
- pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() );
- }
+ pResMgr = ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILocale() );
return pResMgr;
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 345df16414..cd7f2955f1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -810,10 +810,8 @@ namespace svxform
{
// create a resource manager, for the svx resource file
// and the UI locale
- ByteString aResourceFile( "svx" );
ResMgr* pResMgr = ResMgr::CreateResMgr(
- aResourceFile.GetBuffer(),
- Application::GetSettings().GetUILocale() );
+ "svx", Application::GetSettings().GetUILocale() );
// load the resources for the AddSubmission modal dialog.
// This will create our own resource context.
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index d431707fd3..37f402a9fb 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -76,9 +76,8 @@ ResMgr* GetGalleryResMgr()
if( !pGalleryResMgr )
{
- ByteString aResMgrName( "gal" );
pGalleryResMgr = ResMgr::CreateResMgr(
- aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ "gal", Application::GetSettings().GetUILocale() );
}
return pGalleryResMgr;
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 5acd912a3d..672319cc50 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -671,9 +671,8 @@ ResMgr* ImpGetResMgr()
if(!rGlobalData.pResMgr)
{
- ByteString aName("svx");
rGlobalData.pResMgr =
- ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILocale() );
}
return rGlobalData.pResMgr;