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 /starmath | |
| parent | comphelper::OBaseMutex -> cppu::BaseMutex (diff) | |
| download | core-7855ea48309ee2ba06ee5f3d5dac27ecfc4ca4a6.tar.gz core-7855ea48309ee2ba06ee5f3d5dac27ecfc4ca4a6.zip | |
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 'starmath')
| -rw-r--r-- | starmath/source/dialog.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index ccccfeaf8409..6be8a2676449 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -2216,7 +2216,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, assert((&rComboBox == pOldSymbols || &rComboBox == pSymbols) && "Sm : wrong ComboBox"); // trim SymbolName (no blanks) - OUString aNormName(comphelper::string::remove(rSymbolName, ' ')); + OUString aNormName = rSymbolName.replaceAll(" ", ""); // and remove possible deviations within the input rComboBox.SetText(aNormName); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index eba45ac01734..dd8bcb2d13f9 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -970,7 +970,7 @@ Size SmViewShell::GetTextSize(OutputDevice& rDevice, const OUString& rText, long do { OUString aLine = rText.getToken(0, '\n', nPos); - aLine = comphelper::string::remove(aLine, '\r'); + aLine = aLine.replaceAll("\r", ""); aSize = GetTextLineSize(rDevice, aLine); @@ -1054,7 +1054,7 @@ void SmViewShell::DrawText(OutputDevice& rDevice, const Point& rPosition, const do { OUString aLine = rText.getToken(0, '\n', nPos); - aLine = comphelper::string::remove(aLine, '\r'); + aLine = aLine.replaceAll("\r", ""); aSize = GetTextLineSize(rDevice, aLine); if (aSize.Width() > MaxWidth) { |