sw/qa/extras/odfimport/data/tdf109228.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 6 ++++++
xmloff/source/text/XMLTextFrameContext.cxx | 1 +
3 files changed, 7 insertions(+)
New commits:
commit 615c2a2c54d3e7aefb4986ae7d8de81a42022988
Author: Tamás Zolnai <tamas.zol...@collabora.com>
Date: Thu Jul 20 12:15:13 2017 +0200
tdf#109228: FILESAVE: ODT: Anchor changed to 'to character' after RT
Ignore frames without names, becuase the code does not handle
them well. It does not affect those use case for which the
deduplication code was added.
Change-Id: I08ad062b8b11cc06323467329d8c4e97bc4932dd
Reviewed-on: https://gerrit.libreoffice.org/40222
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/sw/qa/extras/odfimport/data/tdf109228.odt
b/sw/qa/extras/odfimport/data/tdf109228.odt
new file mode 100755
index 000000000000..0f3368e1b201
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf109228.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 481a388ea9a7..10ea634df9d2 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -838,5 +838,11 @@ DECLARE_ODFIMPORT_TEST(testTdf109080_style_ns,
"tdf109080_style_ns.odt")
parseDump("/root/page[2]/footer/txt/text()"));
}
+DECLARE_ODFIMPORT_TEST(testTdf109228, "tdf109228.odt")
+{
+ // Embedded object with no frame name was imported incorrectly, it was
achored 'to character' instead of 'as character'
+ CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER,
getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 838e80e1864d..2c896bd12a87 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -526,6 +526,7 @@ void XMLTextFrameContext_Impl::Create()
// Skip duplicated frames
if(!mbMultipleContent && // It's allowed to have multiple image for the
same frame
+ !sName.isEmpty() &&
xTextImportHelper->IsDuplicateFrame(sName, nX, nY, nWidth, nHeight))
{
bCreateFailed = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
