summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-18 21:03:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-19 21:11:02 +0000
commitca02d728082a86780d68ede7b9d565128dbc0434 (patch)
tree8c0a857ad73f89d592295f99e5f72a0c96e55e57 /svtools
parente4ff699291ddab16d70aa9b11c717e34dfbe5414 (diff)
remove [Byte]String::EraseAllChars
Diffstat (limited to 'svtools')
-rw-r--r--svtools/bmpmaker/bmpcore.cxx2
-rw-r--r--svtools/source/control/ctrltool.cxx3
-rw-r--r--svtools/source/filter/sgvtext.cxx3
-rw-r--r--svtools/source/misc/imap2.cxx4
-rw-r--r--svtools/source/svhtml/parhtml.cxx5
5 files changed, 9 insertions, 8 deletions
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index c6b13db704f0..d1e0964210d9 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -132,7 +132,7 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs,
aLine.EraseLeadingChars( ' ' );
aLine.EraseLeadingChars( '\t' );
- aLine.EraseAllChars( ';' );
+ aLine = comphelper::string::remove(aLine, ';');
if (comphelper::string::isdigitAsciiString(aLine))
{
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index dc736486ef9b..f7f29faa2864 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -33,6 +33,7 @@
#include <string.h>
+#include <comphelper/string.hxx>
#include <tools/debug.hxx>
#include <i18npool/mslangid.hxx>
#include <vcl/window.hxx>
@@ -469,7 +470,7 @@ XubString FontList::GetStyleName( const FontInfo& rInfo ) const
// Translate StyleName to localized name
XubString aCompareStyleName = aStyleName;
aCompareStyleName.ToLowerAscii();
- aCompareStyleName.EraseAllChars( ' ' );
+ aCompareStyleName = comphelper::string::remove(aCompareStyleName, ' ');
if ( aCompareStyleName.EqualsAscii( "bold" ) )
aStyleName = maBold;
else if ( aCompareStyleName.EqualsAscii( "bolditalic" ) )
diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index aa2899728fb4..4eab4c652f39 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -1266,8 +1266,7 @@ void SgfFontLst::ReadList()
for (i=0;i<Anz;i++)
{
- FID = aCfg.GetKeyName( i );
- FID = FID.EraseAllChars(); // Leerzeichen weg
+ FID = comphelper::string::remove(aCfg.GetKeyName(i), ' ');
Dsc = aCfg.ReadKey( i );
if (comphelper::string::isdigitAsciiString(FID))
{
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 98b0ee3fa0fd..5b1d23d8cc53 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -267,7 +267,7 @@ void ImageMap::ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseUR
aStr.EraseLeadingChars( ' ' );
aStr.EraseLeadingChars( '\t' );
- aStr.EraseAllChars( ';' );
+ aStr = comphelper::string::remove(aStr, ';');
aStr.ToLowerAscii();
const char* pStr = aStr.GetBuffer();
@@ -410,7 +410,7 @@ void ImageMap::ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseUR
aStr.EraseLeadingChars( ' ' );
aStr.EraseLeadingChars( '\t' );
- aStr.EraseAllChars( ';' );
+ aStr = comphelper::string::remove(aStr, ';');
aStr.ToLowerAscii();
const char* pStr = aStr.GetBuffer();
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 17f092d891af..eb976e541b74 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -31,6 +31,7 @@
#include <ctype.h>
#include <stdio.h>
+#include <comphelper/string.hxx>
#include <tools/stream.hxx>
#include <tools/debug.hxx>
#include <tools/color.hxx>
@@ -2121,8 +2122,8 @@ bool HTMLParser::ParseMetaOptionsImpl(
if ( bHTTPEquiv || HTML_META_DESCRIPTION != nAction )
{
// if it is not a Description, remove CRs and LFs from CONTENT
- aContent.EraseAllChars( _CR );
- aContent.EraseAllChars( _LF );
+ aContent = comphelper::string::remove(aContent, _CR);
+ aContent = comphelper::string::remove(aContent, _LF);
}
else
{