diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-10-11 14:19:00 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-10-11 17:57:00 +0200 |
| commit | 3ca2bef76886450058d1667703aeafe4c2e456c3 (patch) | |
| tree | b18d70f79bfcfd2b2e34790e86edafb4c4337a80 /xmloff/source/style/xmlnume.cxx | |
| parent | 02c32e0f0e75a9df80888051d1ec189fa14129bd (diff) | |
#i108468#: clean up xmluconv code duplication, part 1:
move convertNumber64 from SvXMLUnitConverter to sax::converter.
remove duplicate methods from SvXMLUnitConverter:
convertBool, convertPercent, convertColor, convertNumber, convertDouble,
indexOfComma, encodeBase64, decodeBase64, decodeBase64SomeChars,
clearUndefinedChars
Diffstat (limited to 'xmloff/source/style/xmlnume.cxx')
| -rw-r--r-- | xmloff/source/style/xmlnume.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 6ff60f002d39..115c813712fd 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -48,6 +48,8 @@ #include <tools/debug.hxx> +#include <sax/tools/converter.hxx> + #include <xmloff/nmspmap.hxx> #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> @@ -612,14 +614,13 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, // fo:color = "#..." if( bHasColor ) { - const Color aColor( nColor ); - if( aColor.GetColor() == 0xffffffff ) + if (0xffffffff == static_cast<sal_uInt32>(nColor)) { GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_USE_WINDOW_FONT_COLOR, XML_TRUE ); } else { - SvXMLUnitConverter::convertColor( sBuffer, aColor ); + ::sax::Converter::convertColor( sBuffer, nColor ); GetExport().AddAttribute( XML_NAMESPACE_FO, XML_COLOR, sBuffer.makeStringAndClear() ); } @@ -627,7 +628,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, // fo:height="...%" if( nBullRelSize ) { - GetExport().GetMM100UnitConverter().convertPercent( sTmp, nBullRelSize ); + ::sax::Converter::convertPercent( sTmp, nBullRelSize ); GetExport().AddAttribute( XML_NAMESPACE_FO, XML_FONT_SIZE, sTmp.makeStringAndClear() ); } |