diff options
-rw-r--r-- | oox/source/export/shapes.cxx | 8 | ||||
-rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 820cb4ca56d3..7bd85a8cd39f 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -547,7 +547,6 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType) OUStringLiteral("smiley"), OUStringLiteral("sun"), OUStringLiteral("flower"), - OUStringLiteral("forbidden"), OUStringLiteral("bracket-pair"), OUStringLiteral("brace-pair"), OUStringLiteral("col-60da8460"), @@ -606,6 +605,7 @@ static bool lcl_IsOnWhitelist(OUString& rShapeType) static #endif const std::initializer_list<OUStringLiteral> vWhitelist = { + OUStringLiteral("forbidden"), OUStringLiteral("heart"), OUStringLiteral("puzzle") }; @@ -918,12 +918,6 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape ) lcl_AppendAdjustmentValue( aAvList, 0, adj ); break; } - case mso_sptNoSmoking: - { - sal_Int32 adj = double( nXPosition )/7200 *50000 ; - lcl_AppendAdjustmentValue( aAvList, 0, adj ); - break; - } case mso_sptDonut: case mso_sptSun: case mso_sptMoon: 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", |