diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-17 13:39:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-17 13:49:04 +0200 |
| commit | dfacd379b0e8a347ae4f69e5a17208942711e9ec (patch) | |
| tree | c65ba096616cc7fddf8d7f5ef02f83a61e5616cd | |
| parent | d7551e32609d0e0de8ac419576ca42d65c5015be (diff) | |
CppunitTest_sw_ooxmlsdrexport: port testLineStyle_DashType_VML to textboxes
Change-Id: Idb4807a58b6008afeb3e26d03b699671c0b88f7c
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index 1e23de81bd5e..af4fdca38806 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -919,7 +919,16 @@ DECLARE_OOXMLEXPORT_TEST(testLineStyle_DashType_VML, "LineStyle_DashType_VML.doc xmlDocPtr pXmlDoc = parseExport("word/document.xml"); if (!pXmlDoc) return; - assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:stroke", "dashstyle", "dash"); + uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY); + if (xIndexAccess->getCount()) + { + // TODO TextBox: remove this when TextBox is enabled by default + // This second run is a bug, should be the first ideally + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:stroke", "dashstyle", "dash"); + } + else + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:stroke", "dashstyle", "dash"); } DECLARE_OOXMLEXPORT_TEST(testFdo74110,"fdo74110.docx") |