From c392ecfa734731194c366e869a3c2475c53dc867 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 11 Jun 2020 14:02:57 +0300 Subject: Drop configurability of libnumbertext use It was fairly pointless to be able to --disable-libnumbertext. Besides, disabling it broke the ordinal page (etc) numbering feature: "1st", "2nd", "3rd", etc showed up as "Ordinal-number 1", "Ordinal-number 2", "Ordinal-number 3" etc. Change-Id: I645169054a8fdc8dac89cd48b6c369fd61749467 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96119 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- svl/CppunitTest_svl_qa_cppunit.mk | 6 ++---- svl/qa/unit/svl.cxx | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'svl') diff --git a/svl/CppunitTest_svl_qa_cppunit.mk b/svl/CppunitTest_svl_qa_cppunit.mk index d364436eef2a..422ff5dea8b2 100644 --- a/svl/CppunitTest_svl_qa_cppunit.mk +++ b/svl/CppunitTest_svl_qa_cppunit.mk @@ -52,10 +52,8 @@ $(eval $(call gb_CppunitTest_set_include,svl_qa_cppunit,\ $(eval $(call gb_CppunitTest_use_components,svl_qa_cppunit,\ i18npool/util/i18npool \ configmgr/source/configmgr \ - $(if $(filter TRUE,$(ENABLE_LIBNUMBERTEXT)), \ - framework/util/fwk \ - lingucomponent/source/numbertext/numbertext \ - ) \ + framework/util/fwk \ + lingucomponent/source/numbertext/numbertext \ )) $(eval $(call gb_CppunitTest_use_ure,svl_qa_cppunit)) diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 8362c9fbc88b..194dc550c278 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -8,7 +8,6 @@ */ #include -#include #include #include #include @@ -1415,7 +1414,6 @@ void Test::testUserDefinedNumberFormats() checkPreviewString(aFormatter, sCode, 120, eLang, sExpected); sCode = "[DBNum2][$-0404]General\\ "; checkPreviewString(aFormatter, sCode, 120, eLang, sExpected); -#if ENABLE_LIBNUMBERTEXT // tdf#115007 - cardinal/ordinal number names/indicators sCode = "[NatNum12]0"; sExpected = "one hundred twenty-three"; @@ -1447,7 +1445,6 @@ void Test::testUserDefinedNumberFormats() sCode = "[NatNum12 YYYY=title year, D=capitalize ordinal]D\" of \"MMMM\", \"YYYY"; sExpected = "Second of January, Nineteen Hundred"; checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected); -#endif } { // tdf#130193 tdf#130140 Native Number Formats mapping for Chinese (Traditional), Japanese, Korean // -- Traditional Chinese: DBNum1 -> NatNum4, DBNum2 -> NatNum5, DBnum3 -> NatNum3 -- cgit