summaryrefslogtreecommitdiffstats
path: root/i18npool/inc
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2018-06-12 11:50:05 +0200
committerEike Rathke <erack@redhat.com>2018-06-20 20:24:37 +0200
commit261ff0cdf0e89a80f5d2af7ba5a331bc237a0ceb (patch)
tree00aea88431dc91e8fcf9b5a966ef7ca140bd589a /i18npool/inc
parentResolves: tdf#118120 RET_ALL shares same value as RET_HELP (diff)
downloadcore-261ff0cdf0e89a80f5d2af7ba5a331bc237a0ceb.tar.gz
core-261ff0cdf0e89a80f5d2af7ba5a331bc237a0ceb.zip
NatNum12: fix and add capitalization prefixes, tdf#115007 follow-up
Limit NatNum12 conversion only for the selected parts of the date format (this bug – double calls of getNumberText – was hidden by the space prefix " " and empty return values at the first calls, resulting unchanged dates yet). New prefixes: "capitalize", "upper" and "title" to handle optional capitalization. (In Calc, it was not possible to format the result of NatNum formatting, but some languages often need capitalization or title case to format numbers and currencies.) Thanks code clean up using enum WhichCasing to Eike Rathke. Change-Id: I5fceb784930e6bc6d376116f5a42ad49cd248a54 Reviewed-on: https://gerrit.libreoffice.org/55681 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'i18npool/inc')
-rw-r--r--i18npool/inc/defaultnumberingprovider.hxx2
-rw-r--r--i18npool/inc/nativenumbersupplier.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 97608c122000..1320b7e41a73 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/i18n/XTransliteration.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/i18n/CharacterClassification.hpp>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
@@ -81,7 +80,6 @@ private:
OUString makeNumberingIdentifier( sal_Int16 index );
/// @throws css::uno::RuntimeException
bool isScriptFlagEnabled(const OUString& aName );
- mutable css::uno::Reference< css::i18n::XCharacterClassification > xCharClass;
};
}
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index d17c39fe7490..067a590b441a 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/i18n/CharacterClassification.hpp>
namespace i18npool {
@@ -76,6 +77,7 @@ public:
private:
css::lang::Locale aLocale;
bool useOffset;
+ mutable css::uno::Reference< css::i18n::XCharacterClassification > xCharClass;
};
}