diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-08 00:49:32 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-12 13:35:57 +0100 |
| commit | 3f765e5bb2955683fc2db10f630365a4c35416d3 (patch) | |
| tree | 005cbfefc4547529d7a1e416b657d44c6e1e8308 /desktop/source/deployment | |
| parent | 56e4153e2cbee8d66659e0c59690ef8911ad090a (diff) | |
replace usage of OUString::replace*AsciiL() with string literal overloads
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 15 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 3 |
2 files changed, 6 insertions, 12 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index ae37a1d5cb4f..29ded177175a 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -893,8 +893,7 @@ void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv uno::Reference< deployment::XExtensionManager > xExtMgr = m_pManager->getExtensionManager(); uno::Reference< task::XAbortChannel > xAbortChannel( xExtMgr->createAbortChannel() ); OUString sTitle( - m_sAddingPackages.replaceAllAsciiL( - RTL_CONSTASCII_STRINGPARAM("%EXTENSION_NAME"), sName)); + m_sAddingPackages.replaceAll("%EXTENSION_NAME", sName)); rCmdEnv->progressSection( sTitle, xAbortChannel ); try @@ -922,8 +921,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdE uno::Reference< deployment::XExtensionManager > xExtMgr = m_pManager->getExtensionManager(); uno::Reference< task::XAbortChannel > xAbortChannel( xExtMgr->createAbortChannel() ); OUString sTitle( - m_sRemovingPackages.replaceAllAsciiL( - RTL_CONSTASCII_STRINGPARAM("%EXTENSION_NAME"), + m_sRemovingPackages.replaceAll("%EXTENSION_NAME", xPackage->getDisplayName())); rCmdEnv->progressSection( sTitle, xAbortChannel ); @@ -1008,8 +1006,7 @@ void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdE uno::Reference< deployment::XExtensionManager > xExtMgr = m_pManager->getExtensionManager(); uno::Reference< task::XAbortChannel > xAbortChannel( xExtMgr->createAbortChannel() ); OUString sTitle( - m_sEnablingPackages.replaceAllAsciiL( - RTL_CONSTASCII_STRINGPARAM("%EXTENSION_NAME"), + m_sEnablingPackages.replaceAll("%EXTENSION_NAME", xPackage->getDisplayName())); rCmdEnv->progressSection( sTitle, xAbortChannel ); @@ -1033,8 +1030,7 @@ void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmd uno::Reference< deployment::XExtensionManager > xExtMgr = m_pManager->getExtensionManager(); uno::Reference< task::XAbortChannel > xAbortChannel( xExtMgr->createAbortChannel() ); OUString sTitle( - m_sDisablingPackages.replaceAllAsciiL( - RTL_CONSTASCII_STRINGPARAM("%EXTENSION_NAME"), + m_sDisablingPackages.replaceAll("%EXTENSION_NAME", xPackage->getDisplayName())); rCmdEnv->progressSection( sTitle, xAbortChannel ); @@ -1058,8 +1054,7 @@ void ExtensionCmdQueue::Thread::_acceptLicense( ::rtl::Reference< ProgressCmdEnv uno::Reference< deployment::XExtensionManager > xExtMgr = m_pManager->getExtensionManager(); uno::Reference< task::XAbortChannel > xAbortChannel( xExtMgr->createAbortChannel() ); OUString sTitle( - m_sAcceptLicense.replaceAllAsciiL( - RTL_CONSTASCII_STRINGPARAM("%EXTENSION_NAME"), + m_sAcceptLicense.replaceAll("%EXTENSION_NAME", xPackage->getDisplayName())); rCmdEnv->progressSection( sTitle, xAbortChannel ); diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index e24873f7c017..710eea88adf9 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -93,8 +93,7 @@ bool satisfiesMaximalVersion( rtl::OUString produceErrorText( rtl::OUString const & reason, rtl::OUString const & version) { - return reason.replaceFirstAsciiL( - RTL_CONSTASCII_STRINGPARAM("%VERSION"), + return reason.replaceFirst("%VERSION", (version.isEmpty() ? ResId::toString( dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)) |