[Libreoffice-commits] .: cui/source sc/source svl/inc svl/source svtools/source svx/inc svx/source sw/source xmloff/source
Eike Rathke
erack at kemper.freedesktop.org
Tue Aug 9 16:40:58 PDT 2011
cui/source/tabpages/numfmt.cxx | 4
sc/source/core/data/column3.cxx | 2
sc/source/core/tool/interpr1.cxx | 4
sc/source/core/tool/zforauto.cxx | 2
sc/source/ui/docshell/docsh8.cxx | 2
sc/source/ui/view/viewfunc.cxx | 2
svl/inc/svl/zforlist.hxx | 120 ++++-----
svl/inc/svl/zformat.hxx | 148 ++++++------
svl/source/numbers/numfmuno.cxx | 16 -
svl/source/numbers/zforfind.cxx | 362 ++++++++++++++---------------
svl/source/numbers/zforfind.hxx | 100 ++++----
svl/source/numbers/zforlist.cxx | 354 ++++++++++++++--------------
svl/source/numbers/zformat.cxx | 440 ++++++++++++++++++------------------
svl/source/numbers/zforscan.cxx | 112 ++++-----
svl/source/numbers/zforscan.hxx | 66 ++---
svtools/source/control/fmtfield.cxx | 8
svx/inc/svx/numfmtsh.hxx | 64 ++---
svx/source/items/numfmtsh.cxx | 145 +++++------
sw/source/core/doc/tblafmt.cxx | 2
sw/source/ui/table/tautofmt.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 2
21 files changed, 983 insertions(+), 974 deletions(-)
New commits:
commit ea4470cbaca80a3d3f5816434918dc99cd989d8d
Author: Eike Rathke <erack at erack.de>
Date: Wed Aug 10 01:32:41 2011 +0200
Number formatter sal_Bool -> bool clean-up and cosmetics
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 8320b5d..058aa99 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -960,8 +960,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa
sal_uInt16 nCategory = nCurCategory;
sal_uInt16 nDecimals = 0;
sal_uInt16 nZeroes = 0;
- sal_Bool bNegRed = sal_False;
- sal_Bool bThousand = sal_False;
+ bool bNegRed = false;
+ bool bThousand = false;
sal_uInt16 nCurrencyPos =aLbCurrency.GetSelectEntryPos();
if(bOneAreaFlag)
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 9c7d2fa..8c3b373 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2026,7 +2026,7 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
sal_uInt16 nPrec;
if (pEntry)
{
- sal_Bool bThousand, bNegRed;
+ bool bThousand, bNegRed;
sal_uInt16 nLeading;
pEntry->GetFormatSpecialInfo(bThousand, bNegRed, nPrec, nLeading);
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 0b22267..df9f3c8 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2038,9 +2038,9 @@ void ScInterpreter::ScCell()
else if( aInfoType.EqualsAscii( "FORMAT" ) )
{ // specific format code for standard formats
sal_uLong nFormat = pDok->GetNumberFormat( aCellPos );
- sal_Bool bAppendPrec = sal_True;
+ bool bAppendPrec = true;
sal_uInt16 nPrec, nLeading;
- sal_Bool bThousand, bIsRed;
+ bool bThousand, bIsRed;
pFormatter->GetFormatSpecialInfo( nFormat, bThousand, bIsRed, nPrec, nLeading );
switch( pFormatter->GetType( nFormat ) )
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 6d8266b..b438fb7 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -99,7 +99,7 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat,
sal_uLong ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
{
short nType;
- sal_Bool bNewInserted;
+ bool bNewInserted;
xub_StrLen nCheckPos;
return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLnge,
eSysLnge, nType, bNewInserted, nCheckPos);
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 1cf3a34..c33b76a 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -273,7 +273,7 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales
continue;
LanguageType eLang = pOldEntry->GetLanguage();
- sal_Bool bThousand, bNegRed;
+ bool bThousand, bNegRed;
sal_uInt16 nPrecision, nLeading;
pOldEntry->GetFormatSpecialInfo(bThousand, bNegRed, nPrecision, nLeading);
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 8e49287..2b934ee 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2778,7 +2778,7 @@ void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement )
sal_Bool bError = false;
LanguageType eLanguage = pOldEntry->GetLanguage();
- sal_Bool bThousand, bNegRed;
+ bool bThousand, bNegRed;
sal_uInt16 nPrecision, nLeading;
pOldEntry->GetFormatSpecialInfo( bThousand, bNegRed, nPrecision, nLeading );
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 60f42ba..34deb79 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -235,9 +235,9 @@ class SVL_DLLPUBLIC NfCurrencyEntry
String aSymbol; /// currency symbol
String aBankSymbol; /// currency abbreviation
LanguageType eLanguage; /// language/country value
- sal_uInt16 nPositiveFormat; /// position of symbol
- sal_uInt16 nNegativeFormat; /// position of symbol and type and position of negative sign
- sal_uInt16 nDigits; /// count of decimal digits
+ sal_uInt16 nPositiveFormat; /// position of symbol
+ sal_uInt16 nNegativeFormat; /// position of symbol and type and position of negative sign
+ sal_uInt16 nDigits; /// count of decimal digits
sal_Unicode cZeroChar; /// which character is used for zeros as last decimal digits
/// not implemented, prevent usage
@@ -264,11 +264,11 @@ public:
~NfCurrencyEntry() {}
/// Symbols and language identical
- sal_Bool operator==( const NfCurrencyEntry& r ) const;
+ bool operator==( const NfCurrencyEntry& r ) const;
/// Set this format to be the EURo entry, overwrite other settings
void SetEuro();
- sal_Bool IsEuro() const;
+ bool IsEuro() const;
/** Apply format information (nPositiveFormat,
nNegativeFormat, nDigits, cZeroChar) of another format. */
@@ -277,29 +277,29 @@ public:
const String& GetSymbol() const { return aSymbol; }
const String& GetBankSymbol() const { return aBankSymbol; }
LanguageType GetLanguage() const { return eLanguage; }
- sal_uInt16 GetPositiveFormat() const { return nPositiveFormat; }
- sal_uInt16 GetNegativeFormat() const { return nNegativeFormat; }
- sal_uInt16 GetDigits() const { return nDigits; }
+ sal_uInt16 GetPositiveFormat() const { return nPositiveFormat; }
+ sal_uInt16 GetNegativeFormat() const { return nNegativeFormat; }
+ sal_uInt16 GetDigits() const { return nDigits; }
sal_Unicode GetZeroChar() const { return cZeroChar; }
- /** [$DM-407] (bBank==sal_False) or [$DEM] (bBank==sal_True)
- is assigned to rStr, if bBank==sal_False and
- bWithoutExtension==sal_True only [$DM] */
- void BuildSymbolString( String& rStr, sal_Bool bBank,
- sal_Bool bWithoutExtension = sal_False ) const;
+ /** [$DM-407] (bBank==false) or [$DEM] (bBank==true)
+ is assigned to rStr, if bBank==false and
+ bWithoutExtension==true only [$DM] */
+ void BuildSymbolString( String& rStr, bool bBank,
+ bool bWithoutExtension = false ) const;
/** #,##0.00 [$DM-407] is assigned to rStr, separators
from rLoc, incl. minus sign but without [RED] */
- void BuildPositiveFormatString( String& rStr, sal_Bool bBank,
+ void BuildPositiveFormatString( String& rStr, bool bBank,
const LocaleDataWrapper&, sal_uInt16 nDecimalFormat = 1 ) const;
- void BuildNegativeFormatString( String& rStr, sal_Bool bBank,
+ void BuildNegativeFormatString( String& rStr, bool bBank,
const LocaleDataWrapper&, sal_uInt16 nDecimalFormat = 1 ) const;
- /** [$DM-407] (or [$DEM] if bBank==sal_True)
+ /** [$DM-407] (or [$DEM] if bBank==true)
is appended/prepended to rStr, incl. minus sign */
- void CompletePositiveFormatString( String& rStr, sal_Bool bBank,
+ void CompletePositiveFormatString( String& rStr, bool bBank,
sal_uInt16 nPosiFormat ) const;
- void CompleteNegativeFormatString( String& rStr, sal_Bool bBank,
+ void CompleteNegativeFormatString( String& rStr, bool bBank,
sal_uInt16 nNegaFormat ) const;
/// rSymStr is appended/prepended to rStr, incl. minus sign
@@ -310,10 +310,10 @@ public:
/** Representation of a currency (symbol position and
negative sign) in other language settings */
- static sal_uInt16 GetEffectivePositiveFormat( sal_uInt16 nIntlFormat,
- sal_uInt16 nCurrFormat, sal_Bool bBank );
- static sal_uInt16 GetEffectiveNegativeFormat( sal_uInt16 nIntlFormat,
- sal_uInt16 nCurrFormat, sal_Bool bBank );
+ static sal_uInt16 GetEffectivePositiveFormat( sal_uInt16 nIntlFormat,
+ sal_uInt16 nCurrFormat, bool bBank );
+ static sal_uInt16 GetEffectiveNegativeFormat( sal_uInt16 nIntlFormat,
+ sal_uInt16 nCurrFormat, bool bBank );
/// General Unicode Euro symbol
static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
@@ -371,14 +371,14 @@ public:
/// Change standard precision
void ChangeStandardPrec(short nPrec);
/// Set zero value suppression
- void SetNoZero(sal_Bool bNZ) { bNoZero = bNZ; }
+ void SetNoZero(bool bNZ) { bNoZero = bNZ; }
/** The language with which the formatter was initialized (system setting),
NOT the current language after a ChangeIntl() */
LanguageType GetLanguage() const { return IniLnge; }
// Determine whether two format types are input compatible or not
- sal_Bool IsCompatible(short eOldType, short eNewType);
+ bool IsCompatible(short eOldType, short eNewType);
/** Get table of formats of a specific type of a locale. A format FIndex is
tested whether it has the type and locale requested, if it doesn't
@@ -417,7 +417,7 @@ public:
nType contains the type of the format.
nKey contains the index key of the format.
*/
- sal_Bool PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey,
+ bool PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey,
LanguageType eLnge = LANGUAGE_DONTKNOW );
bool PutEntry( rtl::OUString& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey,
@@ -472,19 +472,19 @@ public:
was empty, could not be converted or has errors, the eLnge locale's
standard number format is chosen instead. The index key is
guaranteed to represent some valid number format. If
- rNewInserted==sal_False and rCheckPos>0 the format code has errors
+ rNewInserted==false and rCheckPos>0 the format code has errors
and/or could not be converted.
*/
sal_uInt32 GetIndexPuttingAndConverting( String & rString, LanguageType eLnge,
LanguageType eSysLnge, short & rType,
- sal_Bool & rNewInserted,
+ bool & rNewInserted,
xub_StrLen & rCheckPos );
/** Create a format code string using format nIndex as a template and
applying other settings (passed from the dialog) */
void GenerateFormat( String& sString, sal_uInt32 nIndex,
LanguageType eLnge = LANGUAGE_DONTKNOW,
- sal_Bool bThousand = sal_False, sal_Bool IsRed = sal_False,
+ bool bThousand = false, bool IsRed = false,
sal_uInt16 nPrecision = 0, sal_uInt16 nAnzLeading = 1 );
/** Analyze an input string
@@ -494,7 +494,7 @@ public:
returned in fOutNumber
<FALSE/> if input is not a number
*/
- sal_Bool IsNumberFormat( const String& sString, sal_uInt32& F_Index, double& fOutNumber );
+ bool IsNumberFormat( const String& sString, sal_uInt32& F_Index, double& fOutNumber );
/// Format a number according to a format index, return string and color
void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex,
@@ -516,13 +516,13 @@ public:
<FALSE/> if format code contains an error
<TRUE/> else, in which case the string and color are returned.
*/
- sal_Bool GetPreviewString( const String& sFormatString, double fPreviewNumber,
+ bool GetPreviewString( const String& sFormatString, double fPreviewNumber,
String& sOutString, Color** ppColor,
LanguageType eLnge = LANGUAGE_DONTKNOW );
/** Same as <method>GetPreviewString</method> but the format code string
may be either language/country eLnge or en_US english US */
- sal_Bool GetPreviewStringGuess( const String& sFormatString, double fPreviewNumber,
+ bool GetPreviewStringGuess( const String& sFormatString, double fPreviewNumber,
String& sOutString, Color** ppColor,
LanguageType eLnge = LANGUAGE_DONTKNOW );
@@ -531,7 +531,7 @@ public:
<FALSE/> if format code contains an error
<TRUE/> else, in which case the string and color are returned.
*/
- sal_Bool GetPreviewString( const String& sFormatString, const String& sPreviewString,
+ bool GetPreviewString( const String& sFormatString, const String& sPreviewString,
String& sOutString, Color** ppColor,
LanguageType eLnge = LANGUAGE_DONTKNOW );
@@ -543,14 +543,14 @@ public:
LanguageType eLnge = LANGUAGE_DONTKNOW );
/// Whether format index nFIndex is of type text or not
- sal_Bool IsTextFormat(sal_uInt32 nFIndex) const;
+ bool IsTextFormat(sal_uInt32 nFIndex) const;
/// Whether the 4th string subcode of format index nFIndex is present
- sal_Bool HasTextFormat(sal_uInt32 nFIndex) const;
+ bool HasTextFormat(sal_uInt32 nFIndex) const;
/// Load all formats from a stream
- sal_Bool Load( SvStream& rStream );
+ bool Load( SvStream& rStream );
/// Save all formats to a stream
- sal_Bool Save( SvStream& rStream ) const;
+ bool Save( SvStream& rStream ) const;
/// Reset of "Used" flags
void PrepareSave();
@@ -558,7 +558,7 @@ public:
void SetFormatUsed(sal_uInt32 nFIndex);
/// Get additional info of a format index, e.g. for dialog box
- void GetFormatSpecialInfo(sal_uInt32 nFormat, sal_Bool& bThousand, sal_Bool& IsRed,
+ void GetFormatSpecialInfo(sal_uInt32 nFormat, bool& bThousand, bool& IsRed,
sal_uInt16& nPrecision, sal_uInt16& nAnzLeading);
/// Count of decimals
@@ -571,12 +571,12 @@ public:
0 if format code string parsed without errors, otherwise error
position (like nCheckPos on <method>PutEntry</method>)
*/
- sal_uInt32 GetFormatSpecialInfo( const String&, sal_Bool& bThousand, sal_Bool& IsRed,
+ sal_uInt32 GetFormatSpecialInfo( const String&, bool& bThousand, bool& IsRed,
sal_uInt16& nPrecision, sal_uInt16& nAnzLeading,
LanguageType eLnge = LANGUAGE_DONTKNOW );
/// Check if format code string may be deleted by user
- sal_Bool IsUserDefined( const String& sStr, LanguageType eLnge = LANGUAGE_DONTKNOW );
+ bool IsUserDefined( const String& sStr, LanguageType eLnge = LANGUAGE_DONTKNOW );
/** Return the format index of the format code string for language/country,
or NUMBERFORMAT_ENTRY_NOT_FOUND */
@@ -604,14 +604,14 @@ public:
LanguageType eLnge );
/// Whether nFIndex is a special builtin format
- sal_Bool IsSpecialStandardFormat( sal_uInt32 nFIndex, LanguageType eLnge );
+ bool IsSpecialStandardFormat( sal_uInt32 nFIndex, LanguageType eLnge );
/// Return the reference date
Date* GetNullDate();
/// Return the standard decimal precision
sal_uInt16 GetStandardPrec();
/// Return whether zero suppression is switched on
- sal_Bool GetNoZero() { return bNoZero; }
+ bool GetNoZero() { return bNoZero; }
/** Get the type of a format (or NUMBERFORMAT_UNDEFINED if no entry),
but with NUMBERFORMAT_DEFINED masked out */
short GetType(sal_uInt32 nFIndex);
@@ -622,7 +622,7 @@ public:
SvNumberFormatterIndexTable* MergeFormatter(SvNumberFormatter& rNewTable);
/// Whether a merge table is present or not
- inline sal_Bool HasMergeFmtTbl() const;
+ inline bool HasMergeFmtTbl() const;
/// Return the new format index for an old format index, if a merge table exists
inline sal_uInt32 GetMergeFmtIndex( sal_uInt32 nOldFmt ) const;
@@ -736,15 +736,15 @@ public:
position of default format
*/
sal_uInt16 GetCurrencyFormatStrings( NfWSStringsDtor&, const NfCurrencyEntry&,
- sal_Bool bBank ) const;
+ bool bBank ) const;
/** Whether nFormat is of type NUMBERFORMAT_CURRENCY and the format code
contains a new SYMBOLTYPE_CURRENCY and if so which one [$xxx-nnn].
If ppEntry is not NULL and exactly one entry is found, a [$xxx-nnn] is
returned, even if the format code only contains [$xxx] !
*/
- sal_Bool GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol,
- const NfCurrencyEntry** ppEntry = NULL, sal_Bool* pBank = NULL ) const;
+ bool GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol,
+ const NfCurrencyEntry** ppEntry = NULL, bool* pBank = NULL ) const;
/** Look up the corresponding <type>NfCurrencyEntry</type> matching
rSymbol (may be CurrencySymbol or CurrencyAbbreviation) and possibly
@@ -782,9 +782,9 @@ public:
The matching entry if unique (in which case bFoundBank is set),
else <NULL/>.
*/
- static const NfCurrencyEntry* GetCurrencyEntry( sal_Bool & bFoundBank,
+ static const NfCurrencyEntry* GetCurrencyEntry( bool & bFoundBank,
const String& rSymbol, const String& rExtension,
- LanguageType eFormatLanguage, sal_Bool bOnlyStringLanguage = sal_False );
+ LanguageType eFormatLanguage, bool bOnlyStringLanguage = false );
/// Get compatibility ("automatic" old style) currency from I18N locale data
void GetCompatibilityCurrency( String& rSymbol, String& rAbbrev ) const;
@@ -834,7 +834,7 @@ private:
LanguageType IniLnge; // Initialized setting language/country
LanguageType ActLnge; // Current setting language/country
NfEvalDateFormat eEvalDateFormat; // DateFormat evaluation
- sal_Bool bNoZero; // Zero value suppression
+ bool bNoZero; // Zero value suppression
// cached locale data items needed almost any time
String aDecimalSep;
@@ -843,7 +843,7 @@ private:
#ifdef _ZFORLIST_CXX // ----- private Methoden -----
- SVL_DLLPRIVATE static sal_Bool bCurrencyTableInitialized;
+ SVL_DLLPRIVATE static bool bCurrencyTableInitialized;
SVL_DLLPRIVATE static sal_uInt16 nSystemCurrencyPosition;
SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
@@ -855,29 +855,29 @@ private:
// Changes initialized language/country, clears the entries and generates
// new ones, may ONLY be called by the binary file format load
- SVL_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, sal_Bool bLoadingSO5 );
+ SVL_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, bool bLoadingSO5 );
// Generate builtin formats provided by i18n behind CLOffset,
- // if bLoadingSO5==sal_False also generate additional i18n formats.
- SVL_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadingSO5 );
+ // if bLoadingSO5==false also generate additional i18n formats.
+ SVL_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, bool bLoadingSO5 );
// Generate additional formats provided by i18n
SVL_DLLPRIVATE void ImpGenerateAdditionalFormats(
sal_uInt32 CLOffset,
NumberFormatCodeWrapper& rNumberFormatCode,
- sal_Bool bAfterLoadingSO5 );
+ bool bAfterLoadingSO5 );
SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat(
const ::com::sun::star::i18n::NumberFormatCode& rCode,
sal_uInt32 nPos,
- sal_Bool bAfterLoadingSO5 = sal_False,
+ bool bAfterLoadingSO5 = false,
sal_Int16 nOrgIndex = 0 );
// ImpInsertNewStandardFormat for new (since version ...) builtin formats
SVL_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat(
const ::com::sun::star::i18n::NumberFormatCode& rCode,
sal_uInt32 nPos,
sal_uInt16 nVersion,
- sal_Bool bAfterLoadingSO5 = sal_False,
+ bool bAfterLoadingSO5 = false,
sal_Int16 nOrgIndex = 0 );
// Return CLOffset or (MaxCLOffset + SV_COUNTRY_LANGUAGE_OFFSET) if new language/country
@@ -890,7 +890,7 @@ private:
LanguageType eLnge );
// Create builtin formats for language/country if necessary, return CLOffset
- SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, sal_Bool bLoadingSO5 = sal_False );
+ SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, bool bLoadingSO5 = false );
// Build negative currency format, old compatibility style
SVL_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol );
@@ -927,15 +927,15 @@ private:
// FormatElement group.
SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault(
::com::sun::star::i18n::NumberFormatCode * pFormatArr,
- sal_Int32 nCount, sal_Bool bCheckCorrectness = sal_True
+ sal_Int32 nCount, bool bCheckCorrectness = true
);
// used as a loop body inside of GetNewCurrencySymbolString() and GetCurrencyEntry()
#ifndef DBG_UTIL
inline
#endif
- static sal_Bool ImpLookupCurrencyEntryLoopBody(
- const NfCurrencyEntry*& pFoundEntry, sal_Bool& bFoundBank,
+ static bool ImpLookupCurrencyEntryLoopBody(
+ const NfCurrencyEntry*& pFoundEntry, bool& bFoundBank,
const NfCurrencyEntry* pData, sal_uInt16 nPos, const String& rSymbol );
// link to be set at <method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method>
@@ -1019,7 +1019,7 @@ inline sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) cons
return pU ? *pU : nOldFmt;
}
-inline sal_Bool SvNumberFormatter::HasMergeFmtTbl() const
+inline bool SvNumberFormatter::HasMergeFmtTbl() const
{
return pMergeTable && (0 != pMergeTable->Count());
}
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index c65d2a4..68095ca 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -79,12 +79,12 @@ struct ImpSvNumberformatInfo // Struct for FormatInfo
{
String* sStrArray; // Array of symbols
short* nTypeArray; // Array of infos
- sal_uInt16 nThousand; // Count of group separator sequences
- sal_uInt16 nCntPre; // Count of digits before decimal point
- sal_uInt16 nCntPost; // Count of digits after decimal point
- sal_uInt16 nCntExp; // Count of exponent digits, or AM/PM
+ sal_uInt16 nThousand; // Count of group separator sequences
+ sal_uInt16 nCntPre; // Count of digits before decimal point
+ sal_uInt16 nCntPost; // Count of digits after decimal point
+ sal_uInt16 nCntExp; // Count of exponent digits, or AM/PM
short eScannedType; // Type determined by scan
- sal_Bool bThousand; // Has group (AKA thousand) separator
+ bool bThousand; // Has group (AKA thousand) separator
void Copy( const ImpSvNumberformatInfo& rNumFor, sal_uInt16 nAnz );
void Load(SvStream& rStream, sal_uInt16 nAnz);
@@ -97,31 +97,31 @@ class SvNumberNatNum
{
LanguageType eLang;
sal_uInt8 nNum;
- sal_Bool bDBNum :1; // DBNum, to be converted to NatNum
- sal_Bool bDate :1; // Used in date? (needed for DBNum/NatNum mapping)
- sal_Bool bSet :1; // If set, since NatNum0 is possible
+ bool bDBNum :1; // DBNum, to be converted to NatNum
+ bool bDate :1; // Used in date? (needed for DBNum/NatNum mapping)
+ bool bSet :1; // If set, since NatNum0 is possible
public:
- static sal_uInt8 MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang, sal_Bool bDate );
- static sal_uInt8 MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLang, sal_Bool bDate );
+ static sal_uInt8 MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang, bool bDate );
+ static sal_uInt8 MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLang, bool bDate );
SvNumberNatNum() : eLang( LANGUAGE_DONTKNOW ), nNum(0),
bDBNum(0), bDate(0), bSet(0) {}
- sal_Bool IsComplete() const { return bSet && eLang != LANGUAGE_DONTKNOW; }
+ bool IsComplete() const { return bSet && eLang != LANGUAGE_DONTKNOW; }
sal_uInt8 GetRawNum() const { return nNum; }
sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; }
sal_uInt8 GetDBNum() const { return bDBNum ? nNum : MapNatNumToDBNum( nNum, eLang, bDate ); }
LanguageType GetLang() const { return eLang; }
void SetLang( LanguageType e ) { eLang = e; }
- void SetNum( sal_uInt8 nNumber, sal_Bool bDBNumber )
+ void SetNum( sal_uInt8 nNumber, bool bDBNumber )
{
nNum = nNumber;
bDBNum = bDBNumber;
- bSet = sal_True;
+ bSet = true;
}
- sal_Bool IsSet() const { return bSet; }
- void SetDate( sal_Bool bDateP ) { bDate = (bDateP != 0); }
+ bool IsSet() const { return bSet; }
+ void SetDate( bool bDateP ) { bDate = (bDateP != 0); }
};
class CharClass;
@@ -132,7 +132,7 @@ public:
ImpSvNumFor(); // Ctor without filling the Info
~ImpSvNumFor();
- void Enlarge(sal_uInt16 nAnz); // Init of arrays to the right size
+ void Enlarge(sal_uInt16 nAnz); // Init of arrays to the right size
void Load( SvStream& rStream, ImpSvNumberformatScan& rSc,
String& rLoadedColorName);
void Save( SvStream& rStream ) const;
@@ -153,22 +153,22 @@ public:
const String& GetColorName() const { return sColorName; }
// new SYMBOLTYPE_CURRENCY in subformat?
- sal_Bool HasNewCurrency() const;
- sal_Bool GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const;
+ bool HasNewCurrency() const;
+ bool GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const;
void SaveNewCurrencyMap( SvStream& rStream ) const;
void LoadNewCurrencyMap( SvStream& rStream );
// [NatNum1], [NatNum2], ...
- void SetNatNumNum( sal_uInt8 nNum, sal_Bool bDBNum ) { aNatNum.SetNum( nNum, bDBNum ); }
+ void SetNatNumNum( sal_uInt8 nNum, bool bDBNum ) { aNatNum.SetNum( nNum, bDBNum ); }
void SetNatNumLang( LanguageType eLang ) { aNatNum.SetLang( eLang ); }
- void SetNatNumDate( sal_Bool bDate ) { aNatNum.SetDate( bDate ); }
+ void SetNatNumDate( bool bDate ) { aNatNum.SetDate( bDate ); }
const SvNumberNatNum& GetNatNum() const { return aNatNum; }
private:
ImpSvNumberformatInfo aI; // Hilfsstruct fuer die restlichen Infos
String sColorName; // color name
Color* pColor; // pointer to color of subformat
- sal_uInt16 nAnzStrings; // count of symbols
+ sal_uInt16 nAnzStrings; // count of symbols
SvNumberNatNum aNatNum; // DoubleByteNumber
};
@@ -197,7 +197,7 @@ public:
ImpSvNumberInputScan* pISc,
xub_StrLen& nCheckPos,
LanguageType& eLan,
- sal_Bool bStand = sal_False );
+ bool bStand = false );
// Copy ctor
SvNumberformat( SvNumberformat& rFormat );
@@ -215,8 +215,8 @@ public:
void SetType(const short eSetType) { eType = eSetType; }
// Standard means the I18N defined standard format of this type
- void SetStandard() { bStandard = sal_True; }
- sal_Bool IsStandard() const { return bStandard; }
+ void SetStandard() { bStandard = true; }
+ bool IsStandard() const { return bStandard; }
// For versions before version nVer it is UserDefined, for newer versions
// it is builtin. nVer of SV_NUMBERFORMATTER_VERSION_...
@@ -224,7 +224,7 @@ public:
{ nNewStandardDefined = nVer; eType |= NUMBERFORMAT_DEFINED; }
sal_uInt16 GetNewStandardDefined() const { return nNewStandardDefined; }
- sal_Bool IsAdditionalStandardDefined() const
+ bool IsAdditionalStandardDefined() const
{ return nNewStandardDefined == SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS; }
LanguageType GetLanguage() const { return maLocale.meLanguage;}
@@ -234,12 +234,12 @@ public:
// Build a format string of application defined keywords
String GetMappedFormatstring( const NfKeywordTable& rKeywords,
const LocaleDataWrapper& rLoc,
- sal_Bool bDontQuote = sal_False ) const;
+ bool bDontQuote = false ) const;
- void SetUsed(const sal_Bool b) { bIsUsed = b; }
- sal_Bool GetUsed() const { return bIsUsed; }
- sal_Bool IsStarFormatSupported() const { return bStarFlag; }
- void SetStarFormatSupport( sal_Bool b ) { bStarFlag = b; }
+ void SetUsed(const bool b) { bIsUsed = b; }
+ bool GetUsed() const { return bIsUsed; }
+ bool IsStarFormatSupported() const { return bStarFlag; }
+ void SetStarFormatSupport( bool b ) { bStarFlag = b; }
NfHackConversion Load( SvStream& rStream, ImpSvNumMultipleReadHeader& rHdr,
SvNumberFormatter* pConverter, ImpSvNumberInputScan& rISc );
@@ -255,20 +255,20 @@ public:
*/
bool GetOutputString( double fNumber, sal_uInt16 nCharCount, String& rOutString ) const;
- sal_Bool GetOutputString( double fNumber, String& OutString, Color** ppColor );
- sal_Bool GetOutputString( String& sString, String& OutString, Color** ppColor );
+ bool GetOutputString( double fNumber, String& OutString, Color** ppColor );
+ bool GetOutputString( String& sString, String& OutString, Color** ppColor );
// True if type text
- sal_Bool IsTextFormat() const { return (eType & NUMBERFORMAT_TEXT) != 0; }
+ bool IsTextFormat() const { return (eType & NUMBERFORMAT_TEXT) != 0; }
// True if 4th subformat present
- sal_Bool HasTextFormat() const
+ bool HasTextFormat() const
{
return (NumFor[3].GetCount() > 0) ||
(NumFor[3].Info().eScannedType == NUMBERFORMAT_TEXT);
}
- void GetFormatSpecialInfo(sal_Bool& bThousand,
- sal_Bool& IsRed,
+ void GetFormatSpecialInfo(bool& bThousand,
+ bool& IsRed,
sal_uInt16& nPrecision,
sal_uInt16& nAnzLeading) const;
@@ -284,24 +284,24 @@ public:
//! Only onLoad: convert from stored to current system language/country
void ConvertLanguage( SvNumberFormatter& rConverter,
- LanguageType eConvertFrom, LanguageType eConvertTo, sal_Bool bSystem = sal_False );
+ LanguageType eConvertFrom, LanguageType eConvertTo, bool bSystem = false );
// Substring of a subformat code nNumFor (0..3)
// nPos == 0xFFFF => last substring
- // bString==sal_True: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY
+ // bString==true: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY
const String* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
- sal_Bool bString = sal_False ) const;
+ bool bString = false ) const;
// Subtype of a subformat code nNumFor (0..3)
// nPos == 0xFFFF => last substring
- // bString==sal_True: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY
- short GetNumForType( sal_uInt16 nNumFor, sal_uInt16 nPos, sal_Bool bString = sal_False ) const;
+ // bString==true: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY
+ short GetNumForType( sal_uInt16 nNumFor, sal_uInt16 nPos, bool bString = false ) const;
/** If the count of string elements (substrings, ignoring [modifiers] and
so on) in a subformat code nNumFor (0..3) is equal to the given number.
Used by ImpSvNumberInputScan::IsNumberFormatMain() to detect a matched
format. */
- sal_Bool IsNumForStringElementCountEqual( sal_uInt16 nNumFor, sal_uInt16 nAllCount,
+ bool IsNumForStringElementCountEqual( sal_uInt16 nNumFor, sal_uInt16 nAllCount,
sal_uInt16 nNumCount ) const
{
if ( nNumFor < 4 )
@@ -313,17 +313,17 @@ public:
// [modifiers] or anything else if both counts are equal.
sal_uInt16 nCnt = NumFor[nNumFor].GetCount();
if ( nAllCount == nCnt )
- return sal_True;
+ return true;
if ( nAllCount < nCnt ) // check ignoring [modifiers] and so on
return ImpGetNumForStringElementCount( nNumFor ) ==
(nAllCount - nNumCount);
}
- return sal_False;
+ return false;
}
// Whether the second subformat code is really for negative numbers
// or another limit set.
- sal_Bool IsNegativeRealNegative() const
+ bool IsNegativeRealNegative() const
{
return fLimit1 == 0.0 && fLimit2 == 0.0 &&
( (eOp1 == NUMBERFORMAT_OP_GE && eOp2 == NUMBERFORMAT_OP_NO) ||
@@ -332,41 +332,41 @@ public:
}
// Whether the negative format is without a sign or not
- sal_Bool IsNegativeWithoutSign() const;
+ bool IsNegativeWithoutSign() const;
- sal_Bool IsNegativeInBracket() const;
+ bool IsNegativeInBracket() const;
- sal_Bool HasPositiveBracketPlaceholder() const;
+ bool HasPositiveBracketPlaceholder() const;
// Whether a new SYMBOLTYPE_CURRENCY is contained in the format
- sal_Bool HasNewCurrency() const;
+ bool HasNewCurrency() const;
// Build string from NewCurrency for saving it SO50 compatible
void Build50Formatstring( String& rStr ) const;
// strip [$-yyy] from all [$xxx-yyy] leaving only xxx's,
- // if bQuoteSymbol==sal_True the xxx will become "xxx"
+ // if bQuoteSymbol==true the xxx will become "xxx"
static String StripNewCurrencyDelimiters( const String& rStr,
- sal_Bool bQuoteSymbol );
+ bool bQuoteSymbol );
// If a new SYMBOLTYPE_CURRENCY is contained if the format is of type
// NUMBERFORMAT_CURRENCY, and if so the symbol xxx and the extension nnn
// of [$xxx-nnn] are returned
- sal_Bool GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const;
+ bool GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const;
- static sal_Bool HasStringNegativeSign( const String& rStr );
+ static bool HasStringNegativeSign( const String& rStr );
/**
Whether a character at position nPos is somewhere between two matching
cQuote or not.
- If nPos points to a cQuote, a sal_True is returned on an opening cQuote,
- a sal_False is returned on a closing cQuote.
+ If nPos points to a cQuote, a true is returned on an opening cQuote,
+ a false is returned on a closing cQuote.
A cQuote between quotes may be escaped by a cEscIn, a cQuote outside of
quotes may be escaped by a cEscOut.
The default '\0' results in no escapement possible.
Defaults are set right according to the "unlogic" of the Numberformatter
*/
- static sal_Bool IsInQuote( const String& rString, xub_StrLen nPos,
+ static bool IsInQuote( const String& rString, xub_StrLen nPos,
sal_Unicode cQuote = '"',
sal_Unicode cEscIn = '\0', sal_Unicode cEscOut = '\\' );
@@ -420,7 +420,7 @@ public:
SvNumberformatLimitOps& rOper2, double& rVal2 ) const;
Color* GetColor( sal_uInt16 nNumFor ) const;
void GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
- sal_Bool& bThousand, sal_uInt16& nPrecision, sal_uInt16& nAnzLeading ) const;
+ bool& bThousand, sal_uInt16& nPrecision, sal_uInt16& nAnzLeading ) const;
// rAttr.Number not empty if NatNum attributes are to be stored
void GetNatNumXml(
@@ -430,11 +430,11 @@ public:
/** @returns <TRUE/> if E,EE,R,RR,AAA,AAAA in format code of subformat
nNumFor (0..3) and <b>no</b> preceding calendar was specified and the
currently loaded calendar is "gregorian". */
- sal_Bool IsOtherCalendar( sal_uInt16 nNumFor ) const
+ bool IsOtherCalendar( sal_uInt16 nNumFor ) const
{
if ( nNumFor < 4 )
return ImpIsOtherCalendar( NumFor[nNumFor] );
- return sal_False;
+ return false;
}
/** Switches to the first non-"gregorian" calendar, but only if the current
@@ -456,13 +456,13 @@ public:
<TRUE/> if a calendar was specified and switched to,
<FALSE/> else.
*/
- sal_Bool SwitchToSpecifiedCalendar( String& rOrgCalendar, double& fOrgDateTime,
+ bool SwitchToSpecifiedCalendar( String& rOrgCalendar, double& fOrgDateTime,
sal_uInt16 nNumFor ) const
{
if ( nNumFor < 4 )
return ImpSwitchToSpecifiedCalendar( rOrgCalendar,
fOrgDateTime, NumFor[nNumFor] );
- return sal_False;
+ return false;
}
private:
@@ -475,17 +475,17 @@ private:
LocaleType maLocale; // Language/country of the format, numeral shape and calendar type from Excel.
SvNumberformatLimitOps eOp1; // Operator for first condition
SvNumberformatLimitOps eOp2; // Operator for second condition
- sal_uInt16 nNewStandardDefined; // new builtin formats as of version 6
+ sal_uInt16 nNewStandardDefined; // new builtin formats as of version 6
short eType; // Type of format
- sal_Bool bStarFlag; // Take *n format as ESC n
- sal_Bool bStandard; // If this is a default standard format
- sal_Bool bIsUsed; // Flag as used for storing
+ bool bStarFlag; // Take *n format as ESC n
+ bool bStandard; // If this is a default standard format
+ bool bIsUsed; // Flag as used for storing
SVL_DLLPRIVATE sal_uInt16 ImpGetNumForStringElementCount( sal_uInt16 nNumFor ) const;
- SVL_DLLPRIVATE sal_Bool ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
+ SVL_DLLPRIVATE bool ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const;
- SVL_DLLPRIVATE sal_Bool ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
+ SVL_DLLPRIVATE bool ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const;
#ifdef _ZFORMAT_CXX // ----- private implementation methods -----
@@ -563,7 +563,7 @@ private:
// Helper function for number strings
// append string symbols, insert leading 0 or ' ', or ...
- SVL_DLLPRIVATE sal_Bool ImpNumberFill( String& sStr,
+ SVL_DLLPRIVATE bool ImpNumberFill( String& sStr,
double& rNumber,
xub_StrLen& k,
sal_uInt16& j,
@@ -571,7 +571,7 @@ private:
short eSymbolType );
// Helper function to fill in the integer part and the group (AKA thousand) separators
- SVL_DLLPRIVATE sal_Bool ImpNumberFillWithThousands( String& sStr,
+ SVL_DLLPRIVATE bool ImpNumberFillWithThousands( String& sStr,
double& rNumber,
xub_StrLen k,
sal_uInt16 j,
@@ -589,13 +589,13 @@ private:
xub_StrLen & nDigitCount,
utl::DigitGroupingIterator & );
- SVL_DLLPRIVATE sal_Bool ImpGetDateOutput( double fNumber,
+ SVL_DLLPRIVATE bool ImpGetDateOutput( double fNumber,
sal_uInt16 nIx,
String& OutString );
- SVL_DLLPRIVATE sal_Bool ImpGetTimeOutput( double fNumber,
+ SVL_DLLPRIVATE bool ImpGetTimeOutput( double fNumber,
sal_uInt16 nIx,
String& OutString );
- SVL_DLLPRIVATE sal_Bool ImpGetDateTimeOutput( double fNumber,
+ SVL_DLLPRIVATE bool ImpGetDateTimeOutput( double fNumber,
sal_uInt16 nIx,
String& OutString );
@@ -604,7 +604,7 @@ private:
// know a "before" era (like zh_TW ROC or ja_JP Gengou). If switched and
// rOrgCalendar was "gregorian" the string is emptied. If rOrgCalendar was
// empty the previous calendar name and date/time are returned.
- SVL_DLLPRIVATE sal_Bool ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
+ SVL_DLLPRIVATE bool ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime );
// Append a "G" short era string of the given calendar. In the case of a
// Gengou calendar this is a one character abbreviation, for other
@@ -612,7 +612,7 @@ private:
SVL_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal,
sal_Int16 nNatNum );
- SVL_DLLPRIVATE sal_Bool ImpGetNumberOutput( double fNumber,
+ SVL_DLLPRIVATE bool ImpGetNumberOutput( double fNumber,
sal_uInt16 nIx,
String& OutString );
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 35f58e4..9a78aae 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -341,7 +341,7 @@ rtl::OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToPreviewString
LanguageType eLang = lcl_GetLanguage( nLocale );
Color* pColor = NULL;
- sal_Bool bOk;
+ bool bOk;
if ( bAllowEnglish )
bOk = pFormatter->GetPreviewStringGuess(
aFormString, fValue, aOutString, &pColor, eLang );
@@ -377,7 +377,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber(
LanguageType eLang = lcl_GetLanguage( nLocale );
Color* pColor = NULL;
- sal_Bool bOk;
+ bool bOk;
if ( bAllowEnglish )
bOk = pFormatter->GetPreviewStringGuess(
aFormString, fValue, aOutString, &pColor, eLang );
@@ -517,7 +517,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const rtl::OUString& aFormat,
sal_uInt32 nKey = 0;
xub_StrLen nCheckPos = 0;
short nType = 0;
- sal_Bool bOk = pFormatter->PutEntry( aFormStr, nCheckPos, nType, nKey, eLang );
+ bool bOk = pFormatter->PutEntry( aFormStr, nCheckPos, nType, nKey, eLang );
if (bOk)
nRet = nKey;
else if (nCheckPos)
@@ -549,7 +549,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const rtl::OUString& aFo
sal_uInt32 nKey = 0;
xub_StrLen nCheckPos = 0;
short nType = 0;
- sal_Bool bOk = pFormatter->PutandConvertEntry( aFormStr, nCheckPos, nType, nKey, eLang, eNewLang );
+ bool bOk = pFormatter->PutandConvertEntry( aFormStr, nCheckPos, nType, nKey, eLang, eNewLang );
if (bOk || nKey > 0)
nRet = nKey;
else if (nCheckPos)
@@ -758,7 +758,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro
const SvNumberformat* pFormat = pFormatter ? pFormatter->GetEntry(nKey) : NULL;
if (pFormat)
{
- sal_Bool bThousand, bRed;
+ bool bThousand, bRed;
sal_uInt16 nDecimals, nLeading;
String aString = aPropertyName;
@@ -826,7 +826,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro
else if (aString.EqualsAscii( PROPERTYNAME_CURRABB ))
{
String aSymbol, aExt;
- sal_Bool bBank = sal_False;
+ bool bBank = false;
pFormat->GetNewCurrencySymbol( aSymbol, aExt );
const NfCurrencyEntry* pCurr = pFormatter->GetCurrencyEntry( bBank,
aSymbol, aExt, pFormat->GetLanguage() );
@@ -888,7 +888,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
if (pFormat)
{
String aSymbol, aExt, aAbb;
- sal_Bool bBank = sal_False;
+ bool bBank = false;
pFormat->GetNewCurrencySymbol( aSymbol, aExt );
const NfCurrencyEntry* pCurr = pFormatter->GetCurrencyEntry( bBank,
aSymbol, aExt, pFormat->GetLanguage() );
@@ -900,7 +900,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
//! SvNumberformat Member bStandard rausreichen?
sal_Bool bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 );
- sal_Bool bThousand, bRed;
+ bool bThousand, bRed;
sal_uInt16 nDecimals, nLeading;
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
lang::Locale aLocale( MsLangId::convertLanguageToLocale(
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index d18ea9d..ad63f02 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -141,7 +141,7 @@ void ImpSvNumberInputScan::Reset()
//---------------------------------------------------------------------------
//
// static
-inline sal_Bool ImpSvNumberInputScan::MyIsdigit( sal_Unicode c )
+inline bool ImpSvNumberInputScan::MyIsdigit( sal_Unicode c )
{
return c < 128 && isdigit( (unsigned char) c );
}
@@ -170,19 +170,19 @@ void ImpSvNumberInputScan::TransformInput( String& rStr )
// Only simple unsigned floating point values without any error detection,
// decimal separator has to be '.'
-double ImpSvNumberInputScan::StringToDouble( const String& rStr, sal_Bool bForceFraction )
+double ImpSvNumberInputScan::StringToDouble( const String& rStr, bool bForceFraction )
{
double fNum = 0.0;
double fFrac = 0.0;
int nExp = 0;
xub_StrLen nPos = 0;
xub_StrLen nLen = rStr.Len();
- sal_Bool bPreSep = !bForceFraction;
+ bool bPreSep = !bForceFraction;
while (nPos < nLen)
{
if (rStr.GetChar(nPos) == '.')
- bPreSep = sal_False;
+ bPreSep = false;
else if (bPreSep)
fNum = fNum * 10.0 + (double) (rStr.GetChar(nPos) - '0');
else
@@ -226,11 +226,11 @@ enum ScanState // States der Turing-Maschine
SsGetString = 3
};
-sal_Bool ImpSvNumberInputScan::NextNumberStringSymbol(
+bool ImpSvNumberInputScan::NextNumberStringSymbol(
const sal_Unicode*& pStr,
String& rSymbol )
{
- sal_Bool isNumber = sal_False;
+ bool isNumber = false;
sal_Unicode cToken;
ScanState eState = SsStart;
register const sal_Unicode* pHere = pStr;
@@ -245,7 +245,7 @@ sal_Bool ImpSvNumberInputScan::NextNumberStringSymbol(
if ( MyIsdigit( cToken ) )
{
eState = SsGetValue;
- isNumber = sal_True;
+ isNumber = true;
}
else
eState = SsGetString;
@@ -291,11 +291,11 @@ sal_Bool ImpSvNumberInputScan::NextNumberStringSymbol(
// FIXME: should be grouping; it is only used though in case nAnzStrings is
// near SV_MAX_ANZ_INPUT_STRINGS, in NumberStringDivision().
-sal_Bool ImpSvNumberInputScan::SkipThousands(
+bool ImpSvNumberInputScan::SkipThousands(
const sal_Unicode*& pStr,
String& rSymbol )
{
- sal_Bool res = sal_False;
+ bool res = false;
sal_Unicode cToken;
const String& rThSep = pFormatter->GetNumThousandSep();
register const sal_Unicode* pHere = pStr;
@@ -328,7 +328,7 @@ sal_Bool ImpSvNumberInputScan::SkipThousands(
if (nCounter == 3)
{
eState = SsStart;
- res = sal_True; // .000 combination found
+ res = true; // .000 combination found
}
}
else
@@ -365,7 +365,7 @@ void ImpSvNumberInputScan::NumberStringDivision( const String& rString )
{
if ( NextNumberStringSymbol( pStr, sStrArray[nAnzStrings] ) )
{ // Zahl
- IsNum[nAnzStrings] = sal_True;
+ IsNum[nAnzStrings] = true;
nNums[nAnzNums] = nAnzStrings;
nAnzNums++;
if (nAnzStrings >= SV_MAX_ANZ_INPUT_STRINGS - 7 &&
@@ -375,7 +375,7 @@ void ImpSvNumberInputScan::NumberStringDivision( const String& rString )
}
else
{
- IsNum[nAnzStrings] = sal_False;
+ IsNum[nAnzStrings] = false;
}
nAnzStrings++;
}
@@ -385,34 +385,34 @@ void ImpSvNumberInputScan::NumberStringDivision( const String& rString )
//---------------------------------------------------------------------------
// Whether rString contains rWhat at nPos
-sal_Bool ImpSvNumberInputScan::StringContainsImpl( const String& rWhat,
+bool ImpSvNumberInputScan::StringContainsImpl( const String& rWhat,
const String& rString, xub_StrLen nPos )
{
if ( nPos + rWhat.Len() <= rString.Len() )
return StringPtrContainsImpl( rWhat, rString.GetBuffer(), nPos );
- return sal_False;
+ return false;
}
//---------------------------------------------------------------------------
// Whether pString contains rWhat at nPos
-sal_Bool ImpSvNumberInputScan::StringPtrContainsImpl( const String& rWhat,
+bool ImpSvNumberInputScan::StringPtrContainsImpl( const String& rWhat,
const sal_Unicode* pString, xub_StrLen nPos )
{
if ( rWhat.Len() == 0 )
- return sal_False;
+ return false;
register const sal_Unicode* pWhat = rWhat.GetBuffer();
register const sal_Unicode* const pEnd = pWhat + rWhat.Len();
register const sal_Unicode* pStr = pString + nPos;
while ( pWhat < pEnd )
{
if ( *pWhat != *pStr )
- return sal_False;
+ return false;
pWhat++;
pStr++;
}
- return sal_True;
+ return true;
}
@@ -421,15 +421,15 @@ sal_Bool ImpSvNumberInputScan::StringPtrContainsImpl( const String& rWhat,
//
// ueberspringt genau das angegebene Zeichen
-inline sal_Bool ImpSvNumberInputScan::SkipChar( sal_Unicode c, const String& rString,
+inline bool ImpSvNumberInputScan::SkipChar( sal_Unicode c, const String& rString,
xub_StrLen& nPos )
{
if ((nPos < rString.Len()) && (rString.GetChar(nPos) == c))
{
nPos++;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -458,15 +458,15 @@ inline void ImpSvNumberInputScan::SkipBlanks( const String& rString,
//
// jump over rWhat in rString at nPos
-inline sal_Bool ImpSvNumberInputScan::SkipString( const String& rWhat,
+inline bool ImpSvNumberInputScan::SkipString( const String& rWhat,
const String& rString, xub_StrLen& nPos )
{
if ( StringContains( rWhat, rString, nPos ) )
{
nPos = nPos + rWhat.Len();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -475,7 +475,7 @@ inline sal_Bool ImpSvNumberInputScan::SkipString( const String& rWhat,
//
// recognizes exactly ,111 in {3} and {3,2} or ,11 in {3,2} grouping
-inline sal_Bool ImpSvNumberInputScan::GetThousandSep(
+inline bool ImpSvNumberInputScan::GetThousandSep(
const String& rString,
xub_StrLen& nPos,
sal_uInt16 nStringPos )
@@ -487,7 +487,7 @@ inline sal_Bool ImpSvNumberInputScan::GetThousandSep(
if (!( (rString == rSep || bSpaceBreak) // nothing else
&& nStringPos < nAnzStrings - 1 // safety first!
&& IsNum[nStringPos+1] )) // number follows
- return sal_False; // no? => out
+ return false; // no? => out
utl::DigitGroupingIterator aGrouping(
pFormatter->GetLocaleData()->getDigitGrouping());
@@ -504,9 +504,9 @@ inline sal_Bool ImpSvNumberInputScan::GetThousandSep(
)
{
nPos = nPos + rSep.Len();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -514,8 +514,8 @@ inline sal_Bool ImpSvNumberInputScan::GetThousandSep(
// GetLogical
//
// Conversion of text to logial value
-// "sal_True" => 1:
-// "sal_False"=> -1:
+// "true" => 1:
+// "false"=> -1:
// else => 0:
short ImpSvNumberInputScan::GetLogical( const String& rString )
@@ -622,10 +622,10 @@ int ImpSvNumberInputScan::GetDayOfWeek( const String& rString, xub_StrLen& nPos
// GetCurrency
//
// Lesen eines Waehrungssysmbols
-// '$' => sal_True
-// sonst => sal_False
+// '$' => true
+// sonst => false
-sal_Bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& nPos,
+bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& nPos,
const SvNumberformat* pFormat )
{
if ( rString.Len() > nPos )
@@ -640,7 +640,7 @@ sal_Bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& n
if ( StringContains( aUpperCurrSymbol, rString, nPos ) )
{
nPos = nPos + aUpperCurrSymbol.Len();
- return sal_True;
+ return true;
}
if ( pFormat )
{
@@ -653,14 +653,14 @@ sal_Bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& n
if ( StringContains( aSymbol, rString, nPos ) )
{
nPos = nPos + aSymbol.Len();
- return sal_True;
+ return true;
}
}
}
}
}
- return sal_False;
+ return false;
}
@@ -670,15 +670,15 @@ sal_Bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& n
// Lesen des Zeitsymbols (AM od. PM) f. kurze Zeitangabe
//
// Rueckgabe:
-// "AM" od. "PM" => sal_True
-// sonst => sal_False
+// "AM" od. "PM" => true
+// sonst => false
//
// nAmPos:
// "AM" => 1
// "PM" => -1
// sonst => 0
-sal_Bool ImpSvNumberInputScan::GetTimeAmPm( const String& rString, xub_StrLen& nPos )
+bool ImpSvNumberInputScan::GetTimeAmPm( const String& rString, xub_StrLen& nPos )
{
if ( rString.Len() > nPos )
@@ -689,17 +689,17 @@ sal_Bool ImpSvNumberInputScan::GetTimeAmPm( const String& rString, xub_StrLen& n
{
nAmPm = 1;
nPos = nPos + pLoc->getTimeAM().Len();
- return sal_True;
+ return true;
}
else if ( StringContains( pChr->upper( pLoc->getTimePM() ), rString, nPos ) )
{
nAmPm = -1;
nPos = nPos + pLoc->getTimePM().Len();
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
@@ -707,10 +707,10 @@ sal_Bool ImpSvNumberInputScan::GetTimeAmPm( const String& rString, xub_StrLen& n
// GetDecSep
//
// Lesen eines Dezimaltrenners (',')
-// ',' => sal_True
-// sonst => sal_False
+// ',' => true
+// sonst => false
-inline sal_Bool ImpSvNumberInputScan::GetDecSep( const String& rString, xub_StrLen& nPos )
+inline bool ImpSvNumberInputScan::GetDecSep( const String& rString, xub_StrLen& nPos )
{
if ( rString.Len() > nPos )
{
@@ -718,17 +718,17 @@ inline sal_Bool ImpSvNumberInputScan::GetDecSep( const String& rString, xub_StrL
if ( rString.Equals( rSep, nPos, rSep.Len() ) )
{
nPos = nPos + rSep.Len();
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
//---------------------------------------------------------------------------
// read a hundredth seconds separator
-inline sal_Bool ImpSvNumberInputScan::GetTime100SecSep( const String& rString, xub_StrLen& nPos )
+inline bool ImpSvNumberInputScan::GetTime100SecSep( const String& rString, xub_StrLen& nPos )
{
if ( rString.Len() > nPos )
{
@@ -736,10 +736,10 @@ inline sal_Bool ImpSvNumberInputScan::GetTime100SecSep( const String& rString, x
if ( rString.Equals( rSep, nPos, rSep.Len() ) )
{
nPos = nPos + rSep.Len();
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
@@ -807,15 +807,15 @@ short ImpSvNumberInputScan::GetESign( const String& rString, xub_StrLen& nPos )
// i counts string portions, j counts numbers thereof.
// It should had been called SkipNumber instead.
-inline sal_Bool ImpSvNumberInputScan::GetNextNumber( sal_uInt16& i, sal_uInt16& j )
+inline bool ImpSvNumberInputScan::GetNextNumber( sal_uInt16& i, sal_uInt16& j )
{
if ( i < nAnzStrings && IsNum[i] )
{
j++;
i++;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -864,7 +864,7 @@ void ImpSvNumberInputScan::GetTimeRef(
if (nIndex - nStartIndex < nAnz)
nSecond = (sal_uInt16) sStrArray[nNums[nIndex++]].ToInt32();
if (nIndex - nStartIndex < nAnz)
- fSecond100 = StringToDouble( sStrArray[nNums[nIndex]], sal_True );
+ fSecond100 = StringToDouble( sStrArray[nNums[nIndex]], true );
if (nAmPm == -1 && nHour != 12) // PM
nHour += 12;
else if (nAmPm == 1 && nHour == 12) // 12 AM
@@ -950,7 +950,7 @@ bool ImpSvNumberInputScan::MayBeIso8601()
//---------------------------------------------------------------------------
// GetDateRef
-sal_Bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter,
+bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter,
const SvNumberformat* pFormat )
{
using namespace ::com::sun::star::i18n;
@@ -977,7 +977,7 @@ sal_Bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter,
eEDF = NF_EVALDATEFORMAT_INTL;
nFormatOrder = 1;
}
- sal_Bool res = sal_True;
+ bool res = true;
const LocaleDataWrapper* pLoc = pFormatter->GetLocaleData();
CalendarWrapper* pCal = pFormatter->GetCalendar();
@@ -986,45 +986,45 @@ sal_Bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter,
pCal->setGregorianDateTime( Date() ); // today
String aOrgCalendar; // empty => not changed yet
DateFormat DateFmt;
- sal_Bool bFormatTurn;
+ bool bFormatTurn;
switch ( eEDF )
{
case NF_EVALDATEFORMAT_INTL :
- bFormatTurn = sal_False;
+ bFormatTurn = false;
DateFmt = pLoc->getDateFormat();
break;
case NF_EVALDATEFORMAT_FORMAT :
- bFormatTurn = sal_True;
+ bFormatTurn = true;
DateFmt = pFormat->GetDateOrder();
break;
case NF_EVALDATEFORMAT_INTL_FORMAT :
if ( nTryOrder == 1 )
{
- bFormatTurn = sal_False;
+ bFormatTurn = false;
DateFmt = pLoc->getDateFormat();
}
else
{
- bFormatTurn = sal_True;
+ bFormatTurn = true;
DateFmt = pFormat->GetDateOrder();
}
break;
case NF_EVALDATEFORMAT_FORMAT_INTL :
if ( nTryOrder == 2 )
{
- bFormatTurn = sal_False;
+ bFormatTurn = false;
DateFmt = pLoc->getDateFormat();
}
else
{
- bFormatTurn = sal_True;
+ bFormatTurn = true;
DateFmt = pFormat->GetDateOrder();
}
break;
default:
OSL_FAIL( "ImpSvNumberInputScan::GetDateRef: unknown NfEvalDateFormat" );
DateFmt = YMD;
- bFormatTurn = sal_False;
+ bFormatTurn = false;
}
if ( bFormatTurn )
{
@@ -1063,7 +1063,7 @@ input for the following reasons:
#endif
}
- res = sal_True;
+ res = true;
nCounter = 0;
// For incomplete dates, always assume first day of month if not specified.
pCal->setValue( CalendarFieldIndex::DAY_OF_MONTH, 1 );
@@ -1074,7 +1074,7 @@ input for the following reasons:
if (nMonthPos) // only month (Jan)
pCal->setValue( CalendarFieldIndex::MONTH, Abs(nMonth)-1 );
else
- res = sal_False;
+ res = false;
break;
case 1: // only one number
@@ -1103,7 +1103,7 @@ input for the following reasons:
pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(0) );
break;
default:
- res = sal_False;
+ res = false;
break;
}
break;
@@ -1118,12 +1118,12 @@ input for the following reasons:
pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(0) );
break;
default:
- res = sal_False;
+ res = false;
break;
}
break;
default:
- res = sal_False;
+ res = false;
break;
} // switch (nMonthPos)
break;
@@ -1210,7 +1210,7 @@ input for the following reasons:
}
break;
default:
- res = sal_False;
+ res = false;
break;
}
}
@@ -1249,12 +1249,12 @@ input for the following reasons:
pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(0) );
break;
default:
- res = sal_False;
+ res = false;
break;
}
break;
default: // else, e.g. month at the end (94 10 Jan)
- res = sal_False;
+ res = false;
break;
} // switch (nMonthPos)
break;
@@ -1299,7 +1299,7 @@ input for the following reasons:
pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(0) );
break;
default:
- res = sal_False;
+ res = false;
break;
}
}
@@ -1314,7 +1314,7 @@ input for the following reasons:
pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(1) );
break;
default:
- res = sal_False;
+ res = false;
break;
}
break;
@@ -1332,13 +1332,13 @@ input for the following reasons:
pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(0) );
break;
default:
- res = sal_False;
+ res = false;
break;
}
break;
default: // else, e.g. month at the end (94 10 Jan 8:23)
nCounter = 2;
- res = sal_False;
+ res = false;
break;
} // switch (nMonthPos)
break;
@@ -1352,7 +1352,7 @@ input for the following reasons:
nTryOrder = nFormatOrder; // break for
}
else
- res = sal_False;
+ res = false;
if ( aOrgCalendar.Len() )
pCal->loadCalendar( aOrgCalendar, pLoc->getLocale() ); // restore calendar
@@ -1372,7 +1372,7 @@ input for the following reasons:
{0,0,0}
};
lang::Locale aLocale;
- sal_Bool bValid;
+ bool bValid;
sal_Int16 nDay, nMyMonth, nYear, nHour, nMinute, nSecond;
sal_Int16 nDaySet, nMonthSet, nYearSet, nHourSet, nMinuteSet, nSecondSet;
sal_Int16 nZO, nDST1, nDST2, nDST, nZOmillis, nDST1millis, nDST2millis, nDSTmillis;
@@ -1450,10 +1450,10 @@ input for the following reasons:
// ScanStartString
//
// ersten String analysieren
-// Alles weg => sal_True
-// sonst => sal_False
+// Alles weg => true
+// sonst => false
-sal_Bool ImpSvNumberInputScan::ScanStartString( const String& rString,
+bool ImpSvNumberInputScan::ScanStartString( const String& rString,
const SvNumberformat* pFormat )
{
xub_StrLen nPos = 0;
@@ -1471,7 +1471,7 @@ sal_Bool ImpSvNumberInputScan::ScanStartString( const String& rString,
{ // Match against format in any case, so later on for a "x1-2-3" input
// we may distinguish between a xy-m-d (or similar) date and a x0-0-0
// format. No sign detection here!
- if ( ScanStringNumFor( rString, nPos, pFormat, 0, sal_True ) )
+ if ( ScanStringNumFor( rString, nPos, pFormat, 0, true ) )
nMatchedAllStrings |= nMatchedStartString;
else
nMatchedAllStrings = 0;
@@ -1551,7 +1551,7 @@ sal_Bool ImpSvNumberInputScan::ScanStartString( const String& rString,
return MatchedReturn();
}
- return sal_True;
+ return true;
}
@@ -1559,10 +1559,10 @@ sal_Bool ImpSvNumberInputScan::ScanStartString( const String& rString,
// ScanMidString
//
// String in der Mitte analysieren
-// Alles weg => sal_True
-// sonst => sal_False
+// Alles weg => true
+// sonst => false
-sal_Bool ImpSvNumberInputScan::ScanMidString( const String& rString,
+bool ImpSvNumberInputScan::ScanMidString( const String& rString,
sal_uInt16 nStringPos, const SvNumberformat* pFormat )
{
xub_StrLen nPos = 0;
@@ -1793,10 +1793,10 @@ sal_Bool ImpSvNumberInputScan::ScanMidString( const String& rString,
if ( nMatchedAllStrings & ~nMatchedVirgin )
eScannedType = eOldScannedType;
else
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
@@ -1804,10 +1804,10 @@ sal_Bool ImpSvNumberInputScan::ScanMidString( const String& rString,
// ScanEndString
//
// Schlussteil analysieren
-// Alles weg => sal_True
-// sonst => sal_False
+// Alles weg => true
+// sonst => false
-sal_Bool ImpSvNumberInputScan::ScanEndString( const String& rString,
+bool ImpSvNumberInputScan::ScanEndString( const String& rString,
const SvNumberformat* pFormat )
{
xub_StrLen nPos = 0;
@@ -2038,29 +2038,29 @@ sal_Bool ImpSvNumberInputScan::ScanEndString( const String& rString,
{
// does input EndString equal EndString in Format?
if ( !ScanStringNumFor( rString, nPos, pFormat, 0xFFFF ) )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool ImpSvNumberInputScan::ScanStringNumFor(
+bool ImpSvNumberInputScan::ScanStringNumFor(
const String& rString, // String to scan
xub_StrLen nPos, // Position until which was consumed
const SvNumberformat* pFormat, // The format to match
sal_uInt16 nString, // Substring of format, 0xFFFF => last
- sal_Bool bDontDetectNegation // Suppress sign detection
+ bool bDontDetectNegation // Suppress sign detection
)
{
if ( !pFormat )
- return sal_False;
+ return false;
const ::utl::TransliterationWrapper* pTransliteration = pFormatter->GetTransliteration();
const String* pStr;
String aString( rString );
- sal_Bool bFound = sal_False;
- sal_Bool bFirst = sal_True;
- sal_Bool bContinue = sal_True;
+ bool bFound = false;
+ bool bFirst = true;
+ bool bContinue = true;
sal_uInt16 nSub;
do
{
@@ -2070,22 +2070,22 @@ sal_Bool ImpSvNumberInputScan::ScanStringNumFor(
do
{ // Step through subformats, first positive, then negative, then
// other, but not the last (text) subformat.
- pStr = pFormat->GetNumForString( nSub, nString, sal_True );
+ pStr = pFormat->GetNumForString( nSub, nString, true );
if ( pStr && pTransliteration->isEqual( aString, *pStr ) )
{
- bFound = sal_True;
- bContinue = sal_False;
+ bFound = true;
+ bContinue = false;
}
else if ( nSub < 2 )
++nSub;
else
- bContinue = sal_False;
+ bContinue = false;
} while ( bContinue );
if ( !bFound && bFirst && nPos )
{ // try remaining substring
- bFirst = sal_False;
+ bFirst = false;
aString.Erase( 0, nPos );
- bContinue = sal_True;
+ bContinue = true;
}
} while ( bContinue );
@@ -2097,13 +2097,13 @@ sal_Bool ImpSvNumberInputScan::ScanStringNumFor(
aString.EraseAllChars( ' ' );
if ( (aString.Len() == 1) && (aString.GetChar(0) == '-') )
{
- bFound = sal_True;
+ bFound = true;
nStringScanSign = -1;
nSub = 0; //! not 1
}
}
if ( !bFound )
- return sal_False;
+ return false;
}
else if ( !bDontDetectNegation && (nSub == 1) &&
pFormat->IsNegativeRealNegative() )
@@ -2131,7 +2131,7 @@ sal_Bool ImpSvNumberInputScan::ScanStringNumFor(
nStringScanSign = -1;
}
nStringScanNumFor = nSub;
- return sal_True;
+ return true;
}
@@ -2139,9 +2139,9 @@ sal_Bool ImpSvNumberInputScan::ScanStringNumFor(
// IsNumberFormatMain
//
// Recognizes types of number, exponential, fraction, percent, currency, date, time.
-// Else text => return sal_False
+// Else text => return false
-sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
+bool ImpSvNumberInputScan::IsNumberFormatMain(
const String& rString, // string to be analyzed
double& , // OUT: result as number, if possible
const SvNumberformat* pFormat ) // maybe number format set to match against
@@ -2149,7 +2149,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
Reset();
NumberStringDivision( rString ); // breakdown into strings and numbers
if (nAnzStrings >= SV_MAX_ANZ_INPUT_STRINGS) // too many elements
- return sal_False; // Njet, Nope, ...
+ return false; // Njet, Nope, ...
if (nAnzNums == 0) // no number in input
{
@@ -2165,13 +2165,13 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{
eScannedType = NUMBERFORMAT_LOGICAL; // !!! it's a BOOLEAN
nMatchedAllStrings &= ~nMatchedVirgin;
- return sal_True;
+ return true;
}
else
- return sal_False; // simple text
+ return false; // simple text
}
else
- return sal_False; // simple text
+ return false; // simple text
}
sal_uInt16 i = 0; // mark any symbol
@@ -2190,14 +2190,14 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{
eScannedType = NUMBERFORMAT_FRACTION;
nMatchedAllStrings &= ~nMatchedVirgin;
- return sal_True;
+ return true;
}
}
}
else
{ // Analyze start string
if (!ScanStartString( sStrArray[i], pFormat )) // i=0
- return sal_False; // already an error
+ return false; // already an error
i++; // next symbol, i=1
}
GetNextNumber(i,j); // i=1,2
@@ -2212,11 +2212,11 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{
eScannedType = NUMBERFORMAT_FRACTION;
nMatchedAllStrings &= ~nMatchedVirgin;
- return sal_True;
+ return true;
}
}
if (i < nAnzStrings && !ScanEndString( sStrArray[i], pFormat ))
- return sal_False;
+ return false;
}
break;
case 2 : // Exactly 2 numbers in input
@@ -2224,16 +2224,16 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
if (!GetNextNumber(i,j)) // i=1,0
{ // Analyze start string
if (!ScanStartString( sStrArray[i], pFormat ))
- return sal_False; // already an error
+ return false; // already an error
i++; // i=1
}
GetNextNumber(i,j); // i=1,2
if ( !ScanMidString( sStrArray[i], i, pFormat ) )
- return sal_False;
+ return false;
i++; // next symbol, i=2,3
GetNextNumber(i,j); // i=3,4
if (i < nAnzStrings && !ScanEndString( sStrArray[i], pFormat ))
- return sal_False;
+ return false;
if (eSetType == NUMBERFORMAT_FRACTION) // -1,200. as fraction
{
if (!nNegCheck && // no sign '('
@@ -2243,7 +2243,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{
eScannedType = NUMBERFORMAT_FRACTION;
nMatchedAllStrings &= ~nMatchedVirgin;
- return sal_True;
+ return true;
}
}
}
@@ -2253,24 +2253,24 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
if (!GetNextNumber(i,j)) // i=1,0
{ // Analyze start string
if (!ScanStartString( sStrArray[i], pFormat ))
- return sal_False; // already an error
+ return false; // already an error
i++; // i=1
if (nDecPos == 1) // decimal separator at start => error
- return sal_False;
+ return false;
}
GetNextNumber(i,j); // i=1,2
if ( !ScanMidString( sStrArray[i], i, pFormat ) )
- return sal_False;
+ return false;
i++; // i=2,3
if (eScannedType == NUMBERFORMAT_SCIENTIFIC) // E only at end
- return sal_False;
+ return false;
GetNextNumber(i,j); // i=3,4
if ( !ScanMidString( sStrArray[i], i, pFormat ) )
- return sal_False;
+ return false;
i++; // i=4,5
GetNextNumber(i,j); // i=5,6
if (i < nAnzStrings && !ScanEndString( sStrArray[i], pFormat ))
- return sal_False;
+ return false;
if (eSetType == NUMBERFORMAT_FRACTION) // -1,200,100. as fraction
{
if (!nNegCheck && // no sign '('
@@ -2280,11 +2280,11 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{
eScannedType = NUMBERFORMAT_FRACTION;
nMatchedAllStrings &= ~nMatchedVirgin;
- return sal_True;
+ return true;
}
}
if ( eScannedType == NUMBERFORMAT_FRACTION && nDecPos )
- return sal_False; // #36857# not a real fraction
+ return false; // #36857# not a real fraction
}
break;
default: // More than 3 numbers in input
@@ -2292,14 +2292,14 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
if (!GetNextNumber(i,j)) // i=1,0
{ // Analyze startstring
if (!ScanStartString( sStrArray[i], pFormat ))
- return sal_False; // already an error
+ return false; // already an error
i++; // i=1
if (nDecPos == 1) // decimal separator at start => error
- return sal_False;
+ return false;
}
GetNextNumber(i,j); // i=1,2
if ( !ScanMidString( sStrArray[i], i, pFormat ) )
- return sal_False;
+ return false;
i++; // i=2,3
sal_uInt16 nThOld = 10; // just not 0 or 1
while (nThOld != nThousand && j < nAnzNums-1)
@@ -2308,10 +2308,10 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{ // Loop over group separators
nThOld = nThousand;
if (eScannedType == NUMBERFORMAT_SCIENTIFIC) // E only at end
- return sal_False;
+ return false;
GetNextNumber(i,j);
if ( i < nAnzStrings && !ScanMidString( sStrArray[i], i, pFormat ) )
- return sal_False;
+ return false;
i++;
}
if (eScannedType == NUMBERFORMAT_DATE || // long date or
@@ -2321,16 +2321,16 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
for (sal_uInt16 k = j; k < nAnzNums-1; k++)
{
if (eScannedType == NUMBERFORMAT_SCIENTIFIC) // E only at endd
- return sal_False;
+ return false;
GetNextNumber(i,j);
if ( i < nAnzStrings && !ScanMidString( sStrArray[i], i, pFormat ) )
- return sal_False;
+ return false;
i++;
}
}
GetNextNumber(i,j);
if (i < nAnzStrings && !ScanEndString( sStrArray[i], pFormat ))
- return sal_False;
+ return false;
if (eSetType == NUMBERFORMAT_FRACTION) // -1,200,100. as fraction
{
if (!nNegCheck && // no sign '('
@@ -2340,11 +2340,11 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{
eScannedType = NUMBERFORMAT_FRACTION;
nMatchedAllStrings &= ~nMatchedVirgin;
- return sal_True;
+ return true;
}
}
if ( eScannedType == NUMBERFORMAT_FRACTION && nDecPos )
- return sal_False; // #36857# not a real fraction
+ return false; // #36857# not a real fraction
}
}
@@ -2352,18 +2352,18 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
{
nMatchedAllStrings &= ~nMatchedVirgin;
// did match including nMatchedUsedAsReturn
- sal_Bool bDidMatch = (nMatchedAllStrings != 0);
+ bool bDidMatch = (nMatchedAllStrings != 0);
if ( nMatchedAllStrings )
{
- sal_Bool bMatch = (pFormat ? pFormat->IsNumForStringElementCountEqual(
- nStringScanNumFor, nAnzStrings, nAnzNums ) : sal_False);
+ bool bMatch = (pFormat ? pFormat->IsNumForStringElementCountEqual(
+ nStringScanNumFor, nAnzStrings, nAnzNums ) : false);
if ( !bMatch )
nMatchedAllStrings = 0;
}
if ( nMatchedAllStrings )
eScannedType = eSetType;
else if ( bDidMatch )
- return sal_False;
+ return false;
else
eScannedType = NUMBERFORMAT_NUMBER;
// everything else should have been recognized by now
@@ -2371,36 +2371,36 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormatMain(
else if ( eScannedType == NUMBERFORMAT_DATE )
{ // the very relaxed date input checks may interfere with a preset format
nMatchedAllStrings &= ~nMatchedVirgin;
- sal_Bool bWasReturn = ((nMatchedAllStrings & nMatchedUsedAsReturn) != 0);
+ bool bWasReturn = ((nMatchedAllStrings & nMatchedUsedAsReturn) != 0);
if ( nMatchedAllStrings )
{
- sal_Bool bMatch = (pFormat ? pFormat->IsNumForStringElementCountEqual(
- nStringScanNumFor, nAnzStrings, nAnzNums ) : sal_False);
+ bool bMatch = (pFormat ? pFormat->IsNumForStringElementCountEqual(
+ nStringScanNumFor, nAnzStrings, nAnzNums ) : false);
if ( !bMatch )
nMatchedAllStrings = 0;
}
if ( nMatchedAllStrings )
eScannedType = eSetType;
else if ( bWasReturn )
- return sal_False;
+ return false;
}
else
nMatchedAllStrings = 0; // reset flag to no substrings matched
- return sal_True;
+ return true;
}
//---------------------------------------------------------------------------
-// return sal_True or sal_False depending on the nMatched... state and remember usage
-sal_Bool ImpSvNumberInputScan::MatchedReturn()
+// return true or false depending on the nMatched... state and remember usage
+bool ImpSvNumberInputScan::MatchedReturn()
{
if ( nMatchedAllStrings & ~nMatchedVirgin )
{
nMatchedAllStrings |= nMatchedUsedAsReturn;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -2435,7 +2435,7 @@ void ImpSvNumberInputScan::InitText()
pUpperDayText[j] = pChrCls->upper( xElems[j].FullName );
pUpperAbbrevDayText[j] = pChrCls->upper( xElems[j].AbbrevName );
}
- bTextInitialized = sal_True;
+ bTextInitialized = true;
}
@@ -2454,7 +2454,7 @@ void ImpSvNumberInputScan::ChangeIntl()
cDecSep == '/' ||
cDecSep == '.' ||
cDecSep == pFormatter->GetDateSep().GetChar(0) );
- bTextInitialized = sal_False;
+ bTextInitialized = false;
aUpperCurrSymbol.Erase();
}
@@ -2479,7 +2479,7 @@ void ImpSvNumberInputScan::ChangeNullDate(
//
// => does rString represent a number (also date, time et al)
-sal_Bool ImpSvNumberInputScan::IsNumberFormat(
+bool ImpSvNumberInputScan::IsNumberFormat(
const String& rString, // string to be analyzed
short& F_Type, // IN: old type, OUT: new type
double& fOutNumber, // OUT: number if convertable
@@ -2487,13 +2487,13 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
{
String sResString;
String aString;
- sal_Bool res; // return value
+ bool res; // return value
eSetType = F_Type; // old type set
if ( !rString.Len() )
- res = sal_False;
+ res = false;
else if (rString.Len() > 308) // arbitrary
- res = sal_False;
+ res = false;
else
{
// NoMoreUpperNeeded, all comparisons on UpperCase
@@ -2509,7 +2509,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
|| (nSign && (eScannedType == NUMBERFORMAT_DATE
|| eScannedType == NUMBERFORMAT_DATETIME))
) // signed date/datetime
- res = sal_False;
+ res = false;
else
{ // check count of partial number strings
switch (eScannedType)
@@ -2523,7 +2523,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if ( nMatchedAllStrings )
nThousand = nAnzNums - 1;
else if ( nAnzNums != 1 )
- res = sal_False;
+ res = false;
}
else if (nDecPos == 2) // 1.05
{
@@ -2531,7 +2531,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if ( nMatchedAllStrings )
nThousand = nAnzNums - 1;
else if ( nAnzNums != nThousand+2 )
- res = sal_False;
+ res = false;
}
else // 1,100 or 1,100.
{
@@ -2539,7 +2539,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if ( nMatchedAllStrings )
nThousand = nAnzNums - 1;
else if ( nAnzNums != nThousand+1 )
- res = sal_False;
+ res = false;
}
break;
@@ -2547,17 +2547,17 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if (nDecPos == 1) // .05
{
if (nAnzNums != 2)
- res = sal_False;
+ res = false;
}
else if (nDecPos == 2) // 1.05
{
if (nAnzNums != nThousand+3)
- res = sal_False;
+ res = false;
}
else // 1,100 or 1,100.
{
if (nAnzNums != nThousand+2)
- res = sal_False;
+ res = false;
}
break;
@@ -2565,12 +2565,12 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if (nMonth)
{ // month name and numbers
if (nAnzNums > 2)
- res = sal_False;
+ res = false;
}
else
{
if (nAnzNums > 3)
- res = sal_False;
+ res = false;
}
break;
@@ -2578,12 +2578,12 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if (nDecPos)
{ // hundredth seconds included
if (nAnzNums > 4)
- res = sal_False;
+ res = false;
}
else
{
if (nAnzNums > 3)
- res = sal_False;
+ res = false;
}
break;
@@ -2593,12 +2593,12 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if (nDecPos)
{ // hundredth seconds included
if (nAnzNums > 6)
- res = sal_False;
+ res = false;
}
else
{
if (nAnzNums > 5)
- res = sal_False;
+ res = false;
}
}
else
@@ -2606,12 +2606,12 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if (nDecPos)
{ // hundredth seconds included
if (nAnzNums > 7)
- res = sal_False;
+ res = false;
}
else
{
if (nAnzNums > 6)
- res = sal_False;
+ res = false;
}
}
break;
@@ -2632,7 +2632,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
else if (nLogical == -1)
fOutNumber = 0.0; // False
else
- res = sal_False; // Oops
+ res = false; // Oops
break;
case NUMBERFORMAT_PERCENT:
@@ -2675,7 +2675,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
fOutNumber = 0.0;
else
fOutNumber = DBL_MAX;
-/*!*/ return sal_True;
+/*!*/ return true;
}
}
@@ -2712,7 +2712,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if (fNenner != 0.0)
fOutNumber = fZaehler/fNenner;
else
- res = sal_False;
+ res = false;
}
}
else // nAnzNums > 2
@@ -2731,7 +2731,7 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
if (fNenner != 0.0)
fOutNumber += fZaehler/fNenner;
else
- res = sal_False;
+ res = false;
}
}
@@ -2785,17 +2785,17 @@ sal_Bool ImpSvNumberInputScan::IsNumberFormat(
{
F_Type = NUMBERFORMAT_TEXT;
fOutNumber = -DBL_MAX;
- return sal_True;
+ return true;
}
else if (fOutNumber > DBL_MAX) // 1.7E308
{
F_Type = NUMBERFORMAT_TEXT;
fOutNumber = DBL_MAX;
- return sal_True;
+ return true;
}
}
- if (res == sal_False)
+ if (res == false)
{
eScannedType = NUMBERFORMAT_TEXT;
fOutNumber = 0.0;
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 4af1ca9..3b9fd9b 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -52,7 +52,7 @@ public:
const sal_uInt16 nYear );
/// convert input string to number
- sal_Bool IsNumberFormat(
+ bool IsNumberFormat(
const String& rString, /// input string
short& F_Type, /// format type (in + out)
double& fOutNumber, /// value determined (out)
@@ -76,16 +76,16 @@ private:
String* pUpperDayText; // Array of day of week names, uppercase
String* pUpperAbbrevDayText; // Array of day of week names, abbreviated, uppercase
String aUpperCurrSymbol; // Currency symbol, uppercase
- sal_Bool bTextInitialized; // Whether days and months are initialized
+ bool bTextInitialized; // Whether days and months are initialized
Date* pNullDate; // 30Dec1899
// Variables for provisional results:
String sStrArray[SV_MAX_ANZ_INPUT_STRINGS]; // Array of scanned substrings
- sal_Bool IsNum[SV_MAX_ANZ_INPUT_STRINGS]; // Whether a substring is numeric
- sal_uInt16 nNums[SV_MAX_ANZ_INPUT_STRINGS]; // Sequence of offsets to numeric strings
- sal_uInt16 nAnzStrings; // Total count of scanned substrings
- sal_uInt16 nAnzNums; // Count of numeric substrings
- sal_Bool bDecSepInDateSeps; // True <=> DecSep in {.,-,/,DateSep}
- sal_uInt8 nMatchedAllStrings; // Scan...String() matched all substrings,
+ bool IsNum[SV_MAX_ANZ_INPUT_STRINGS]; // Whether a substring is numeric
+ sal_uInt16 nNums[SV_MAX_ANZ_INPUT_STRINGS]; // Sequence of offsets to numeric strings
+ sal_uInt16 nAnzStrings; // Total count of scanned substrings
+ sal_uInt16 nAnzNums; // Count of numeric substrings
+ bool bDecSepInDateSeps; // True <=> DecSep in {.,-,/,DateSep}
+ sal_uInt8 nMatchedAllStrings; // Scan...String() matched all substrings,
// bit mask of nMatched... constants
static const sal_uInt8 nMatchedEndString; // 0x01
@@ -99,27 +99,27 @@ private:
// negative => short format
short nMonthPos; // 1 = front, 2 = middle
// 3 = end
- sal_uInt16 nTimePos; // Index of first time separator (+1)
+ sal_uInt16 nTimePos; // Index of first time separator (+1)
short nDecPos; // Index of substring containing "," (+1)
short nNegCheck; // '( )' for negative
short nESign; // Sign of exponent
short nAmPm; // +1 AM, -1 PM, 0 if none
short nLogical; // -1 => False, 1 => True
- sal_uInt16 nThousand; // Count of group (AKA thousand) separators
- sal_uInt16 nPosThousandString; // Position of concatenaded 000,000,000 string
+ sal_uInt16 nThousand; // Count of group (AKA thousand) separators
+ sal_uInt16 nPosThousandString; // Position of concatenaded 000,000,000 string
short eScannedType; // Scanned type
short eSetType; // Preset Type
- sal_uInt16 nStringScanNumFor; // Fixed strings recognized in
+ sal_uInt16 nStringScanNumFor; // Fixed strings recognized in
// pFormat->NumFor[nNumForStringScan]
short nStringScanSign; // Sign resulting of FixString
- sal_uInt16 nYear2000; // Two-digit threshold
+ sal_uInt16 nYear2000; // Two-digit threshold
// Year as 20xx
// default 18
// number <= nYear2000 => 20xx
// number > nYear2000 => 19xx
- sal_uInt16 nTimezonePos; // Index of timezone separator (+1)
- sal_uInt8 nMayBeIso8601; // 0:=dontknowyet, 1:=yes, 2:=no
+ sal_uInt16 nTimezonePos; // Index of timezone separator (+1)
+ sal_uInt8 nMayBeIso8601; // 0:=dontknowyet, 1:=yes, 2:=no
#ifdef _ZFORFIND_CXX // methods private to implementation
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list