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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/dialog/newstyle.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index d3ad69fd784b..acdd72ec061b 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1328,8 +1328,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac if (pFilter) { sExtension = pFilter->GetDefaultExtension (); - sExtension = comphelper::string::remove(sExtension, '*'); - sExtension = comphelper::string::remove(sExtension, '.'); + sExtension = sExtension.replaceAll("*", "").replaceAll(".", ""); } // a) the new way (optional!) diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 33948a46d0df..374ece4a8274 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -1165,7 +1165,7 @@ namespace sfx2 if ( !_bForOpen ) { // show '*' in extensions only when opening a document - sExt = comphelper::string::remove(sExt, '*'); + sExt = sExt.replaceAll("*", ""); } sRet += sOpenBracket; sRet += sExt; diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 1522234ef25f..c7995c9f2a08 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -914,15 +914,12 @@ bool CreateFromAddress_Impl( OUString& rFrom ) } rFrom += comphelper::string::strip(aName, ' '); // remove illegal characters - rFrom = comphelper::string::remove(rFrom, '<'); - rFrom = comphelper::string::remove(rFrom, '>'); - rFrom = comphelper::string::remove(rFrom, '@'); + rFrom = rFrom.replaceAll("<", "").replaceAll(">", "").replaceAll("@", ""); } OUString aEmailName = aUserCFG.GetEmail(); // remove illegal characters - aEmailName = comphelper::string::remove(aEmailName, '<'); - aEmailName = comphelper::string::remove(aEmailName, '>'); + aEmailName = aEmailName.replaceAll("<", "").replaceAll(">", ""); if ( !aEmailName.isEmpty() ) { diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index db3d03edb36f..0a016939b78a 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -53,7 +53,7 @@ IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKHdl, ComboBox&, void ) IMPL_LINK_TYPED( SfxNewStyleDlg, ModifyHdl, Edit&, rBox, void ) { - m_pOKBtn->Enable( !comphelper::string::remove(rBox.GetText(), ' ').isEmpty() ); + m_pOKBtn->Enable( !rBox.GetText().replaceAll(" ", "").isEmpty() ); } SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool ) diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index dc996183252b..8f7a814bdce6 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -970,7 +970,7 @@ OUString SfxObjectShell::GetServiceNameFromFactory( const OUString& rFact ) aFact = aFact.copy( 0, nPos ); aParam = aParam.copy(1); } - aFact = comphelper::string::remove(aFact, '4'); + aFact = aFact.replaceAll("4", ""); aFact = aFact.toAsciiLowerCase(); // HACK: sometimes a real document service name is given here instead of |