diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2018-11-08 09:25:18 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-12-13 08:33:43 +0100 |
| commit | a0a8c3a1be9f69f89cbdfbb037261ca6ab64e3af (patch) | |
| tree | aeca450d9869c4dfe67ff5b66d31167e7ef258ae /oox | |
| parent | 47180e4b83b5371d4006789261937de05e47a076 (diff) | |
tdf#94231 OOXML Import: Fix disappeared Hatch Background Color
With adding the PROP_FillBackground property to spnCommonPropIds and
spnFilledPropIds the hatch background color imported correctly,
an will not disappear.
Change-Id: I56745179236d2912a2d5c8585098e54acc4e3062
Reviewed-on: https://gerrit.libreoffice.org/63069
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit dddcfa0089bc84965d7a2c94f5f738a325cfae78)
Reviewed-on: https://gerrit.libreoffice.org/64944
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 7 | ||||
| -rw-r--r-- | oox/source/drawingml/shapepropertymap.cxx | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index a513fdb435a5..184cb111f02f 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -450,7 +450,7 @@ static const ShapePropertyIds spnCommonPropIds = PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_INVALID, PROP_FillGradientName, PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY, PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint, - PROP_FillHatchName + PROP_FillHatchName, PROP_FillBackground }; static const ShapePropertyIds spnLinearPropIds = @@ -460,7 +460,7 @@ static const ShapePropertyIds spnLinearPropIds = PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, - PROP_INVALID + PROP_INVALID, PROP_INVALID }; static const ShapePropertyIds spnFilledPropIds = @@ -489,7 +489,8 @@ static const ShapePropertyIds spnFilledPropIds = PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint, - PROP_HatchName + PROP_HatchName, + PROP_FillBackground }; /** Property info for common chart objects, to be used in ShapePropertyMap. */ diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx index b072403d4142..5e34fff6cc73 100644 --- a/oox/source/drawingml/shapepropertymap.cxx +++ b/oox/source/drawingml/shapepropertymap.cxx @@ -47,9 +47,9 @@ static const ShapePropertyIds spnDefaultShapeIds = PROP_FillBitmap, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY, PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint, PROP_FillHatch, - PROP_ShadowXDistance, + PROP_FillBackground, PROP_FillBitmapName, - PROP_FillBackground + PROP_ShadowXDistance }; } // namespace |