Skip to content

C
core
Kaydet (Commit) 4ebc1775 authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

html import: Don't create HTML: <meta name="changedby" content="..."> postit. 

Change-Id: I8deea3b60d9bb86c20539be2ad23e6b07f44e51b
Reviewed-on: https://gerrit.libreoffice.org/37729Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst cda860a8
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 0 deletions
svtools/source/svhtml/parhtml.cxx
Dosyayı görüntüle @ 4ebc1775
...@@ -1957,6 +1957,7 @@ bool HTMLParser::ParseMetaOptionsImpl( ...@@ -1957,6 +1957,7 @@ bool HTMLParser::ParseMetaOptionsImpl(
case HtmlMeta::ChangedBy: case HtmlMeta::ChangedBy:
if (i_xDocProps.is()) { if (i_xDocProps.is()) {
i_xDocProps->setModifiedBy( aContent ); i_xDocProps->setModifiedBy( aContent );
bChanged = true;
} }
break; break;
......
sw/qa/extras/htmlimport/data/meta-changedby.html 0 → 100644
Dosyayı görüntüle @ 4ebc1775
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<title></title>
<meta name="generator" content="LibreOfficeDev 5.4.0.0.alpha1 (Linux)"/>
<meta name="created" content="2017-05-07T12:34:03.921000000"/>
<meta name="changed" content="20170508;124700386000000"/>
<meta name="changedby" content="Blah">
<style type="text/css">
@page { size: 21cm 29.7cm; margin: 2cm }
p { margin-bottom: 0.25cm; line-height: 120% }
td p { margin-bottom: 0cm }
</style>
</head>
<body>
<p>
Test
</p>
</body>
</html>
sw/qa/extras/htmlimport/htmlimport.cxx
Dosyayı görüntüle @ 4ebc1775
...@@ -196,6 +196,31 @@ DECLARE_HTMLIMPORT_TEST(testMetaIsoDates, "meta-ISO8601-dates.html") ...@@ -196,6 +196,31 @@ DECLARE_HTMLIMPORT_TEST(testMetaIsoDates, "meta-ISO8601-dates.html")
CPPUNIT_ASSERT_EQUAL(DateTime(Date(8, 5, 2017), tools::Time(12, 47, 0, 386000000)), aModified); CPPUNIT_ASSERT_EQUAL(DateTime(Date(8, 5, 2017), tools::Time(12, 47, 0, 386000000)), aModified);
} }
DECLARE_HTMLIMPORT_TEST(testChangedby, "meta-changedby.html")
{
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwDocShell* pDocShell(pTextDoc->GetDocShell());
uno::Reference<document::XDocumentProperties> xDocProps;
CPPUNIT_ASSERT(pDocShell);
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(pDocShell->GetModel(), uno::UNO_QUERY);
xDocProps.set(xDPS->getDocumentProperties());
// get the document properties
CPPUNIT_ASSERT(xDocProps.is());
// the doc's property ModifiedBy is set correctly, ...
CPPUNIT_ASSERT_EQUAL(OUString("Blah"), xDocProps->getModifiedBy());
uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess> xFieldsAccess(xTextFieldsSupplier->getTextFields());
uno::Reference<container::XEnumeration> xFields(xFieldsAccess->createEnumeration());
// ...but there is no comment 'HTML: <meta name="changedby" content="Blah">'
CPPUNIT_ASSERT(!xFields->hasMoreElements());
}
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment