diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx index 388dfefb4c1d..6064b2876bbe 100644 --- a/sd/qa/unit/HtmlExportTest.cxx +++ b/sd/qa/unit/HtmlExportTest.cxx @@ -46,7 +46,7 @@ public: assertXPath(htmlDoc, "/html/head/meta[1]", "content", "text/html; charset=utf-8"); assertXPath(htmlDoc, "/html/head/meta[2]", "name", "generator"); assertXPath(htmlDoc, "/html/head/meta[3]", "name", "created"); - assertXPath(htmlDoc, "/html/head/meta[3]", "content", "20140409;170541987922038"); + assertXPath(htmlDoc, "/html/head/meta[3]", "content", "2014-04-09T17:05:41.987922038"); } CPPUNIT_TEST_SUITE(SdHTMLFilterTest); diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 93567e2176a1..5d4f1ad7bc82 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -44,9 +44,7 @@ #include #include - - - +#include using namespace ::com::sun::star; @@ -164,12 +162,10 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, // created ::util::DateTime uDT = i_xDocProps->getCreationDate(); - Date aD(uDT.Day, uDT.Month, uDT.Year); - Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); - OUString sOut = OUString::number(aD.GetDate()); - sOut += ";"; - sOut += OUString::number(aT.GetTime()); - OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, false, + OUStringBuffer aBuffer; + ::sax::Converter::convertTimeOrDateTime(aBuffer, uDT, 0); + + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, aBuffer.makeStringAndClear(), false, eDestEnc, pNonConvertableChars ); // changedby @@ -180,12 +176,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, // changed uDT = i_xDocProps->getModificationDate(); - Date aD2(uDT.Day, uDT.Month, uDT.Year); - Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); - sOut = OUString::number(aD2.GetDate()); - sOut += ";"; - sOut += OUString::number(aT2.GetTime()); - OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, false, + ::sax::Converter::convertTimeOrDateTime(aBuffer, uDT, 0); + + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, aBuffer.makeStringAndClear(), false, eDestEnc, pNonConvertableChars ); // Subject