diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-30 17:26:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-02 12:14:47 +0200 |
| commit | 3ec2d26dc2017ac4a27483febfc63328632f352d (patch) | |
| tree | 653c65037c067e4a356c0b98333d76d6877334b6 /sw | |
| parent | 3af051aa4a554c33e146a2329d8d504cf8908022 (diff) | |
bnc#779630 initial DOCX import of w:sdt's w:date
Also factor out the w:sdt-related methods to a helper class to avoid
DomainMapper_Impl become a God object.
Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_ooxmlimport.mk | 2 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index de4e20756523..b558073b9691 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ embeddedobj/util/embobj \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ + forms/util/frm \ framework/util/fwk \ i18npool/util/i18npool \ linguistic/source/lng \ @@ -66,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ sw/util/msword \ sfx2/util/sfx \ svl/source/fsstor/fsstorage \ + svl/util/svl \ svtools/util/svt \ toolkit/util/tk \ ucb/source/core/ucb1 \ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 423900f70d33..ccde3ff696e0 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -901,7 +901,10 @@ void Test::testN779627() */ uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); - uno::Reference<beans::XPropertySet> xShapeProperties( xDraws->getByIndex(2), uno::UNO_QUERY ); + uno::Reference<beans::XPropertySet> xShapeProperties( xDraws->getByIndex(3), uno::UNO_QUERY ); + uno::Reference<drawing::XShapeDescriptor> xShapeDescriptor(xShapeProperties, uno::UNO_QUERY); + // If this goes wrong, probably the index of the shape is changed and the test should be adjusted. + CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.RectangleShape"), xShapeDescriptor->getShapeType()); sal_Int16 nValue; xShapeProperties->getPropertyValue("HoriOrient") >>= nValue; CPPUNIT_ASSERT_EQUAL_MESSAGE("Not centered horizontally", text::HoriOrientation::CENTER, nValue); |