diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2021-05-31 21:12:12 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2021-06-01 08:46:10 +0200 |
commit | 6fc8a6b0b52509d735971f079d7b1660559d475d (patch) | |
tree | 2faa1b051c020340c375f9337e86f0e230dfbf09 /writerfilter/qa | |
parent | f535acdab1ae90ea326393c0ff419ee6ece6f627 (diff) |
tdf#142325 RTF import: tolerate invalid hex markup like "\'3?"
The RTF spec says \'hh is the expected form, where both "h" are 0-9, a-f
or A-F. But Word accepts the bugdoc, so don't reject this input, handle
\'<number><junk> as \'0<number>.
At least the current case ignores the actual value, as it's a single
character to provide a non-unicode value after \uN for old readers that
don't support Unicode.
Change-Id: Ib61247ab08278ca5012cc887cee26c7571c29fc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116499
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/qa')
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/invalid-hex.rtf | 3 | ||||
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx | 63 |
2 files changed, 66 insertions, 0 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/invalid-hex.rtf b/writerfilter/qa/cppunittests/rtftok/data/invalid-hex.rtf new file mode 100644 index 000000000000..8f9224c0e905 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/invalid-hex.rtf @@ -0,0 +1,3 @@ +{\rtf1 +x\u345\'3?x +\par} diff --git a/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx b/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx new file mode 100644 index 000000000000..530e9bb7245a --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx @@ -0,0 +1,63 @@ +/* -*- 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 <test/bootstrapfixture.hxx> +#include <unotest/macros_test.hxx> + +#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/text/XTextDocument.hpp> + +using namespace ::com::sun::star; + +namespace +{ +/// Tests for writerfilter/source/rtftok/rtftokenizer.cxx. +class Test : public test::BootstrapFixture, public unotest::MacrosTest +{ +private: + uno::Reference<lang::XComponent> mxComponent; + +public: + void setUp() override; + void tearDown() override; + uno::Reference<lang::XComponent>& getComponent() { return mxComponent; } +}; + +void Test::setUp() +{ + test::BootstrapFixture::setUp(); + + mxDesktop.set(frame::Desktop::create(mxComponentContext)); +} + +void Test::tearDown() +{ + if (mxComponent.is()) + mxComponent->dispose(); + + test::BootstrapFixture::tearDown(); +} + +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/"; + +CPPUNIT_TEST_FIXTURE(Test, testInvalidHex) +{ + // Given a document with a markup like "\'3?": + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "invalid-hex.rtf"; + + // When load that document: + getComponent() = loadFromDesktop(aURL); + + // Then make sure the result matches Word, rather than just refusing to import the document: + uno::Reference<text::XTextDocument> xTextDocument(getComponent(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8("xřx"), xTextDocument->getText()->getString()); +} +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |