diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-11-15 09:19:45 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-02-08 11:56:05 +0100 |
commit | 1f51d10e3d8b1c7687c784ab42f90be07d88a0e3 (patch) | |
tree | e15eb12a6f8800ba16c0116f35406e494ea63535 /writerfilter | |
parent | d72f5c87900f81396cd4b33f19de187f12dddc59 (diff) |
tdf#82824 DOCX import: fix at-char embedded object handling
The anchor type of embedded object was simply not handled, we always
assumed that it's as-char.
When it's at-char set the anchor type accordingly, and also set the
usual 6 properties determining the position of the anchored object.
(cherry picked from commit 10efab2b9a3cf7fc49655c90ba29db4512680c38)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed-on: https://gerrit.libreoffice.org/30965
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit d36587570890d3366222fc9cca8482275db85b3b)
Change-Id: I3f8bede33c6f1a0bdc4f4d4ea59c4fc805802291
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index e1d4ebb9b02c..5117116615b0 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4766,7 +4766,21 @@ void DomainMapper_Impl::ImportGraphic(writerfilter::Reference< Properties >::Po // Update the shape properties if it is embedded object. if(m_xEmbedded.is()){ - UpdateEmbeddedShapeProps(m_pGraphicImport->GetXShapeObject()); + uno::Reference<drawing::XShape> xShape = m_pGraphicImport->GetXShapeObject(); + UpdateEmbeddedShapeProps(xShape); + if (eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR) + { + uno::Reference<beans::XPropertySet> xEmbeddedProps(m_xEmbedded, uno::UNO_QUERY); + text::TextContentAnchorType eAnchorType = text::TextContentAnchorType_AT_CHARACTER; + xEmbeddedProps->setPropertyValue("AnchorType", uno::makeAny(eAnchorType)); + uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); + xEmbeddedProps->setPropertyValue("HoriOrient", xShapeProps->getPropertyValue("HoriOrient")); + xEmbeddedProps->setPropertyValue("HoriOrientPosition", xShapeProps->getPropertyValue("HoriOrientPosition")); + xEmbeddedProps->setPropertyValue("HoriOrientRelation", xShapeProps->getPropertyValue("HoriOrientRelation")); + xEmbeddedProps->setPropertyValue("VertOrient", xShapeProps->getPropertyValue("VertOrient")); + xEmbeddedProps->setPropertyValue("VertOrientPosition", xShapeProps->getPropertyValue("VertOrientPosition")); + xEmbeddedProps->setPropertyValue("VertOrientRelation", xShapeProps->getPropertyValue("VertOrientRelation")); + } } //insert it into the document at the current cursor position OSL_ENSURE( xTextContent.is(), "DomainMapper_Impl::ImportGraphic"); |