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/forms/handler | |
| 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/forms/handler')
| -rw-r--r-- | xmloff/source/forms/handler/vcl_date_handler.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/forms/handler/vcl_time_handler.cxx | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index ef854e3b0105..a24609fc72d1 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -30,8 +30,12 @@ #include "vcl_date_handler.hxx" #include "xmloff/xmluconv.hxx" +#include <rtl/ustrbuf.hxx> + #include <com/sun/star/util/DateTime.hpp> +#include <sax/tools/converter.hxx> + #include <tools/diagnose_ex.h> #include <tools/date.hxx> @@ -90,7 +94,7 @@ namespace xmloff else { // compatibility format, before we wrote those values in XML-schema compatible form - if ( !SvXMLUnitConverter::convertNumber( nVCLDate, i_attributeValue ) ) + if (!::sax::Converter::convertNumber(nVCLDate, i_attributeValue)) { OSL_ENSURE( false, "VCLDateHandler::getPropertyValues: unknown date format (no XML-schema date, no legacy integer)!" ); return false; diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index b5b729986e82..837c533cc2e7 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -30,8 +30,12 @@ #include "vcl_time_handler.hxx" #include "xmloff/xmluconv.hxx" +#include <rtl/ustrbuf.hxx> + #include <com/sun/star/util/DateTime.hpp> +#include <sax/tools/converter.hxx> + #include <tools/diagnose_ex.h> #include <tools/time.hxx> @@ -91,7 +95,7 @@ namespace xmloff else { // compatibility format, before we wrote those values in XML-schema compatible form - if ( !SvXMLUnitConverter::convertNumber( nVCLTime, i_attributeValue ) ) + if (!::sax::Converter::convertNumber(nVCLTime, i_attributeValue)) { OSL_ENSURE( false, "VCLTimeHandler::getPropertyValues: unknown time format (no XML-schema time, no legacy integer)!" ); return false; |