diff options
| author | Patrick Jaap <patrick.jaap@tu-dresden.de> | 2018-04-10 15:29:56 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-01 20:48:19 +0200 |
| commit | d63582783439cfd1df5c355805566197cb7d7292 (patch) | |
| tree | b10c4b7549e1f8f243e9998d0401870681653ce5 | |
| parent | c632ba5c76708aa454d1199d09f58bbbb9a9150f (diff) | |
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@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48)
Reviewed-on: https://gerrit.libreoffice.org/55120
Reviewed-by: Patrick Jaap <patrick.jaap@tu-dresden.de>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 39f2125c4952063f4bdc36d9abba18daaee72d68)
| -rw-r--r-- | sw/qa/extras/odfimport/data/tdf116195.odt | bin | 0 -> 123370 bytes | |||
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/sw/qa/extras/odfimport/data/tdf116195.odt b/sw/qa/extras/odfimport/data/tdf116195.odt Binary files differnew file mode 100644 index 000000000000..21a601f69d66 --- /dev/null +++ b/sw/qa/extras/odfimport/data/tdf116195.odt 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 ff9aaf182fe2..76e33d572772 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1425,7 +1425,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(); |