diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 14:59:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:38:36 +0000 |
| commit | cc864650e0ea91144129b652d250e6de6de46e73 (patch) | |
| tree | b50b740ae3120f70bed4269221d45dceca28146c | |
| parent | 376257707de9e6375a913aabde88355bdb42f2ec (diff) | |
pointless to go from char* to OString to char*
| -rw-r--r-- | desktop/source/app/app.cxx | 12 | ||||
| -rw-r--r-- | formula/source/ui/resource/ModuleHelper.cxx | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index dfb9879d4e4a..996fc6cf36ef 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -195,12 +195,10 @@ ResMgr* Desktop::GetDesktopResManager() { if ( !Desktop::pResMgr ) { - String aMgrName = String::CreateFromAscii( "dkt" ); - // Create desktop resource manager and bootstrap process // was successful. Use default way to get language specific message. if ( Application::IsInExecute() ) - Desktop::pResMgr = ResMgr::CreateResMgr( U2S( aMgrName )); + Desktop::pResMgr = ResMgr::CreateResMgr("dkt"); if ( !Desktop::pResMgr ) { @@ -215,7 +213,7 @@ ResMgr* Desktop::GetDesktopResManager() ::com::sun::star::lang::Locale aLocale( aLanguage, aCountry, aVariant ); - Desktop::pResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale); + Desktop::pResMgr = ResMgr::SearchCreateResMgr( "dkt", aLocale); AllSettings as = GetSettings(); as.SetUILocale(aLocale); SetSettings(as); @@ -1606,13 +1604,11 @@ int Desktop::Main() // create title string sal_Bool bCheckOk = sal_False; ::com::sun::star::lang::Locale aLocale; - String aMgrName = String::CreateFromAscii( "iso" ); - ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale ); + ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "iso", aLocale ); if ( !pLabelResMgr ) { // no "iso" resource -> search for "ooo" resource - aMgrName = String::CreateFromAscii( "ooo" ); - pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale); + pLabelResMgr = ResMgr::SearchCreateResMgr( "ooo", aLocale); } String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String(); delete pLabelResMgr; diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index b9ac84c66265..a0c2ae61f859 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -90,8 +90,7 @@ ResMgr* OModuleImpl::getResManager() if (!m_pRessources) { // create a manager with a fixed prefix - rtl::OString sName = rtl::OString( "forui" ); - m_pRessources = ResMgr::CreateResMgr(sName); + m_pRessources = ResMgr::CreateResMgr("forui"); } return m_pRessources; } |