diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-28 00:17:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-29 09:56:06 +0100 |
commit | 14d2a60053e30dcb7e6956637fe8d57d18563e3f (patch) | |
tree | a395e8185afde2031fa255094ee9b0d23f11afe9 /svtools | |
parent | 65302eb1bed16db8f06cbb048d03ba6d644b3fb6 (diff) |
remove ByteString::IsAlphaNumericAscii and refactor a bit
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/bmpmaker/bmpcore.cxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/sgvtext.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx index c4f8db80f356..c6b13db704f0 100644 --- a/svtools/bmpmaker/bmpcore.cxx +++ b/svtools/bmpmaker/bmpcore.cxx @@ -134,7 +134,7 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs, aLine.EraseLeadingChars( '\t' ); aLine.EraseAllChars( ';' ); - if (comphelper::string::isAsciiDecimalString(aLine)) + if (comphelper::string::isdigitAsciiString(aLine)) { aString = aPrefix; diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx index f303ebfa4ac0..820cdd9ac168 100644 --- a/svtools/source/filter/sgvtext.cxx +++ b/svtools/source/filter/sgvtext.cxx @@ -1209,7 +1209,7 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc ) else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN; else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL; else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = osl_getThreadTextEncoding(); - else if (comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32()); + else if (comphelper::string::isdigitAsciiString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32()); } } } @@ -1268,7 +1268,7 @@ void SgfFontLst::ReadList() FID = aCfg.GetKeyName( i ); FID = FID.EraseAllChars(); // Leerzeichen weg Dsc = aCfg.ReadKey( i ); - if (comphelper::string::isAsciiDecimalString(FID)) + if (comphelper::string::isdigitAsciiString(FID)) { P=new SgfFontOne; // neuer Eintrag if (Last!=NULL) Last->Next=P; else pList=P; Last=P; // einklinken |