svl/source/numbers/zforfind.cxx | 15 ++++----------- svl/source/numbers/zforfind.hxx | 2 -- 2 files changed, 4 insertions(+), 13 deletions(-)
New commits: commit 26dea94b01d196a146767af8b76fba41697e8150 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Mar 22 21:34:35 2017 +0100 Use rtl::isAscii* instead of ctype.h is* with sal_Unicode arg Change-Id: I744f774e6e43866f1c6ef9ff8de2d9f2e183f0be diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index e04272a847b8..c550d205247c 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -140,13 +140,6 @@ void ImpSvNumberInputScan::Reset() } } - -// static -inline bool ImpSvNumberInputScan::MyIsdigit( sal_Unicode c ) -{ - return c < 128 && isdigit( (unsigned char) c ); -} - // native number transliteration if necessary void TransformInput( SvNumberFormatter* pFormatter, OUString& rStr ) { @@ -246,7 +239,7 @@ bool ImpSvNumberInputScan::NextNumberStringSymbol( const sal_Unicode*& pStr, switch (eState) { case SsStart: - if ( MyIsdigit( cToken ) ) + if ( rtl::isAsciiDigit( cToken ) ) { eState = SsGetValue; isNumber = true; @@ -258,7 +251,7 @@ bool ImpSvNumberInputScan::NextNumberStringSymbol( const sal_Unicode*& pStr, nChars++; break; case SsGetValue: - if ( MyIsdigit( cToken ) ) + if ( rtl::isAsciiDigit( cToken ) ) { nChars++; } @@ -269,7 +262,7 @@ bool ImpSvNumberInputScan::NextNumberStringSymbol( const sal_Unicode*& pStr, } break; case SsGetString: - if ( !MyIsdigit( cToken ) ) + if ( !rtl::isAsciiDigit( cToken ) ) { nChars++; } @@ -332,7 +325,7 @@ bool ImpSvNumberInputScan::SkipThousands( const sal_Unicode*& pStr, } break; case SsGetValue: - if ( MyIsdigit( cToken ) ) + if ( rtl::isAsciiDigit( cToken ) ) { sBuff.append(cToken); nCounter++; diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index 351283bdef04..cedda8c7d73d 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -371,8 +371,6 @@ private: bool IsNumberFormatMain( const OUString& rString, const SvNumberformat* pFormat); // number format to match against - static inline bool MyIsdigit( sal_Unicode c ); - /** Whether input matches locale dependent date acceptance pattern. @param nStartPatternAt _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits