summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2020-10-14 14:49:55 +0300
committerJustin Luth <justin_luth@sil.org>2020-10-14 20:20:39 +0200
commit1df6cc318b2559408cf08d7bd43c0298048f9ff7 (patch)
tree73dd2b9f22f6b150811df3e65089be7c3e72aef6 /sw
parent8ed2f358cc2a668600e602cb0515ff6af16c2824 (diff)
related tdf#108944 writerfilter: fix another missing ftn separator
A comment can also cause a missing footnote separator. Found by doing a code read. Change-Id: I42296f2e9406ad144c6e45873fac0f2cb8d11839 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104282 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf108944_footnoteSeparator2.odtbin0 -> 10646 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport3.cxx7
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf108944_footnoteSeparator2.odt b/sw/qa/extras/ooxmlexport/data/tdf108944_footnoteSeparator2.odt
new file mode 100644
index 000000000000..17e0c6029f5a
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf108944_footnoteSeparator2.odt
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index ec359b119b58..c56c0739d30b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -95,6 +95,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92470_footnoteRestart, "tdf92470_footnoteRestart
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(25), getProperty<sal_Int32>(xPageStyle, "FootnoteLineRelativeWidth"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf108944_footnoteSeparator2, "tdf108944_footnoteSeparator2.odt")
+{
+ uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+ //This was zero. The comment was causing the bHasFtnSep flag to be reset to false, so the separator was missing.
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(25), getProperty<sal_Int32>(xPageStyle, "FootnoteLineRelativeWidth"));
+}
+
DECLARE_OOXMLEXPORT_TEST(testCharacterBorder, "charborder.odt")
{
CPPUNIT_ASSERT_EQUAL(1, getPages());