summaryrefslogtreecommitdiff
path: root/offapi/com
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-06-08 23:44:13 +0200
committerEike Rathke <erack@redhat.com>2018-06-11 13:05:22 +0200
commit807d4382cb021d2ac3ea99d6757a7b368a32941d (patch)
tree0b1924a4168bc5861b72ab6116e9f705e6a7c61b /offapi/com
parentbada992cb0ff3fbd9a3e2c5ff2c5d2cc59fa888b (diff)
Derive NativeNumberXmlAttributes2 from NativeNumberXmlAttributes, tdf#115007 follow-up
Also ensure that transliteration-spellout and (transliteration-format,transliteration-style) are mutually exclusive and transliteration-spellout is only written if ODF version is >1.2, namespace 'loext' for 1.2 with extensions and namespace 'number' in anticipation of ODF 1.3 (may need to be adapted). Change-Id: I371dee8883ecb0d4638510c92b4bf59acd09f636 Reviewed-on: https://gerrit.libreoffice.org/55491 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'offapi/com')
-rw-r--r--offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl9
-rw-r--r--offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl2
2 files changed, 4 insertions, 7 deletions
diff --git a/offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl b/offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl
index 34dbc9cc6e1d..d8c8fb225dd2 100644
--- a/offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl
+++ b/offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl
@@ -20,7 +20,7 @@
#ifndef __com_sun_star_i18n_NativeNumberXmlAttributes_idl__
#define __com_sun_star_i18n_NativeNumberXmlAttributes_idl__
-#include <com/sun/star/lang/Locale.idl>
+#include <com/sun/star/i18n/NativeNumberXmlAttributes.idl>
module com { module sun { module star { module i18n {
@@ -39,16 +39,13 @@ module com { module sun { module star { module i18n {
@internal
- ATTENTION: This service is marked <em>internal</em> and does not
+ ATTENTION: This struct is marked <em>internal</em> and does not
have the <em>published</em> flag, which means it is subject to
change without notice and should not be used outside the LibreOffice core.
*/
-struct NativeNumberXmlAttributes2
+struct NativeNumberXmlAttributes2 : com::sun::star::i18n::NativeNumberXmlAttributes
{
- /// The locale of the native number representation
- ::com::sun::star::lang::Locale Locale;
-
/** The format of the number string, for example, "cardinal",
"ordinal" or "ordinal-number". */
string Spellout;
diff --git a/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl b/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl
index 08c0d37ce663..17a1df082c9f 100644
--- a/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl
+++ b/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module i18n {
@internal
- ATTENTION: This service is marked <em>internal</em> and does not
+ ATTENTION: This interface is marked <em>internal</em> and does not
have the <em>published</em> flag, which means it is subject to
change without notice and should not be used outside the LibreOffice core.
*/