diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-18 19:54:32 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-18 20:19:17 +0100 |
| commit | 2a35f5c7945d00b6f6e21fc7cf5b05b184eba88f (patch) | |
| tree | a14ab756e89350c30a317d03d60ba001004e1730 /sw | |
| parent | ff02109b65052a1d17d18f1f66a43480c8792691 (diff) | |
DOCX OLE import: inherit anchor type from replacement graphic
Change-Id: Ic8b6f423acae5cc7e3799cf20e672b56a9cc8c0c
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_ooxmlimport.mk | 1 | ||||
| -rwxr-xr-x | sw/qa/extras/ooxmlimport/data/ole-anchor.docx | bin | 0 -> 12393 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 |
3 files changed, 7 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index d72f93e930e5..1171001294a3 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -51,6 +51,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ basic/util/sb \ chart2/source/controller/chartcontroller \ chart2/source/chartcore \ + canvas/source/factory/canvasfactory \ comphelper/util/comphelp \ configmgr/source/configmgr \ drawinglayer/drawinglayer \ diff --git a/sw/qa/extras/ooxmlimport/data/ole-anchor.docx b/sw/qa/extras/ooxmlimport/data/ole-anchor.docx Binary files differnew file mode 100755 index 000000000000..11df2393bb9e --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/ole-anchor.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index f264f0c92dcf..3c7c473b4dc2 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1783,6 +1783,12 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeRelsize, "groupshape-relsize.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(9142730)), getShape(1)->getSize().Height); } +DECLARE_OOXMLIMPORT_TEST(testOleAnchor, "ole-anchor.docx") +{ + // This was AS_CHARACTER, even if the VML style explicitly contains "position:absolute". + CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType")); +} + DECLARE_OOXMLIMPORT_TEST(testDMLGroupShapeCapitalization, "dml-groupshape-capitalization.docx") { // Capitalization inside a group shape was not imported |