diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-05-17 18:35:53 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-05-18 11:01:03 +0200 |
| commit | 4ebc17755855df3a3c1f07a8f5a829d555040d34 (patch) | |
| tree | a715134079c41e8ceb8afffd6f58cae4234f68dd /sw | |
| parent | cda860a8c99abfee6b37dda37351f0b45a7c9616 (diff) | |
html import: Don't create HTML: <meta name="changedby" content="..."> postit.
Change-Id: I8deea3b60d9bb86c20539be2ad23e6b07f44e51b
Reviewed-on: https://gerrit.libreoffice.org/37729
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/htmlimport/data/meta-changedby.html | 21 | ||||
| -rw-r--r-- | sw/qa/extras/htmlimport/htmlimport.cxx | 25 |
2 files changed, 46 insertions, 0 deletions
diff --git a/sw/qa/extras/htmlimport/data/meta-changedby.html b/sw/qa/extras/htmlimport/data/meta-changedby.html new file mode 100644 index 000000000000..b228b31073f7 --- /dev/null +++ b/sw/qa/extras/htmlimport/data/meta-changedby.html @@ -0,0 +1,21 @@ +<!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> diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx index 1e73ac89fc2b..ebc665fcdd55 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -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); } +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(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |