diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-16 07:14:28 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-16 07:14:28 +0200 |
| commit | 66c6d1ef204f3507e7663a1b8b1be05b9ec71092 (patch) | |
| tree | d40d3fd85f558351176a9f6d22ad1d49196385dd /include | |
| parent | a772be514e783e232b13c9ff7cde93fb0529c278 (diff) | |
prevent invalid ods files with loext:fill-character
ODF specifies that extension elements in a document are removed before
the validation. With our old implementation of the number format export
this could result in two number:text elements following each other.
According to the spec a number:text element may not follow another
number:text element.
The number:text element before loext:fill is actually not that
interesting so it makes more sense to make this one an extension
element.
Possible documents showing issues:
fdo45268-1.xlsx
fdo49150-1.xlsx
and many more
Change-Id: I3ad92b8a61a246b3dbc0132d9a2c367488a766d0
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/xmlnumfe.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index c6ff37050d65..3c898d770e82 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/uno/Sequence.h> #include <rtl/ustrbuf.hxx> +#include <boost/ptr_container/ptr_vector.hpp> #define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles" @@ -59,7 +60,7 @@ private: SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang ); SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString& rString ); - SAL_DLLPRIVATE void FinishTextElement_Impl(); + SAL_DLLPRIVATE void FinishTextElement_Impl(bool bUseExtensionNS = false); SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor ); SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger, |