diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-07-07 11:44:23 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-07 11:44:29 +0100 |
commit | aacfd5038d05a02f8b1eade3a5896d3d7e959f3d (patch) | |
tree | f3a79b8740bc09683fa4b9ef57e945c79ca1ba21 /include/oox/drawingml | |
parent | 4e549156ef63b08965ed0271b6506479483bef4c (diff) |
fix crash loading ooo100546-1.xls
regressions around inserted extra enum values
into ShapePropertyId
Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3
Diffstat (limited to 'include/oox/drawingml')
-rw-r--r-- | include/oox/drawingml/shapepropertymap.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index f451cc0507e1..13e8e507a7a9 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -30,12 +30,14 @@ namespace oox { class ModelObjectHelper; } namespace oox { namespace drawingml { - - /** Enumeration for various properties related to drawing shape formatting. This is an abstraction for shape formatting properties that have different names in various implementations, e.g. drawing shapes vs. chart objects. + + If you *insert* ids into this list, then update spnCommonPropIds, spnLinearPropIds + and spnFilledPropIds of oox/source/drawingml/chart/objectformatter.cxx if + the newly inserted enum is inside the range they cover */ enum ShapePropertyId { @@ -69,8 +71,6 @@ enum ShapePropertyId SHAPEPROP_END }; - - struct OOX_DLLPUBLIC ShapePropertyInfo { std::vector<sal_Int32> maPropertyIds; |