diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-04 16:38:40 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-04 18:00:53 +0200 |
| commit | 15c3a08b8b1e8060f9659c7bc98480a39d1802c5 (patch) | |
| tree | 93d2a1bf62640dd299e49a5163692ea3e83d820c /sw/qa | |
| parent | 1a0b8d8e6cc09e457f1820a8d812d03940caf858 (diff) | |
bnc#884615 VML import: import OLE objects in header with background wrapping
We already do this for drawingML shapes since commit
500343105707a9905f5198a4af6ad58fe307b7c2 (DOCX drawingML shape import:
always set Opaque, 2013-12-04), make the VML / OLE case behave the same
as well.
Change-Id: Ic22f1f3cfd325ccbbb9bd6fe9814553683e4de55
Diffstat (limited to 'sw/qa')
| -rwxr-xr-x | sw/qa/extras/ooxmlexport/data/bnc884615.docx | bin | 0 -> 14343 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/bnc884615.docx b/sw/qa/extras/ooxmlexport/data/bnc884615.docx Binary files differnew file mode 100755 index 000000000000..51ee5ca0c57d --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/bnc884615.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index 22635f41afc2..0aa8235c1840 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -1736,6 +1736,12 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79591, "fdo79591.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:shape", "ID", ""); } +DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx") +{ + // The problem was that the shape in the header wasn't in the background. + CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(getShape(1), "Opaque"))); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |