From ecad621f6889e8af23baa4faee62d10f580ec074 Mon Sep 17 00:00:00 2001
From: László Németh <nemeth@numbertext.org>
Date: Wed, 30 May 2018 17:28:17 +0200
Subject: tdf#115007: add import/export to NatNum12 (spell out numbers,
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

dates and money amounts, supporting all the
XNumberText/libnumbertext formatting codes, for example
"ordinal", "ordinal-number", "ordinal-feminine", etc., and
ISO 4217 currency codes, also their possible combinations.
NatNum12 formatting codes are stored by using the newly
introduced (yet, loext:)transliteration-spellout attribute.

creator-initials also added to token list

Change-Id: I20f93c9d16778f142067a56d53b336d0acbe2d92
Reviewed-on: https://gerrit.libreoffice.org/54673
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 32f1c56d8ff5e6f87dbcf086fd3743d6d36182bc)
Reviewed-on: https://gerrit.libreoffice.org/55625
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: László Németh <nemeth@numbertext.org>
---
 .../source/defaultnumberingprovider/defaultnumberingprovider.cxx | 5 +++--
 i18npool/source/nativenumber/nativenumbersupplier.cxx            | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'i18npool')

diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 45a222ce9efd..d363407c19fe 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -642,12 +642,13 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                locale = aLocale;
                bCapitalize = true;
                break;
-          case TEXT_CARDINAL: // cardinal number names (one, two, three, ...)
+          case TEXT_CARDINAL: // cardinal number names (One, Two, Three, ...)
                natNum = NativeNumberMode::NATNUM12;
+               sNatNumParams = "cardinal";
                locale = aLocale;
                bCapitalize = true;
                break;
-          case TEXT_ORDINAL: // ordinal number names (first, second, third, ...)
+          case TEXT_ORDINAL: // ordinal number names (First, Second, Third, ...)
                natNum = NativeNumberMode::NATNUM12;
                sNatNumParams = "ordinal";
                locale = aLocale;
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 0de111165adc..a18d8c7c798a 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -598,9 +598,10 @@ OUString getNumberText(const Locale& rLocale, const OUString& rNumberString,
 
     static auto xNumberText
         = css::linguistic2::NumberText::create(comphelper::getProcessComponentContext());
-    OUString numbertext_prefix = sNumberTextParams;
-    if (!numbertext_prefix.isEmpty())
-        numbertext_prefix += " ";
+    OUString numbertext_prefix;
+    // default "cardinal" gets empty prefix
+    if (sNumberTextParams != "cardinal")
+        numbertext_prefix = sNumberTextParams + " ";
     // Several hundreds of headings could result typing lags because
     // of the continuous update of the multiple number names during typing.
     // We fix this by buffering the result of the conversion.
@@ -777,7 +778,7 @@ sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLoc
     switch (nNativeNumberMode) {
         case NativeNumberMode::NATNUM0:     // Ascii
         case NativeNumberMode::NATNUM3:     // Char, FullWidth
-        case NativeNumberMode::NATNUM12:    // Spell number
+        case NativeNumberMode::NATNUM12:    // spell out numbers, dates and money amounts
             return true;
         case NativeNumberMode::NATNUM1:     // Char, Lower
             return (langnum >= 0);
-- 
cgit v1.2.3