From b6f52c5c6bc57d831e09126f802739589e5eea37 Mon Sep 17 00:00:00 2001 From: Mark Hung Date: Wed, 23 Nov 2016 20:23:37 +0800 Subject: tdf#96052 - export the forbidden shape as path instead of preset shape. OOXML noSmoking shape has different definition so that convert LO's forbidden shape to OOXML noSmoking do not produce good result. I put it on whitelist and now the geometry looks correct although handle is lost. This partially revert unit test for the shape in 2b4f9d0b2b0006fc7bebb9e696a32eabd1aeb993, where forbidden is exported as a preset shape. Change-Id: I2e134940fa4a36e6b7b814b008d859691fbcdd6a Reviewed-on: https://gerrit.libreoffice.org/31110 Tested-by: Jenkins Reviewed-by: Mark Hung --- sd/qa/unit/export-tests-ooxml2.cxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'sd') diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 05ef4aa700aa..540e80022d7d 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -467,8 +467,6 @@ void SdOOXMLExportTest2::testPresetShapesExport() "adj1","val 10490", "donut", "adj","val 9601", - "noSmoking", - "adj","val 16118", "bevel", "adj","val 42587", "foldedCorner", -- cgit