diff options
| author | Luke Deller <luke@deller.id.au> | 2016-04-27 02:09:48 +1000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-27 15:17:22 +0000 |
| commit | 817c3b17fa57a7c4c4f80569bc00a21001fb6807 (patch) | |
| tree | e0f3a1604313624c4688df2626be897f9bbff577 /sw/qa | |
| parent | 99ea437f7570ab59f186583f368398919db67c3a (diff) | |
tdf#99474 close direct char fmt at end of para
When exporting to doc, ensure that the FKP entry for direct character
formatting is closed at the end of a paragraph, so that any direct
character formatting in the next paragraph does not apply to the
end-of-paragraph marker (CR).
Also revert the changes for i#119650 and tdf#87437 which targetted
more specific examples of this problem, as those issues should now be
covered by this fix.
Add a test case for the example from tdf#99474
Change-Id: I2cb482adb39a84f152707dafcb18f289ca0bd550
Reviewed-on: https://gerrit.libreoffice.org/24402
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ww8export/data/tdf99474.odt | bin | 0 -> 9375 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 28 |
2 files changed, 28 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf99474.odt b/sw/qa/extras/ww8export/data/tdf99474.odt Binary files differnew file mode 100644 index 000000000000..7530488bb658 --- /dev/null +++ b/sw/qa/extras/ww8export/data/tdf99474.odt diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 452c8c21854e..0d59e3182240 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -692,6 +692,34 @@ DECLARE_WW8EXPORT_TEST(testTdf94386, "tdf94386.odt") CPPUNIT_ASSERT((fSize.Width != lSize.Width) && (fSize.Height != lSize.Height)); } +DECLARE_WW8EXPORT_TEST(testTdf99474, "tdf99474.odt") +{ + // The bullet colour of paragraph #3 should be COL_AUTO + auto xPara = getParagraph(3); + uno::Reference<container::XIndexReplace> xNumRules( + getProperty< uno::Reference<container::XIndexReplace> >( + xPara, "NumberingRules"), + uno::UNO_QUERY); + int numLevel = getProperty<sal_Int32>(xPara, "NumberingLevel"); + uno::Sequence< beans::PropertyValue > aPropertyValues; + xNumRules->getByIndex(numLevel) >>= aPropertyValues; + OUString charStyleName; + for(int j = 0 ; j< aPropertyValues.getLength() ; ++j) + { + auto aProp = aPropertyValues[j]; + if (aProp.Name == OUString("CharStyleName")) { + charStyleName = aProp.Value.get<OUString>(); + break; + } + } + CPPUNIT_ASSERT(charStyleName.getLength()); + uno::Reference<beans::XPropertySet> xStyle( + getStyles("CharacterStyles")->getByName(charStyleName), + uno::UNO_QUERY); + ColorData charColor = getProperty<util::Color>(xStyle, "CharColor"); + CPPUNIT_ASSERT_EQUAL(COL_AUTO, charColor); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |