diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-13 14:46:26 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-09 16:55:31 +0100 |
| commit | bf3940fc88e732a498598f0df61eafd63bbd5ce3 (patch) | |
| tree | f40a2728eaf93cd385f53105539ef65dd1292257 | |
| parent | d9fcc98c2d7d072d1a99c7c8b59806715a393a4f (diff) | |
Related: tdf#114428 svtools HTML import: avoid XML declaration in body text
Just ignore it for now.
Change-Id: Idf82af611370d957c6704cce250941a8a0b90637
Reviewed-on: https://gerrit.libreoffice.org/46388
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 3fe64261b5658e28e2c0a1630cf878f066f77f0c)
Reviewed-on: https://gerrit.libreoffice.org/47589
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | svtools/CppunitTest_svtools_html.mk | 1 | ||||
| -rw-r--r-- | svtools/qa/unit/testHtmlReader.cxx | 70 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 3 |
3 files changed, 73 insertions, 1 deletions
diff --git a/svtools/CppunitTest_svtools_html.mk b/svtools/CppunitTest_svtools_html.mk index e3e56e4d9949..6fbca2c06442 100644 --- a/svtools/CppunitTest_svtools_html.mk +++ b/svtools/CppunitTest_svtools_html.mk @@ -14,6 +14,7 @@ $(eval $(call gb_CppunitTest_use_external,svtools_html,boost_headers)) $(eval $(call gb_CppunitTest_use_sdk_api,svtools_html)) $(eval $(call gb_CppunitTest_add_exception_objects,svtools_html, \ + svtools/qa/unit/testHtmlReader \ svtools/qa/unit/testHtmlWriter \ )) diff --git a/svtools/qa/unit/testHtmlReader.cxx b/svtools/qa/unit/testHtmlReader.cxx new file mode 100644 index 000000000000..151976eabc9d --- /dev/null +++ b/svtools/qa/unit/testHtmlReader.cxx @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ + +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <com/sun/star/document/XDocumentProperties.hpp> +#include <svtools/parhtml.hxx> +#include <tools/ref.hxx> +#include <tools/stream.hxx> + +namespace +{ +/// Subclass of HTMLParser that can sense the import result. +class TestHTMLParser : public HTMLParser +{ +public: + TestHTMLParser(SvStream& rStream); + virtual void NextToken(HtmlTokenId nToken) override; + + OUString m_aDocument; +}; + +TestHTMLParser::TestHTMLParser(SvStream& rStream) + : HTMLParser(rStream) +{ +} + +void TestHTMLParser::NextToken(HtmlTokenId nToken) +{ + if (nToken == HtmlTokenId::TEXTTOKEN) + m_aDocument += aToken; +} + +/// Tests HTMLParser. +class Test : public CppUnit::TestFixture +{ +public: + void testTdf114428(); + + CPPUNIT_TEST_SUITE(Test); + CPPUNIT_TEST(testTdf114428); + CPPUNIT_TEST_SUITE_END(); +}; + +void Test::testTdf114428() +{ + SvMemoryStream aStream; + OString aDocument("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<html>hello</html>"); + aStream.WriteBytes(aDocument.getStr(), aDocument.getLength()); + aStream.Seek(0); + + tools::SvRef<TestHTMLParser> xParser = new TestHTMLParser(aStream); + xParser->CallParser(); + + // This was '<?xml version="1.0" encoding="utf-8"?> hello', XML declaration + // was not ignored. + CPPUNIT_ASSERT_EQUAL(OUString("hello"), xParser->m_aDocument.trim()); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(Test); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 1eb82b6bb788..1b08446abf4b 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1022,7 +1022,8 @@ HtmlTokenId HTMLParser::GetNextToken_() bOffState = true; nNextCh = GetNextChar(); } - if( rtl::isAsciiAlpha( nNextCh ) || '!'==nNextCh ) + // Assume '<?' is a start of an XML declaration, ignore it. + if (rtl::isAsciiAlpha(nNextCh) || nNextCh == '!' || nNextCh == '?') { OUStringBuffer sTmpBuffer; do { |