diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-30 17:26:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-02 16:45:54 +0200 |
| commit | d2a2568747964858cf0fe867a3fe1bae14ad37ff (patch) | |
| tree | 077715434a3d7488d103ea297b8dbb6a22c31109 /sw | |
| parent | 5754e4bae126b88ac227d5f3c11707666df05f55 (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
(cherry picked from commit 3ec2d26dc2017ac4a27483febfc63328632f352d)
Conflicts:
sw/CppunitTest_sw_ooxmlimport.mk
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_subsequent_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_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 48e08c58b4b2..64879c077ef9 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -70,6 +70,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\ embeddedobj/util/embobj \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ + forms/util/frm \ framework/util/fwk \ i18npool/util/i18npool \ linguistic/source/lng \ @@ -83,6 +84,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_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 29f38899fa32..b735879b3b09 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -899,7 +899,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); |