strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#96052 - export the forbidden shape as path instead of preset shape.

Browse source 
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
2b4f9d0b2b, 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>
This commit is contained in:
Mark Hung 2016-11-23 20:23:37 +08:00
parent 6bb20609a2
commit b6f52c5c6b
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
oox/source/export/shapes.cxx
View file

@ -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:

2
sd/qa/unit/export-tests-ooxml2.cxx
View file

@ -467,8 +467,6 @@ void SdOOXMLExportTest2::testPresetShapesExport()
"adj1","val 10490",
"donut",
"adj","val 9601",
"noSmoking",
"adj","val 16118",
"bevel",
"adj","val 42587",
"foldedCorner",