diff options
| author | Eike Rathke <erack@redhat.com> | 2018-06-08 23:44:13 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-06-11 22:59:32 +0200 |
| commit | e2a39848fa11dfc082ca9142266cbfe8adb586f2 (patch) | |
| tree | 6b0e8e8bdf713c3ece0aa766689b7b8f773471c7 /offapi | |
| parent | ecad621f6889e8af23baa4faee62d10f580ec074 (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>
(cherry picked from commit 807d4382cb021d2ac3ea99d6757a7b368a32941d)
Reviewed-on: https://gerrit.libreoffice.org/55626
Tested-by: Eike Rathke <erack@redhat.com>
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/com/sun/star/i18n/NativeNumberXmlAttributes2.idl | 9 | ||||
| -rw-r--r-- | offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl | 2 |
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. */ |