diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-11-28 15:52:32 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-11-28 15:52:32 +0000 |
| commit | 1a15756db5173403fcdbc3ad522c3a76e88a7082 (patch) | |
| tree | 915c55a6ea8920d9bf44229129cdfcd2679a3914 /framework/source | |
| parent | b8354e209b88f3375635f20542096ed1dac24ba8 (diff) | |
#i123068# remove implicit conversions from rtl strings to their elements
Notes
Notes:
prefer: 112bdf84d684590e042725c7173e059b4afa2f83
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/license.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 99dee03eb214..2e25588c98a5 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -1187,7 +1187,7 @@ void ToolbarLayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbx uno::Reference< ui::XUIElement > xUIElement; implts_createToolBar( aTbxResName, bNotify, xUIElement ); - if ( aTitle && xUIElement.is() ) + if ( !aTitle.isEmpty() && xUIElement.is() ) { vos::OGuard aGuard( Application::GetSolarMutex() ); diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 5916f2fd1cc7..ea62c0a8835b 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -282,7 +282,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na ::rtl::OString aMgrName = ::rtl::OString("fwe"); AllSettings aSettings(Application::GetSettings()); aLocale = aSettings.GetUILocale(); - ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale); + ResMgr* pResMgr = ResMgr::SearchCreateResMgr( aMgrName.getStr(), aLocale); aLangString = aLocale.Language; if ( aLocale.Country.getLength() != 0 ) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 5f193a0e6fc7..0054d2ee11ab 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -228,7 +228,7 @@ 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( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ).getStr() ); ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); |