summaryrefslogtreecommitdiff
path: root/sw/qa/extras/odfexport/odfexport.cxx
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2018-12-18 14:13:09 +0100
committerLászló Németh <nemeth@numbertext.org>2018-12-19 07:57:46 +0100
commit69ce3374f90847f357249a41118314508da6bb98 (patch)
tree9448aba709a8bbc9d68482bdaad02f185b38c5fb /sw/qa/extras/odfexport/odfexport.cxx
parent05cbfa4cca3dc77dcdcdd5d87de7baf37485d852 (diff)
tdf#99631 DOCX import: keep zoom of embedded XLSX
OLE objects by importing their VisibleArea settings This also reverts commit 5c1a6c9adb5ccfbb869a0a7ac730d8860a1bf405 "tdf#99631 DOCX import: set 1:1 scale in embedded XLSX". Change-Id: I73dc945c86d0200e72767810b2ff39f233729080 Reviewed-on: https://gerrit.libreoffice.org/65343 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa/extras/odfexport/odfexport.cxx')
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index c8468eb90cdd..8e3df22527a8 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2125,12 +2125,18 @@ DECLARE_ODFEXPORT_TEST(tdf118502, "tdf118502.odt")
DECLARE_ODFEXPORT_TEST(tdf99631, "tdf99631.docx")
{
- // File asserting while saving in LO.
+ // check import of VisualArea settings of the embedded XLSX OLE objects
xmlDocPtr pXmlDoc = parseExport("Object 1/settings.xml");
if (!pXmlDoc)
return;
assertXPathContent(pXmlDoc, "//config:config-item[@config:name='VisibleAreaWidth']", "4515");
assertXPathContent(pXmlDoc, "//config:config-item[@config:name='VisibleAreaHeight']", "903");
+
+ xmlDocPtr pXmlDoc2 = parseExport("Object 2/settings.xml");
+ if (!pXmlDoc2)
+ return;
+ assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaWidth']", "4515");
+ assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaHeight']", "1354");
}
#endif