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 /dbaccess/source/core/recovery | |
| 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 'dbaccess/source/core/recovery')
| -rw-r--r-- | dbaccess/source/core/recovery/settingsimport.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 397c97eeb34c..fae9f58a4360 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -32,8 +32,8 @@ /** === end UNO includes === **/ #include <tools/diagnose_ex.h> +#include <sax/tools/converter.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/xmluconv.hxx> //........................................................................ namespace dbaccess @@ -216,8 +216,10 @@ namespace dbaccess if ( ::xmloff::token::IsXMLToken( rItemType, ::xmloff::token::XML_INT ) ) { sal_Int32 nValue(0); - if ( SvXMLUnitConverter::convertNumber( nValue, sValue ) ) + if (::sax::Converter::convertNumber( nValue, sValue )) + { o_rValue <<= nValue; + } else { OSL_FAIL( "ConfigItemImport::getItemValue: could not convert an int value!" ); @@ -225,9 +227,11 @@ namespace dbaccess } else if ( ::xmloff::token::IsXMLToken( rItemType, ::xmloff::token::XML_BOOLEAN ) ) { - bool nValue( sal_False ); - if ( SvXMLUnitConverter::convertBool( nValue, sValue ) ) - o_rValue <<= nValue; + bool bValue(false); + if (::sax::Converter::convertBool( bValue, sValue )) + { + o_rValue <<= bValue; + } else { OSL_FAIL( "ConfigItemImport::getItemValue: could not convert a boolean value!" ); |