diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-26 21:52:05 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-12 10:54:45 +0200 |
| commit | 1c7ff7be4595d488325f3228e425780901971956 (patch) | |
| tree | 671fb914251b68cbfbb02ca880fe8f8eaf93daf2 /writerfilter | |
| parent | e8e170fdab0a4c6aa377228d0e3af2332dba29f9 (diff) | |
tdf#116410 DOCX import: restrict increased object spacing to multiple shapes
This anchored object handling is just there to be bug-compatible with
Word, it's not needed for the case when there is a single shape in the
paragraph.
(cherry picked from commit 2c4d84e93901571ead79c85aa3894ef4e10bf5af)
Also:
Related: tdf#115719 DOCX import: fix ignore of increased anchored obj spacing
If there is only a single anchored object, then ignore only the current
paragraph, not all paragraphs of the section.
(cherry picked from commit 599ff05300599d4e4ce818092f18e76e738b921e)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
Change-Id: I5e3dc4ba9a4a6f459ec6217e8974ebc2d7303bcc
Reviewed-on: https://gerrit.libreoffice.org/52022
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit da01b17379fcb3cb89eddf718c922d1676aa482a)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 708b80a55c4f..af4133a7625e 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1148,6 +1148,10 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& std::vector<AnchoredObjectInfo>& rAnchoredObjectAnchors = rDM_Impl.m_aAnchoredObjectAnchors; for (auto& rAnchor : rAnchoredObjectAnchors) { + // Ignore this paragraph when there is a single shape only. + if (rAnchor.m_aAnchoredObjects.size() < 2) + continue; + // Analyze the anchored objects of this paragraph, now that we know the // page width. sal_Int32 nShapesWidth = 0; |