diff options
| author | Mark Hung <marklh9@gmail.com> | 2016-11-23 20:23:37 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2016-11-25 00:30:04 +0000 |
| commit | b6f52c5c6bc57d831e09126f802739589e5eea37 (patch) | |
| tree | 05aba326c6b91207b58191bd481a2be19a8671ac /oox | |
| parent | 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 8 |
1 files changed, 1 insertions, 7 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: |