Skip to content

Commit

Permalink
tdf#90133 Comply attributes name with OASIS#3860
Browse files Browse the repository at this point in the history 
See https://issues.oasis-open.org/browse/OFFICE-3860

Change-Id: I707b2e86633bc66df03dba8c43879aa6d5153062
Reviewed-on: https://gerrit.libreoffice.org/16905
Tested-by: Jenkins <[email protected]>
Reviewed-by: Eike Rathke <[email protected]>
Tested-by: Eike Rathke <[email protected]>
  • Loading branch information
@erAck
Laurent Balland-Poirier authored and erAck committed Jul 13, 2015
1 parent e80df0d commit 9c2a806
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions include/xmloff/xmltoken.hxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3250,8 +3250,8 @@ namespace xmloff { namespace token {
XML_EXTERNALDATA,

XML_EXPONENT_INTERVAL,
XML_EXPONENT_SIGN,
XML_MIN_DECIMAL_DIGITS,
XML_FORCED_EXPONENT_SIGN,
XML_MIN_DECIMAL_PLACES,

XML_TOKEN_END
};
Expand Down
4 changes: 2 additions & 2 deletions xmloff/source/core/xmltoken.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
8 changes: 4 additions & 4 deletions xmloff/source/style/xmlnumfe.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,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 ) );
}

Expand Down Expand Up @@ -651,7 +651,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 ) );
}

Expand Down Expand Up @@ -692,11 +692,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,
Expand Down
12 changes: 6 additions & 6 deletions xmloff/source/style/xmlnumfi.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,15 @@ 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,
XML_TOK_ELEM_ATTR_DECIMAL_REPLACEMENT,
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,
Expand Down Expand Up @@ -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 },
Expand All @@ -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 },
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 9c2a806

Please sign in to comment.