sw/qa/extras/odfimport/data/tdf116195.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 8 ++++++++
sw/source/filter/xml/xmlimp.cxx | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 39f2125c4952063f4bdc36d9abba18daaee72d68
Author: Patrick Jaap <patrick.j...@tu-dresden.de>
Date: Tue Apr 10 15:29:56 2018 +0200
tdf#116195 swap a compatibility value
There was a minor bug in the compat flag, leading
to a regression from commit 8d62b79f168180c6992eb483ec864d473050635f
Change-Id: I1e468e665a583ef15b6e474c3adb32f1dcf98f46
Reviewed-on: https://gerrit.libreoffice.org/52674
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
(cherry picked from commit fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48)
Reviewed-on: https://gerrit.libreoffice.org/55120
Reviewed-by: Patrick Jaap <patrick.j...@tu-dresden.de>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sw/qa/extras/odfimport/data/tdf116195.odt
b/sw/qa/extras/odfimport/data/tdf116195.odt
new file mode 100644
index 000000000000..21a601f69d66
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf116195.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 175fa31c888e..8c57b5b2ffc7 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -902,5 +902,13 @@ DECLARE_ODFIMPORT_TEST(testTdf108482, "tdf108482.odt")
);
}
+DECLARE_ODFIMPORT_TEST(testTdf116195, "tdf116195.odt")
+{
+ // The image was set to zero height due to a regression
+ CPPUNIT_ASSERT_EQUAL(
+ sal_Int32(12960),
parseDump("/root/page/anchored/fly/notxt/infos/bounds", "height").toInt32()
+ );
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index dfbc7f832105..18ca69cb9589 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1399,7 +1399,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence
< PropertyValue > & aC
if (!bSubtractFlysAnchoredAtFlys)
xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true));
- if ( !bDisableOffPagePositioning )
+ if ( bDisableOffPagePositioning )
xProps->setPropertyValue("DisableOffPagePositioning", makeAny(true));
SwDoc *pDoc = getDoc();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
