diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-07 11:44:23 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-08 11:55:16 +0000 |
| commit | c774070aa07e2d5a56bee101b6f026dceae86137 (patch) | |
| tree | edd008174829d3149e56ff25a038f018f2f70944 /oox | |
| parent | 66c3f4ad802a8d24caa30c772381db66dd52dc7f (diff) | |
fix crash loading ooo100546-1.xls
regressions around inserted extra enum values
into ShapePropertyId
(cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d)
Conflicts:
include/oox/drawingml/shapepropertymap.hxx
oox/source/drawingml/chart/objectformatter.cxx
Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3
Reviewed-on: https://gerrit.libreoffice.org/10136
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 2541d422beb9..a69dae046166 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -460,14 +460,14 @@ const AutoTextEntry* lclGetAutoTextEntry( const AutoTextEntry* pEntries, sal_Int return 0; } -// ---------------------------------------------------------------------------- +// These PropIds arrays will be indexed into using a ShapePropertyId enum (include/oox/drawingml/shapepropertymap.hxx) /** Property identifiers for common chart objects, to be used in ShapePropertyInfo. */ static const sal_Int32 spnCommonPropIds[] = { PROP_LineStyle, PROP_LineWidth, PROP_LineColor, PROP_LineTransparence, PROP_LineDashName, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, - PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_FillGradientName, + PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_INVALID, PROP_FillGradientName, PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY, PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint }; @@ -477,7 +477,7 @@ static const sal_Int32 spnLinearPropIds[] = { PROP_LineStyle, PROP_LineWidth, PROP_Color, PROP_Transparency, PROP_LineDashName, 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, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID }; @@ -487,7 +487,7 @@ static const sal_Int32 spnFilledPropIds[] = { PROP_BorderStyle, PROP_BorderWidth, PROP_BorderColor, PROP_BorderTransparency, PROP_BorderDashName, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, - PROP_FillStyle, PROP_Color, PROP_Transparency, PROP_GradientName, + PROP_FillStyle, PROP_Color, PROP_Transparency, PROP_INVALID, PROP_GradientName, PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, PROP_FillBitmapSizeY, PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, PROP_FillBitmapRectanglePoint }; |