[Libreoffice-commits] core.git: sw/qa sw/source

[Patrick Jaap]

 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 fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48
Author: Patrick Jaap <patrick.jaap at 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 <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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 1d4737318517..3b879d9f82ff 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 8def02edd002..64c71c6fb46b 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1620,7 +1620,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();