summaryrefslogtreecommitdiff
path: root/include/svl
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 /include/svl
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 'include/svl')
-rw-r--r--include/svl/zformat.hxx3
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