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 /include | |
| 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 'include')
| -rw-r--r-- | include/svl/zformat.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 59c3a293d5b3..6357be2cea9d 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -436,8 +436,7 @@ public: // rAttr.Number not empty if NatNum attributes are to be stored void GetNatNumXml( - css::i18n::NativeNumberXmlAttributes& rAttr, - css::i18n::NativeNumberXmlAttributes2& rAttr2, + css::i18n::NativeNumberXmlAttributes2& rAttr, sal_uInt16 nNumFor ) const; /** Switches to the first non-"gregorian" calendar, but only if the current |