writerfilter: fix anchoring of anchored wps (drawingML) shapes

Previous code assumed that either we're dealing with VML shapes (where
the shape knows its position, anchoring, etc.) or with Wrtier pictures.
drawingML shapes are a third category: they don't know their anchoring
(and similar properties), still they are not Writer pictures.

For now just fix the anchoring, other properties should be handled in a
later follow-up commit.

Change-Id: I2fede3b11cfbd423cd50cfc0c032d424c81c6c4a

1 files changed, 10 insertions, 0 deletions

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index ba8aab269f38..ff3409c80145 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -986,6 +986,16 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 
                         m_pImpl->bIsGraphic = true;
                     }
+
+                    if (bUseShape && m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
+                    {
+                        // If we are here, this is a drawingML shape. For those, only dmapper (and not oox) knows the anchoring infos (just like for Writer pictures).
+                        // But they aren't Writer pictures, either (which are already handled above).
+                        uno::Reference< beans::XPropertySet > xShapeProps(m_xShape, uno::UNO_QUERY_THROW);
+                        xShapeProps->setPropertyValue("AnchorType", uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+
+                        // TODO handle more properties here like HoriOrientPosition, etc.
+                    }
                 }
             }
         break;