diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2015-07-10 08:21:23 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:11 +0200 |
| commit | c2a160740992c8eba7bb66e5b736cfb88722e398 (patch) | |
| tree | 1957f1f6c018e586a5bec907a7d52a3c5330b203 /xmloff | |
| parent | 447ca647cfa49959a1d8e432145fdd0eac090bec (diff) | |
tdf#90133 Comply attributes name with OASIS#3860
See https://issues.oasis-open.org/browse/OFFICE-3860
Change-Id: I707b2e86633bc66df03dba8c43879aa6d5153062
Reviewed-on: https://gerrit.libreoffice.org/16905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 9c2a8065add0da1e649633efa0795beddfa68eed)
Reviewed-on: https://gerrit.libreoffice.org/17005
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 5e1dd51d3a59..63e4aff8703c 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3248,8 +3248,8 @@ namespace xmloff { namespace token { TOKEN( "external-data", XML_EXTERNALDATA), TOKEN( "exponent-interval", XML_EXPONENT_INTERVAL ), - TOKEN( "exponent-sign", XML_EXPONENT_SIGN ), - TOKEN( "min-decimal-digits", XML_MIN_DECIMAL_DIGITS ), + TOKEN( "forced-exponent-sign", XML_FORCED_EXPONENT_SIGN ), + TOKEN( "min-decimal-places", XML_MIN_DECIMAL_PLACES ), #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 6b7142fa366a..6c9d360828e8 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -572,7 +572,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl( if ( nMinDecimals >= 0 ) // negative = automatic { - rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS, + rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES, OUString::number( nMinDecimals ) ); } @@ -653,7 +653,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl( if ( nMinDecimals >= 0 ) // negative = automatic { - rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS, + rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES, OUString::number( nMinDecimals ) ); } @@ -694,11 +694,11 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl( // exponent sign if ( bExpSign ) { - rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, XML_TRUE ); + rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, XML_TRUE ); } else { - rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, XML_FALSE ); + rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, XML_FALSE ); } SvXMLElementExport aElem( rExport, diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 5b8ad3fed3fb..e9e25f484c99 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -274,7 +274,7 @@ enum SvXMLStyleAttrTokens enum SvXMLStyleElemAttrTokens { XML_TOK_ELEM_ATTR_DECIMAL_PLACES, - XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS, + XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES, XML_TOK_ELEM_ATTR_MIN_INTEGER_DIGITS, XML_TOK_ELEM_ATTR_GROUPING, XML_TOK_ELEM_ATTR_DISPLAY_FACTOR, @@ -282,7 +282,7 @@ enum SvXMLStyleElemAttrTokens XML_TOK_ELEM_ATTR_DENOMINATOR_VALUE, XML_TOK_ELEM_ATTR_MIN_EXPONENT_DIGITS, XML_TOK_ELEM_ATTR_EXPONENT_INTERVAL, - XML_TOK_ELEM_ATTR_EXPONENT_SIGN, + XML_TOK_ELEM_ATTR_FORCED_EXPONENT_SIGN, XML_TOK_ELEM_ATTR_MIN_NUMERATOR_DIGITS, XML_TOK_ELEM_ATTR_MIN_DENOMINATOR_DIGITS, XML_TOK_ELEM_ATTR_RFC_LANGUAGE_TAG, @@ -572,7 +572,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemAttrTokenMap() { // attributes for an element within a style { XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES, XML_TOK_ELEM_ATTR_DECIMAL_PLACES }, - { XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS, XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS }, + { XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_PLACES, XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES }, { XML_NAMESPACE_NUMBER, XML_MIN_INTEGER_DIGITS, XML_TOK_ELEM_ATTR_MIN_INTEGER_DIGITS }, { XML_NAMESPACE_NUMBER, XML_GROUPING, XML_TOK_ELEM_ATTR_GROUPING }, { XML_NAMESPACE_NUMBER, XML_DISPLAY_FACTOR, XML_TOK_ELEM_ATTR_DISPLAY_FACTOR }, @@ -581,7 +581,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemAttrTokenMap() { XML_NAMESPACE_NUMBER, XML_MIN_EXPONENT_DIGITS, XML_TOK_ELEM_ATTR_MIN_EXPONENT_DIGITS }, { XML_NAMESPACE_LO_EXT, XML_EXPONENT_INTERVAL, XML_TOK_ELEM_ATTR_EXPONENT_INTERVAL }, { XML_NAMESPACE_NUMBER, XML_EXPONENT_INTERVAL, XML_TOK_ELEM_ATTR_EXPONENT_INTERVAL }, - { XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, XML_TOK_ELEM_ATTR_EXPONENT_SIGN }, + { XML_NAMESPACE_LO_EXT, XML_FORCED_EXPONENT_SIGN, XML_TOK_ELEM_ATTR_FORCED_EXPONENT_SIGN }, { XML_NAMESPACE_NUMBER, XML_MIN_NUMERATOR_DIGITS, XML_TOK_ELEM_ATTR_MIN_NUMERATOR_DIGITS }, { XML_NAMESPACE_NUMBER, XML_MIN_DENOMINATOR_DIGITS, XML_TOK_ELEM_ATTR_MIN_DENOMINATOR_DIGITS }, { XML_NAMESPACE_NUMBER, XML_RFC_LANGUAGE_TAG, XML_TOK_ELEM_ATTR_RFC_LANGUAGE_TAG }, @@ -948,7 +948,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, if (::sax::Converter::convertNumber( nAttrVal, sValue, 0 )) aNumInfo.nDecimals = std::min<sal_Int32>(nAttrVal, MAX_SECOND_DIGITS); break; - case XML_TOK_ELEM_ATTR_MIN_DECIMAL_DIGITS: + case XML_TOK_ELEM_ATTR_MIN_DECIMAL_PLACES: if (::sax::Converter::convertNumber( nAttrVal, sValue, 0 )) aNumInfo.nMinDecimalDigits = nAttrVal; break; @@ -978,7 +978,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, if (::sax::Converter::convertNumber( nAttrVal, sValue, 0 )) aNumInfo.nExpInterval = nAttrVal; break; - case XML_TOK_ELEM_ATTR_EXPONENT_SIGN: + case XML_TOK_ELEM_ATTR_FORCED_EXPONENT_SIGN: if (::sax::Converter::convertBool( bAttrBool, sValue )) aNumInfo.bExpSign = bAttrBool; break; |