From 90d233b0311a208967a3e264820e00395bf057fb Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sun, 13 May 2018 03:09:43 +0300 Subject: tdf#115007: Use [NatNum12 params...] syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows using all the libnumbertext library functions. [NatNum12] gives cardinal number names (one, two, three, ...) [NatNum12 ordinal] gives ordinal number names (first, second, third, ...) [NatNum12 ordinal-number] gives ordinal indicators (1st, 2nd, 3rd, ...) [NatNum12 money USD][$-409] gives formal English (US) money text ... etc (see numbertext.org for syntax). Change-Id: I16dbb44d8d4bdb82a1b950de6d438c8311b554ff Reviewed-on: https://gerrit.libreoffice.org/54366 Tested-by: Jenkins Reviewed-by: László Németh --- include/svl/zformat.hxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/svl') diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 33b5bf8b2062..92a8080e3383 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -64,7 +64,8 @@ struct ImpSvNumberformatInfo // Struct for FormatInfo // eLang specifies the Locale to use. class SvNumberNatNum { - LanguageType eLang; + OUString sParams; // For [NatNum12 ordinal-number]-like syntax + LanguageType eLang; sal_uInt8 nNum; bool bDBNum :1; // DBNum, to be converted to NatNum bool bDate :1; // Used in date? (needed for DBNum/NatNum mapping) @@ -90,6 +91,8 @@ public: } bool IsSet() const { return bSet; } void SetDate( bool bDateP ) { bDate = bDateP; } + void SetParams(const OUString& s) { sParams = s; } + OUString GetParams() const { return sParams; } }; class CharClass; @@ -125,6 +128,7 @@ public: void SetNatNumNum( sal_uInt8 nNum, bool bDBNum ) { aNatNum.SetNum( nNum, bDBNum ); } void SetNatNumLang( LanguageType eLang ) { aNatNum.SetLang( eLang ); } void SetNatNumDate( bool bDate ) { aNatNum.SetDate( bDate ); } + void SetNatNumParams(const OUString& sParams) { aNatNum.SetParams(sParams); } const SvNumberNatNum& GetNatNum() const { return aNatNum; } private: -- cgit