diff options
| author | Eike Rathke <erack@redhat.com> | 2014-11-06 21:05:30 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-11-06 21:32:57 +0100 |
| commit | 14174aabaa959988fe65c41109c6eafc37f5b2c3 (patch) | |
| tree | 25ccf4ae7d8b5e94f60a5ff7ea72b0b818a71c85 /include | |
| parent | b448ee4a3a5a121f3b08a8e946a934d3414a5251 (diff) | |
change nNewStandardDefined to bAdditionalBuiltin
and remove SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS
Change-Id: I63f341e74a1eb7172dbb024a5cef66435a46e1df
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/nfversi.hxx | 1 | ||||
| -rw-r--r-- | include/svl/zformat.hxx | 17 |
2 files changed, 5 insertions, 13 deletions
diff --git a/include/svl/nfversi.hxx b/include/svl/nfversi.hxx index 900444ecb2a7..ceb2dd8c8d6a 100644 --- a/include/svl/nfversi.hxx +++ b/include/svl/nfversi.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVL_NFVERSI_HXX // file IDs -#define SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS 0x000e #define SV_NUMBERFORMATTER_VERSION 0x000f diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index c2a353c0c34b..aa5e8a5016dd 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -184,23 +184,16 @@ public: ~SvNumberformat(); /// Get type of format, may include NUMBERFORMAT_DEFINED bit - short GetType() const - { return (nNewStandardDefined && - (nNewStandardDefined <= SV_NUMBERFORMATTER_VERSION)) ? - (eType & ~NUMBERFORMAT_DEFINED) : eType; } + short GetType() const { return eType; } void SetType(const short eSetType) { eType = eSetType; } // Standard means the I18N defined standard format of this type 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_... - void SetNewStandardDefined( sal_uInt16 nVer ) - { nNewStandardDefined = nVer; eType |= NUMBERFORMAT_DEFINED; } - - bool IsAdditionalStandardDefined() const - { return nNewStandardDefined == SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS; } + // If this format is an additional built-in format defined by i18n. + void SetAdditionalBuiltin() { bAdditionalBuiltin = true; } + bool IsAdditionalBuiltin() const { return bAdditionalBuiltin; } LanguageType GetLanguage() const { return maLocale.meLanguage;} @@ -467,8 +460,8 @@ 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 short eType; // Type of format + bool bAdditionalBuiltin; // If this is an additional built-in format defined by i18n bool bStarFlag; // Take *n format as ESC n bool bStandard; // If this is a default standard format bool bIsUsed; // Flag as used for storing |