diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-09-17 22:57:49 +0200 |
|---|---|---|
| committer | Luke Deller <luke@deller.id.au> | 2016-09-18 05:12:22 +0000 |
| commit | 3287bc2f91438085b7604773d5e0346fc3c3f452 (patch) | |
| tree | f0fb39470e2a4ebe9d4dc99be9ba964595f9f3a5 /oox | |
| parent | 5a2cc16f701a8e03307f6d5286e53c3305d9c6a4 (diff) | |
fix missing default ctor for ObjectTypeFormatEntry with MSVC
MSVC can't create the default ctor (likely because members are pointers).
deleting default ctor will trigger gcc (4.8) fault where aggregate
initialization fails.
create ctor which does same as aggregate initialization, this also
prevents implicit creation of default ctor.
Change-Id: Ica79c7404de240f38ad18100e6dbc25f1b427960
Reviewed-on: https://gerrit.libreoffice.org/28981
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-by: Luke Deller <luke@deller.id.au>
Tested-by: Luke Deller <luke@deller.id.au>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index b32cd560c0cf..73c24da93f96 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -507,6 +507,14 @@ struct ObjectTypeFormatEntry const AutoFormatEntry* mpAutoFills; /// Automatic fill formatting for all chart styles. const AutoTextEntry* mpAutoTexts; /// Automatic text attributes for all chart styles. bool mbIsFrame; /// True = object is a frame, false = object is a line. + inline ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo, + const AutoFormatEntry* pAutoLines, + const AutoFormatEntry* pAutoFills, + const AutoTextEntry* pAutoTexts, + bool bIsFrame) + :meObjType(eObjType), mrPropInfo(rPropInfo), mpAutoLines(pAutoLines) + ,mpAutoFills(pAutoFills), mpAutoTexts(pAutoTexts), mbIsFrame(bIsFrame) + {} // prevent creation of implicit default ctor which fails in MSVC }; #define TYPEFORMAT_FRAME( obj_type, prop_type, auto_texts, auto_lines, auto_fills ) \ |