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/text/XMLTextColumnsExport.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/text/XMLTextColumnsExport.cxx')
| -rw-r--r-- | xmloff/source/text/XMLTextColumnsExport.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index a4c58f4651d9..18c4f74a2cb1 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <sax/tools/converter.hxx> #include <xmloff/xmltoken.hxx> #include "xmloff/xmlnmspe.hxx" @@ -76,7 +77,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) sal_Int32 nCount = aColumns.getLength(); OUStringBuffer sValue; - GetExport().GetMM100UnitConverter().convertNumber( sValue, nCount ? nCount : 1 ); + ::sax::Converter::convertNumber( sValue, (nCount) ? nCount : 1 ); GetExport().AddAttribute( XML_NAMESPACE_FO, XML_COLUMN_COUNT, sValue.makeStringAndClear() ); @@ -120,8 +121,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) aAny = xPropSet->getPropertyValue( sSeparatorLineColor ); sal_Int32 nColor = 0; aAny >>= nColor; - GetExport().GetMM100UnitConverter().convertColor( sValue, - nColor ); + ::sax::Converter::convertColor( sValue, nColor ); GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_COLOR, sValue.makeStringAndClear() ); @@ -129,8 +129,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) aAny = xPropSet->getPropertyValue( sSeparatorLineRelativeHeight ); sal_Int8 nHeight = 0; aAny >>= nHeight; - GetExport().GetMM100UnitConverter().convertPercent( sValue, - nHeight ); + ::sax::Converter::convertPercent( sValue, nHeight ); GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_HEIGHT, sValue.makeStringAndClear() ); @@ -181,8 +180,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) while( nCount-- ) { // style:rel-width - GetExport().GetMM100UnitConverter().convertNumber( sValue, - pColumns->Width ); + ::sax::Converter::convertNumber( sValue, pColumns->Width ); sValue.append( (sal_Unicode)'*' ); GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_REL_WIDTH, sValue.makeStringAndClear() ); |