diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-15 15:26:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-15 15:41:09 +0100 |
| commit | 9ab0b38e95133dab720408cc2c80093b8a201c10 (patch) | |
| tree | 416dde227ed5c4ded99292feb94f36a64c327999 /dbaccess/source/ui/app/AppController.cxx | |
| parent | Merge sal_textenc into sal just on Android (diff) | |
| download | core-9ab0b38e95133dab720408cc2c80093b8a201c10.tar.gz core-9ab0b38e95133dab720408cc2c80093b8a201c10.zip | |
Various string function clean up
Added:
* rtl::OString::matchL
* rtl::OString::endsWith
* rtl::OString::endsWithL
* rtl::OString::indexOfL
* rtl::OString::replaceFirst
* rtl::OString::replaceAll
* rtl::OString::getToken
* rtl::OUString::endsWith
* rtl::OUString::replaceFirst
* rtl::OUString::replaceFirstAsciiL
* rtl::OUString::replaceFirstAsciiLAsciiL
* rtl::OUString::replaceAll
* rtl::OUString::replaceAllAsciiL
* rtl::OUString::replaceAllAsciiLAsciiL
* rtl::OUString::getToken
plus underlying C functions where necessary
Deprecated:
* comphelper::string::remove
* comphelper::string::getToken
Removed:
* comphelper::string::searchAndReplaceAsciiL
* comphelper::string::searchAndReplaceAllAsciiWithAscii
* comphelper::string::searchAndReplaceAsciiI
* comphelper::string::replace
* comphelper::string::matchL
* comphelper::string::matchIgnoreAsciiCaseL
* comphelper::string::indexOfL
Also fixed some apparent misuses of RTL_CONSTASCII_USTRINGPARAM ->
RTL_CONSTASCII_STRINGPARAM.
Diffstat (limited to 'dbaccess/source/ui/app/AppController.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 3fd0762bcf87..b3f34f325871 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -90,7 +90,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> -#include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <comphelper/interaction.hxx> #include <comphelper/componentcontext.hxx> @@ -2964,8 +2963,12 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer default: case DatabaseObjectContainer::DATA_SOURCE: { - ::rtl::OUString sMessage = String(ModuleRes( RID_STR_UNSUPPORTED_OBJECT_TYPE )); - ::comphelper::string::searchAndReplaceAsciiI( sMessage, "$type$", ::rtl::OUString::valueOf(sal_Int32( pObject->Type )) ); + ::rtl::OUString sMessage( + rtl::OUString( + String(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))). + replaceFirstAsciiL( + RTL_CONSTASCII_STRINGPARAM("$type$"), + ::rtl::OUString::valueOf(sal_Int32(pObject->Type)))); throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() )); } } |