commit 4aa8a6ab08b755e3d82860e8dbc294f854336477
author David Vogt <david.vogt@adfinis-sygroup.ch> Wed Mar 13 13:11:39 2019 +0100
committer Miklos Vajna <vmiklos@collabora.com> Thu Mar 14 18:13:24 2019 +0100
tree 751675d33b1fc9e4e4bab207018cdec823c6f75a
parent 044fa501e95dcac8120767996dfb7ba8f25a703f

tdf#113289: Default value for footnote separator

In old versions of LO/AOO, separator style was defaulting to a solid
line. When you have an old document that doesn't have the style set
explicitly, the line would disappear.

Since newer versions explicitly set the style, we should set the default
to what it was before.

Change-Id: I8dacea75fcf2f95f9bc145442b22ab0d173e7c5a
Reviewed-on: https://gerrit.libreoffice.org/69167
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

sw/qa/extras/odfimport/data/tdf113289.odt

diff --git a/sw/qa/extras/odfimport/data/tdf113289.odt b/sw/qa/extras/odfimport/data/tdf113289.odt
new file mode 100644
index 0000000..01aa570
--- /dev/null
+++ b/sw/qa/extras/odfimport/data/tdf113289.odt
Binary files differ

sw/qa/extras/odfimport/odfimport.cxx

diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index a911635..0eaae31 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -14,6 +14,7 @@
#include <com/sun/star/drawing/BitmapMode.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/style/PageStyleLayout.hpp>
#include <com/sun/star/style/FootnoteLineStyle.hpp>
#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/table/BorderLine.hpp>
@@ -927,5 +928,13 @@
        pDoc->getIDocumentSettingAccess().get(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA));
}

DECLARE_ODFIMPORT_TEST(testTdf113289, "tdf113289.odt")
{
    uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int8>(style::FootnoteLineStyle::SOLID),
                         getProperty<sal_Int8>(aPageStyle, "FootnoteLineStyle"));
}


CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

xmloff/source/style/XMLFootnoteSeparatorImport.cxx

diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index a49852a..5e928fe 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -81,7 +81,10 @@
    text::HorizontalAdjust eLineAdjust = text::HorizontalAdjust_LEFT;
    sal_Int32 nLineTextDistance = 0;
    sal_Int32 nLineDistance = 0;
    sal_Int8 nLineStyle = 0;

    // Default separator line style should be SOLID (used to be default before
    // the choice selector was available)
    sal_Int8 nLineStyle = 1;

    // iterate over xattribute list and fill values
    sal_Int16 nLength = xAttrList->getLength();