oox/source/export/shapes.cxx | 8 +-------
sd/qa/unit/export-tests-ooxml2.cxx | 2 --
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 308a00e1dc1799b33bfc26bd8e0ec2797128b671
Author: Mark Hung <mark...@gmail.com>
Date: Wed Nov 23 20:23:37 2016 +0800
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 <c...@libreoffice.org>
Reviewed-by: Mark Hung <mark...@gmail.com>
(cherry picked from commit b6f52c5c6bc57d831e09126f802739589e5eea37)
Reviewed-on: https://gerrit.libreoffice.org/31226
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 820cb4c..7bd85a8 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 05ef4aa..540e800 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",
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
