diff options
author | Jan Holesovsky <kendy@collabora.com> | 2017-05-05 15:02:20 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2017-05-10 17:19:32 +0200 |
commit | 0425ccba5b2f8819d6fade05d96a72d64db1ce0c (patch) | |
tree | 913c002c45518c4a5c248293a00d1a46f002f5bf /sw/qa | |
parent | 58891d589bd8da700f135b098dd50833277c65dc (diff) |
sw txt export: Greatly improve the export of bullets & numbering.
Includes unit testing infrastructure for .txt export too + the actual unit
test.
Change-Id: I19a32955bbc9b97449b4240917fe2505bc3dd54c
Reviewed-on: https://gerrit.libreoffice.org/37295
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sw/qa')
-rw-r--r-- | sw/qa/extras/txtexport/data/bullets.odt | bin | 0 -> 10379 bytes | |||
-rw-r--r-- | sw/qa/extras/txtexport/txtexport.cxx | 76 |
2 files changed, 76 insertions, 0 deletions
diff --git a/sw/qa/extras/txtexport/data/bullets.odt b/sw/qa/extras/txtexport/data/bullets.odt Binary files differnew file mode 100644 index 000000000000..43e0c2123ffc --- /dev/null +++ b/sw/qa/extras/txtexport/data/bullets.odt diff --git a/sw/qa/extras/txtexport/txtexport.cxx b/sw/qa/extras/txtexport/txtexport.cxx new file mode 100644 index 000000000000..b9cd02bdf0b5 --- /dev/null +++ b/sw/qa/extras/txtexport/txtexport.cxx @@ -0,0 +1,76 @@ +/* -*- 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 <swmodeltestbase.hxx> + +#include <swmodule.hxx> +#include <swdll.hxx> +#include <usrpref.hxx> + +class TxtExportTest : public SwModelTestBase +{ +public: + TxtExportTest() : + SwModelTestBase("/sw/qa/extras/txtexport/data/", "Text") + {} + +protected: + OString readExportedFile() + { + SvMemoryStream aMemoryStream; + SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ); + aStream.ReadStream(aMemoryStream); + const char* pData = static_cast<const char*>(aMemoryStream.GetData()); + + int offset = 0; + if (aMemoryStream.GetSize() > 2 && pData[0] == '\xEF' && pData[1] == '\xBB' && pData[2] == '\xBF') + offset = 3; + + return OString(pData + offset, aMemoryStream.GetSize() - offset); + } +}; + +#define DECLARE_TXTEXPORT_TEST(TestName, filename) DECLARE_SW_EXPORT_TEST(TestName, filename, nullptr, TxtExportTest) + +DECLARE_TXTEXPORT_TEST(testBullets, "bullets.odt") +{ + OString aData = readExportedFile(); + + OUString aString = OStringToOUString( + "1 Heading 1" SAL_NEWLINE_STRING + "1.A Heading 2" SAL_NEWLINE_STRING + "Paragraph" SAL_NEWLINE_STRING + "" SAL_NEWLINE_STRING + " \xe2\x80\xa2 First bullet" SAL_NEWLINE_STRING + " \xe2\x80\xa2 Second bullet" SAL_NEWLINE_STRING + " \xe2\x97\xa6 Sub-second bullet" SAL_NEWLINE_STRING + " Third bullet, but deleted" SAL_NEWLINE_STRING + " \xe2\x80\xa2 Fourth bullet" SAL_NEWLINE_STRING + "" SAL_NEWLINE_STRING + "Numbering" SAL_NEWLINE_STRING + "" SAL_NEWLINE_STRING + " 1. First" SAL_NEWLINE_STRING + " 2. Second" SAL_NEWLINE_STRING + " 1. Second-first" SAL_NEWLINE_STRING + " Third, but deleted" SAL_NEWLINE_STRING + " 3. Actual third" SAL_NEWLINE_STRING + "" SAL_NEWLINE_STRING + "Paragraph after numbering" SAL_NEWLINE_STRING + "Next paragraph" SAL_NEWLINE_STRING + "Final paragraph" SAL_NEWLINE_STRING, RTL_TEXTENCODING_UTF8); + + // To get the stuff back in the system's encoding + OString aExpected(OUStringToOString(aString, osl_getThreadTextEncoding())); + + CPPUNIT_ASSERT_EQUAL(aExpected, aData); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |