diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 11:23:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:38:35 +0000 |
| commit | fcc749b09d2460b8d7e44db57728bbc60adf4576 (patch) | |
| tree | 1611b9b9a64f8d7b3d4c5529b68096c6e6473487 /framework | |
| parent | 45615cda780055d65e69924bfded005288c0f1af (diff) | |
Why bother creating a OString from a char* to cast back to a char*
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/fwkresid.cxx | 5 | ||||
| -rw-r--r-- | framework/source/classes/fwlresid.cxx | 5 | ||||
| -rw-r--r-- | framework/source/services/license.cxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 9 |
4 files changed, 5 insertions, 17 deletions
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx index 6db48363ab..edbc4fafa0 100644 --- a/framework/source/classes/fwkresid.cxx +++ b/framework/source/classes/fwkresid.cxx @@ -45,11 +45,8 @@ ResMgr* FwkResId::GetResManager() if ( !pResMgr ) { - rtl::OStringBuffer aBuf( 32 ); - aBuf.append( "fwe" ); - SolarMutexGuard aSolarGuard; - pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); + pResMgr = ResMgr::CreateResMgr("fwe"); } return pResMgr; diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 99e6b6e8ff..4a2ced64c3 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -45,11 +45,8 @@ ResMgr* FwlResId::GetResManager() if ( !pResMgr ) { - rtl::OStringBuffer aBuf( 32 ); - aBuf.append( "fwe" ); - SolarMutexGuard aSolarGuard; - pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); + pResMgr = ResMgr::CreateResMgr("fwe"); } return pResMgr; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 03bc99b014..1b3d78c10d 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -268,10 +268,9 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na // determine the filename of the license to show ::rtl::OUString aLangString; ::com::sun::star::lang::Locale aLocale; - ::rtl::OString aMgrName = ::rtl::OString("fwe"); AllSettings aSettings(Application::GetSettings()); aLocale = aSettings.GetUILocale(); - ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale); + ResMgr* pResMgr = ResMgr::SearchCreateResMgr("fwe", aLocale); aLangString = aLocale.Language; if ( aLocale.Country.getLength() != 0 ) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 8ad9e98359..556414c84c 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -230,9 +230,7 @@ ControlMenuController::~ControlMenuController() // private function void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { - rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" )); - - ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US )); + ResMgr* pResMgr = ResMgr::CreateResMgr("svx"); ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); @@ -383,10 +381,7 @@ void ControlMenuController::impl_setPopupMenu() { if ( m_pResPopupMenu == 0 ) { - rtl::OStringBuffer aBuf( 32 ); - aBuf.append( "svx" ); - - ResMgr* pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); + ResMgr* pResMgr = ResMgr::CreateResMgr("svx"); if ( pResMgr ) { ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr ); |