mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

html export: More standard time specification in <meta/>.

Browse Source 
Change-Id: I1a62d12531029cc36fb8aeabecb9d92a8af837f7
This commit is contained in:
Jan Holesovsky 2014-06-06 21:52:48 +02:00
parent c2034f3993
commit f7d51f43de
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sd/qa/unit/HtmlExportTest.cxx
View File

@ -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);

23
sfx2/source/bastyp/frmhtmlw.cxx
View File

@ -44,9 +44,7 @@
#include <rtl/bootstrap.hxx>
#include <rtl/strbuf.hxx>
#include <sax/tools/converter.hxx>
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