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 /basctl/source/basicide/bastypes.cxx | |
| parent | 42422f2599220b678aa41c4aadeec28df113c3ec (diff) | |
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 'basctl/source/basicide/bastypes.cxx')
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index f1987d19de87..67244eac269c 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -38,7 +38,6 @@ #include <basic/basmgr.hxx> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> -#include <comphelper/string.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/passwd.hxx> #include <sfx2/viewfrm.hxx> @@ -757,7 +756,8 @@ bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent ) ::rtl::OUStringBuffer aNameBuf( rName ); aNameBuf.append('\''); aNameBuf.insert(sal_Int32(0), sal_Unicode('\'')); - aQuery = ::comphelper::string::replace(aQuery, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XX")), aNameBuf.makeStringAndClear()); + aQuery = aQuery.replaceAllAsciiL( + RTL_CONSTASCII_STRINGPARAM("XX"), aNameBuf.makeStringAndClear()); QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery ); return ( aQueryBox.Execute() == RET_YES ); } @@ -802,7 +802,8 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, if ( bNewTitle ) { ::rtl::OUString aTitle(ResId::toString(IDEResId(RID_STR_ENTERPASSWORD))); - aTitle = ::comphelper::string::replace(aTitle, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("XX")), rLibName); + aTitle = aTitle.replaceAllAsciiL( + RTL_CONSTASCII_STRINGPARAM("XX"), rLibName); pDlg->SetText( aTitle ); } |