DOCX drawingML shape import: handle position

Change-Id: I9a0cb95d875328dab21950ead06d56c4dac8305d

sw/qa/extras/ooxmlimport/ooxmlimport.cxx

@@ -1508,8 +1508,12 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69548, "fdo69548.docx")
 DECLARE_OOXMLIMPORT_TEST(testWpsOnly, "wps-only.docx")
 {
     // Document has wp:anchor, not wp:inline, so handle it accordingly.
-    text::TextContentAnchorType eValue = getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType");
+    uno::Reference<drawing::XShape> xShape = getShape(1);
+    text::TextContentAnchorType eValue = getProperty<text::TextContentAnchorType>(xShape, "AnchorType");
     CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, eValue);
+
+    // Check position, it was 0. This is a shape, so use getPosition(), not a property.
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(671830)), xShape->getPosition().X);
 }
 
 DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx")

writerfilter/source/dmapper/GraphicImport.cxx

@@ -999,7 +999,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
                         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.
+                        m_xShape->setPosition(awt::Point(m_pImpl->nLeftPosition, m_pImpl->nTopPosition));
                     }
                 }
             }