include/oox/drawingml/shapepropertymap.hxx | 4 ++++
oox/source/drawingml/chart/objectformatter.cxx | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit c774070aa07e2d5a56bee101b6f026dceae86137
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 7 11:44:23 2014 +0100
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.ku...@collabora.com>
Tested-by: Matúš Kukan <matus.ku...@collabora.com>
diff --git a/include/oox/drawingml/shapepropertymap.hxx
b/include/oox/drawingml/shapepropertymap.hxx
index f2dc8ec..f8ba462 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -34,6 +34,10 @@ namespace drawingml {
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
{
diff --git a/oox/source/drawingml/chart/objectformatter.cxx
b/oox/source/drawingml/chart/objectformatter.cxx
index 2541d42..a69dae0 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
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
