diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 06:49:58 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 06:49:58 -0500 |
commit | 8021c2f31277989f87ca8224234358760bb3c865 (patch) | |
tree | 9675645b64b705b590bf1f68556414bd6caecda9 /lotuswordpro/source/filter/lwpnumericfmt.hxx | |
parent | fix mis-merge in oox (diff) | |
download | core-8021c2f31277989f87ca8224234358760bb3c865.tar.gz core-8021c2f31277989f87ca8224234358760bb3c865.zip |
convert tools type in lotuswordpro
Diffstat (limited to 'lotuswordpro/source/filter/lwpnumericfmt.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpnumericfmt.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 9ba3d02903a0..72f2faa1c8d3 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -192,7 +192,7 @@ private: std::map<sal_uInt16,LwpCurrencyInfo> m_aCurrencyInfo; void InitCurrencySymbol() { - USHORT nC=FMT_ARGENTINEANPESO; + sal_uInt16 nC=FMT_ARGENTINEANPESO; m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("A")); //FMT_ARGENTINEANPESO = 1, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("A$")); //FMT_AUSTRALIANDOLLAR = 2, m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3, @@ -248,8 +248,8 @@ public: LwpNumericFormat(LwpObjectStream * pStrm); ~LwpNumericFormat(){} void Read(); - static sal_Bool IsCurrencyFormat(USHORT Format); - USHORT GetDecimalPlaces(void); + static sal_Bool IsCurrencyFormat(sal_uInt16 Format); + sal_uInt16 GetDecimalPlaces(void); sal_Bool IsDecimalPlacesOverridden(void); sal_Bool IsNegativeOverridden(void); sal_Bool IsZeroOverridden(void); @@ -273,7 +273,7 @@ private: sal_uInt16 cDecimalPlaces; - static USHORT GetDefaultDecimalPlaces(USHORT Format); + static sal_uInt16 GetDefaultDecimalPlaces(sal_uInt16 Format); static LwpCurrencyPool m_aCurrencyInfo; void GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aPrefix, String& aSuffix, sal_Bool bNegtive=sal_False); |