diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-07-20 16:39:07 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-08-04 12:01:27 +0200 |
| commit | 46b5c00ae76385722416819efc15c4116a2872f8 (patch) | |
| tree | 0fe4f401108198b4b75664e67194edcfd73e9c7b /xmloff | |
| parent | 0d3a367b5623639e7fdc9ce1ccc277e2597694a0 (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.
Reviewed-on: https://gerrit.libreoffice.org/40222
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 615c2a2c54d3e7aefb4986ae7d8de81a42022988)
Change-Id: I08ad062b8b11cc06323467329d8c4e97bc4932dd
Reviewed-on: https://gerrit.libreoffice.org/40236
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit de5afba4c116792d795339f7e773e302259d8bf0)
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index a86d6d3d214c..a17db0cae566 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -569,6 +569,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) // 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; |