From 2c4d84e93901571ead79c85aa3894ef4e10bf5af Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 26 Mar 2018 21:52:05 +0200 Subject: 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. Change-Id: I5e3dc4ba9a4a6f459ec6217e8974ebc2d7303bcc Reviewed-on: https://gerrit.libreoffice.org/51922 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- writerfilter/source/dmapper/PropertyMap.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 76851c428438..bf3522008f63 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1146,6 +1146,10 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& std::vector& rAnchoredObjectAnchors = rDM_Impl.m_aAnchoredObjectAnchors; for (auto& rAnchor : rAnchoredObjectAnchors) { + // Ignore the case when there is a single shape only. + if (rAnchor.m_aAnchoredObjects.size() < 2) + return; + // Analyze the anchored objects of this paragraph, now that we know the // page width. sal_Int32 nShapesWidth = 0; -- cgit