diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-07-20 12:15:13 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-07-20 15:57:26 +0200 |
| commit | 615c2a2c54d3e7aefb4986ae7d8de81a42022988 (patch) | |
| tree | b81d7540573d2bc2239dfe83c37f5d8ab8a819c2 | |
| parent | b64e564492220b34c14f069e8e1f42675bd9abe6 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
| -rwxr-xr-x | sw/qa/extras/odfimport/data/tdf109228.odt | bin | 0 -> 13753 bytes | |||
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/odfimport/data/tdf109228.odt b/sw/qa/extras/odfimport/data/tdf109228.odt Binary files differnew file mode 100755 index 000000000000..0f3368e1b201 --- /dev/null +++ b/sw/qa/extras/odfimport/data/tdf109228.odt 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; |