diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-28 12:17:51 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-28 13:51:35 +0100 |
| commit | 440fbd609054d78e37f4953dfdde8c79c10b4981 (patch) | |
| tree | 587ce0c0df692ac025d0167bac0ea0bfb25e25dd /sw/qa/extras | |
| parent | 757996c46e09e6a14e15ee8ce2a993c0ec3b79f8 (diff) | |
DOCX import: handle font theme references in group shape text
Change-Id: I1d5b86ad17b2c4a0945f483c94ac6abf410cf1d6
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/groupshape-theme-font.docx | bin | 0 -> 13871 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/groupshape-theme-font.docx b/sw/qa/extras/ooxmlexport/data/groupshape-theme-font.docx Binary files differnew file mode 100644 index 000000000000..75011d7e5c3e --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/groupshape-theme-font.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index 038b40415cb8..8dc0ef5d85fd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -879,6 +879,16 @@ DECLARE_OOXMLEXPORT_TEST(testMSwordHang,"test_msword_hang.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:txbx/w:txbxContent/w:p/w:r[2]/w:drawing/wp:inline", "distT", "0"); } +DECLARE_OOXMLEXPORT_TEST(testGroupshapeThemeFont, "groupshape-theme-font.docx") +{ + // Font was specified using a theme reference, which wasn't handled. + uno::Reference<container::XIndexAccess> xGroup(getShape(1), uno::UNO_QUERY); + uno::Reference<text::XText> xText = uno::Reference<text::XTextRange>(xGroup->getByIndex(0), uno::UNO_QUERY)->getText(); + uno::Reference<text::XTextRange> xRun = getRun(getParagraphOfText(1, xText),1); + // This was Calibri. + CPPUNIT_ASSERT_EQUAL(OUString("Cambria"), getProperty<OUString>(xRun, "CharFontName")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |