summaryrefslogtreecommitdiff
path: root/sd/qa
diff options
context:
space:
mode:
authorHossein <hossein@libreoffice.org>2021-11-29 14:43:36 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2021-11-30 15:20:26 +0100
commitb0e6f49aaf6897b1102ef92b1474ffbc64a71e09 (patch)
tree0c3b4b78790a83da0d5d6d1fee6a20e946b9220c /sd/qa
parent4b06bd166a14bcb8da12c923de57098bee179767 (diff)
tdf#145873 Fix FILEOPEN: EMF file not displayed #2
The previous patch 149bd802623d6d83ec9aa04514b938494f7f01f6 only partially fixed the problem, and the size of the graphical objects was wrongly calculated. This patch fixes this problem. The fix can be tested with: make CPPUNIT_TEST_NAME="testTdf145873" -sr \ CppunitTest_vcl_pdfexport This test exports the PPTX to PDF and checks the size of the objects. The previous test for this issue which exported to SVG is removed, as it could not test the current situation. Change-Id: I97bed99811eaf8236ded84ffe0c1a7d3d1b5bad5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125924 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit 20d5e320801606856c1d05c4f34d9fa82371aac8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126102 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd/qa')
-rw-r--r--sd/qa/unit/SVGExportTests.cxx15
-rw-r--r--sd/qa/unit/data/pptx/tdf145873.pptxbin52342 -> 0 bytes
2 files changed, 0 insertions, 15 deletions
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index 1257478e5ed2..d43815264d26 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -35,7 +35,6 @@
#define SVG_USE *[name()='use']
#define SVG_PATTERN *[name()='pattern']
#define SVG_RECT *[name()='rect']
-#define SVG_FONT *[name()='font']
using namespace css;
@@ -335,19 +334,6 @@ public:
assertXPathContent(svgDoc, SAL_STRINGIFY( /SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN ), "<number>");
}
- void testTdf145873()
- {
- load( u"/sd/qa/unit/data/pptx/", "tdf145873.pptx" );
- save();
-
- xmlDocUniquePtr svgDoc = parseXml(maTempFile);
- CPPUNIT_ASSERT(svgDoc);
-
- // Witout the fix in place, it would have filed with:
- // - Expected: 22 - Actual : 3 - number of child-nodes is incorrect
- assertXPathChildren(svgDoc, SAL_STRINGIFY( /SVG_SVG/SVG_DEFS[6]/SVG_FONT ), 22);
- }
-
CPPUNIT_TEST_SUITE(SdSVGFilterTest);
CPPUNIT_TEST(testSVGExportTextDecorations);
CPPUNIT_TEST(testSVGExportJavascriptURL);
@@ -356,7 +342,6 @@ public:
CPPUNIT_TEST(testSVGExportSlideBitmapBackground);
CPPUNIT_TEST(testSVGExportSlideTileBitmapBackground);
CPPUNIT_TEST(testSVGPlaceholderLocale);
- CPPUNIT_TEST(testTdf145873);
CPPUNIT_TEST_SUITE_END();
};
diff --git a/sd/qa/unit/data/pptx/tdf145873.pptx b/sd/qa/unit/data/pptx/tdf145873.pptx
deleted file mode 100644
index 8a5eaa83824a..000000000000
--- a/sd/qa/unit/data/pptx/tdf145873.pptx
+++ /dev/null
Binary files differ