diff options
author | Eike Rathke <erack@redhat.com> | 2014-03-28 15:46:38 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2014-03-28 17:35:40 +0100 |
commit | 06b4ca896f508586c0b2378c6308877c487559dd (patch) | |
tree | 9eeb9bb3e82a8a226be46e700c6198304414c118 /svl | |
parent | 2cf4763e3c1810af3278b4bf63f76cec9e94d28c (diff) |
name things what they are
Change-Id: I13d0cb525f3ca22b1b9158b2ac20b8b59d645463
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/numbers/zforfind.cxx | 8 | ||||
-rw-r--r-- | svl/source/numbers/zformat.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zforscan.cxx | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index e18c50d76b0e..8ae49e4524d4 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -65,7 +65,7 @@ const sal_uInt8 ImpSvNumberInputScan::nMatchedUsedAsReturn = 0x10; * would work, together with the nTimezonePos handling in GetTimeRef(). */ #define NF_RECOGNIZE_ISO8601_TIMEZONES 0 -static const sal_Unicode cNonBreakingSpace = 0xA0; +static const sal_Unicode cNoBreakSpace = 0xA0; ImpSvNumberInputScan::ImpSvNumberInputScan( SvNumberFormatter* pFormatterP ) : @@ -461,7 +461,7 @@ inline void ImpSvNumberInputScan::SkipBlanks( const OUString& rString, if ( nPos < rString.getLength() ) { const sal_Unicode* p = rString.getStr() + nPos; - while ( *p == ' ' || *p == cNonBreakingSpace ) + while ( *p == ' ' || *p == cNoBreakSpace ) { nPos++; p++; @@ -493,8 +493,8 @@ inline bool ImpSvNumberInputScan::GetThousandSep( const OUString& rString, sal_uInt16 nStringPos ) { const OUString& rSep = pFormatter->GetNumThousandSep(); - // Is it an ordinary space instead of a non-breaking space? - bool bSpaceBreak = rSep[0] == cNonBreakingSpace && rString[0] == (sal_Unicode)0x20 && + // Is it an ordinary space instead of a no-break space? + bool bSpaceBreak = rSep[0] == cNoBreakSpace && rString[0] == (sal_Unicode)0x20 && rSep.getLength() == 1 && rString.getLength() == 1; if (!((rString == rSep || bSpaceBreak) && // nothing else nStringPos < nAnzStrings - 1 && // safety first! diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index a34778e6c53c..05707355a300 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -722,7 +722,7 @@ SvNumberformat::SvNumberformat(OUString& rString, { OUStringBuffer sBuff(rString); - // If the group (AKA thousand) separator is a Non-Breaking Space (French) + // If the group (AKA thousand) separator is a No-Break Space (French) // replace all occurrences by a simple space. // The tokens will be changed to the LocaleData separator again later on. const sal_Unicode cNBSp = 0xA0; diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 4165b9f62d88..22a2a1c78a60 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -36,7 +36,7 @@ #include <svl/nfsymbol.hxx> using namespace svt; -const sal_Unicode cNonBreakingSpace = 0xA0; +const sal_Unicode cNoBreakSpace = 0xA0; namespace { @@ -1528,11 +1528,11 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) sal_Unicode cOldKeyMI = sKeyword[NF_KEY_MI][0]; sal_Unicode cOldKeyS = sKeyword[NF_KEY_S][0]; - // If the group separator is a Non-Breaking Space (French) continue with a + // If the group separator is a No-Break Space (French) continue with a // normal space instead so queries on space work correctly. // The format string is adjusted to allow both. // For output of the format code string the LocaleData characters are used. - if ( sOldThousandSep[0] == cNonBreakingSpace && sOldThousandSep.getLength() == 1 ) + if ( sOldThousandSep[0] == cNoBreakSpace && sOldThousandSep.getLength() == 1 ) { sOldThousandSep = " "; } @@ -1832,7 +1832,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) { // strange, those French.. bool bFirst = true; - // set a hard Non-Breaking Space or ConvertMode + // set a hard No-Break Space or ConvertMode const OUString& rSepF = pFormatter->GetNumThousandSep(); while ( i < nAnzStrings && sStrArray[i] == sOldThousandSep && @@ -2712,7 +2712,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) if (((eScannedType & NUMBERFORMAT_DATE) == 0) && (StringEqualsChar( pFormatter->GetNumThousandSep(), c) || StringEqualsChar( pFormatter->GetNumDecimalSep(), c) || - (c == ' ' && StringEqualsChar( pFormatter->GetNumThousandSep(), cNonBreakingSpace)))) + (c == ' ' && StringEqualsChar( pFormatter->GetNumThousandSep(), cNoBreakSpace)))) { rString += sStrArray[i]; } |