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-07 13:00:41 +0000 |
| commit | 9afdc6c3b4eb077b3e4279c5eec1e3dd9a4a8512 (patch) | |
| tree | 879607285d5c5cbcc99872303c7a648942e3bca0 /oox | |
| parent | e262086784defe1c0f417eedf52b5de2db8e559e (diff) | |
fix crash loading ooo100546-1.xls
regressions around inserted extra enum values
into ShapePropertyId
(cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d)
Conflicts:
oox/source/drawingml/chart/objectformatter.cxx
Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3
Reviewed-on: https://gerrit.libreoffice.org/10108
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index adcc3f3eb648..54ef18a7f0cd 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -460,7 +460,7 @@ 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[] = @@ -478,7 +478,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, PROP_END_LIST @@ -502,6 +502,7 @@ static const sal_Int32 spnFilledPropIds[] = PROP_FillStyle, PROP_Color, PROP_Transparency, + PROP_INVALID, PROP_GradientName, PROP_FillBitmapName, PROP_FillBitmapMode, |