diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-01 13:20:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 06:49:52 +0000 |
| commit | 7855ea48309ee2ba06ee5f3d5dac27ecfc4ca4a6 (patch) | |
| tree | 359d2a334303f6e32582981efef6e6e0d6b69e01 /svl | |
| parent | cd71034b26a404c8f9b763865ef6ebdd0adeebb7 (diff) | |
remove comphelper::string::remove
and replace it with OUString/OString::replaceAll
Change-Id: I37b1c3b51251dfd9d749d6f1060c75b3a93d7f1a
Reviewed-on: https://gerrit.libreoffice.org/26850
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/lngmisc.cxx | 4 | ||||
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 2 | ||||
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index 769d7832f5f8..019cbb556c65 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -38,8 +38,8 @@ namespace linguistic bool RemoveHyphens(OUString &rTxt) { sal_Int32 n = rTxt.getLength(); - rTxt = comphelper::string::remove(rTxt, SVT_SOFT_HYPHEN); - rTxt = comphelper::string::remove(rTxt, SVT_HARD_HYPHEN); + rTxt = rTxt.replaceAll(OUString(SVT_SOFT_HYPHEN), ""); + rTxt = rTxt.replaceAll(OUString(SVT_HARD_HYPHEN), ""); return n != rTxt.getLength(); } diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index e446d73bcb24..6154e2a9bb78 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -2915,7 +2915,7 @@ bool ImpSvNumberInputScan::ScanStringNumFor( const OUString& rString, // S !bFirst && (nSign < 0) && pFormat->IsSecondSubformatRealNegative() ) { // simply negated twice? --1 - aString = comphelper::string::remove(aString, ' '); + aString = aString.replaceAll(" ", ""); if ( (aString.getLength() == 1) && (aString[0] == '-') ) { bFound = true; diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 43040c93ae6b..723986ca042b 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -125,8 +125,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback( while( -1 != n ) { OUString s( sTopics.getToken( 0, '\t', n )); - s = comphelper::string::remove(s, '\n'); - s = comphelper::string::remove(s, '\r'); + s = s.replaceAll("\n", "").replaceAll("\r", ""); if( !hText1 || s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) ) { DdeString aDStr( pInst->hDdeInstSvr, s ); |