diff options
| author | Eike Rathke <erack@redhat.com> | 2015-03-22 19:27:33 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-03-22 19:29:41 +0000 |
| commit | 7b7f5c70c650c2c74e0f266b57630d033fcf27a3 (patch) | |
| tree | 1eda9390ef4f12721540070fbc95b1508e3ef465 /xmloff/source/style | |
| parent | de6f1651326da9cc44b137779e5d3131cab5133e (diff) | |
use ODFSaneDefaultVersion to determine if and how to store exponent-interval
Change-Id: I58d4c75806d656cb3f8bf971efecba6f775e05a9
Diffstat (limited to 'xmloff/source/style')
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index dbfed8c1b964..91c78e45e486 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -669,22 +669,13 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl( if ( nExpInterval >= 0 ) { // Export only for 1.2 with extensions or 1.3 and later. - SvtSaveOptions::ODFDefaultVersion eVersion = rExport.getDefaultVersion(); - if (eVersion > SvtSaveOptions::ODFVER_012) + SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion(); + if (eVersion > SvtSaveOptions::ODFSVER_012) { - // TODO: change this once the fouled up ODFVER_LATEST is a real - // 1.2+ or 1.3 or 1.3+ ... and only in configuration means latest. -#if 1 - // Currently 1.2+ is ODFVER_LATEST which is >ODFVER_012 and - // >ODFVER_013 and prevents correct handling.. - rExport.AddAttribute( XML_NAMESPACE_LO_EXT, - XML_EXPONENT_INTERVAL, OUString::number( nExpInterval ) ); -#else // For 1.2+ use loext namespace, for 1.3 use number namespace. rExport.AddAttribute( - ((eVersion < SvtSaveOptions::ODFVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), + ((eVersion < SvtSaveOptions::ODFSVER_013) ? XML_NAMESPACE_LO_EXT : XML_NAMESPACE_NUMBER), XML_EXPONENT_INTERVAL, OUString::number( nExpInterval ) ); -#endif } } |