diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /oox/source/drawingml | |
parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff) |
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with
a rewriting Clang plugin (to be pushed later).
Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8
Reviewed-on: https://gerrit.libreoffice.org/34874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r-- | oox/source/drawingml/chart/converterbase.cxx | 4 | ||||
-rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/plotareaconverter.cxx | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index dba0a30b4dd5..7645f448b0d4 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -58,7 +58,7 @@ namespace { struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_Int32 > > { - inline explicit TitleKey( ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 ) + explicit TitleKey( ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 ) { first = eObjType; second.first = nMainIdx; second.second = nSubIdx; } }; @@ -73,7 +73,7 @@ struct TitleLayoutInfo ModelRef< LayoutModel > mxLayout; /// The layout model, if existing. GetShapeFunc mpGetShape; /// Helper function to receive the title shape. - inline explicit TitleLayoutInfo() : mpGetShape( nullptr ) {} + explicit TitleLayoutInfo() : mpGetShape( nullptr ) {} void convertTitlePos( ConverterRoot& rRoot, diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 43bdcc0d8b1a..b9d4720d9e1c 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -507,7 +507,7 @@ 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, + ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo, const AutoFormatEntry* pAutoLines, const AutoFormatEntry* pAutoFills, const AutoTextEntry* pAutoTexts, diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index fd444c131094..9488567080c1 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -56,7 +56,7 @@ struct AxesSetModel TypeGroupVector maTypeGroups; /// All type groups containing data series. AxisMap maAxes; /// All axes mapped by API axis type. - inline explicit AxesSetModel() {} + explicit AxesSetModel() {} }; /** Axes set converter. This is a helper class for the plot area converter. */ @@ -74,13 +74,13 @@ public: bool bSupportsVaryColorsByPoint ); /** Returns the automatic chart title if the axes set contains only one series. */ - inline const OUString& getAutomaticTitle() const { return maAutoTitle; } + const OUString& getAutomaticTitle() const { return maAutoTitle; } /** Returns true, if the chart is three-dimensional. */ - inline bool is3dChart() const { return mb3dChart; } + bool is3dChart() const { return mb3dChart; } /** Returns true, if chart type supports wall and floor format in 3D mode. */ - inline bool isWall3dChart() const { return mbWall3dChart; } + bool isWall3dChart() const { return mbWall3dChart; } /** Returns true, if chart is a pie chart or doughnut chart. */ - inline bool isPieChart() const { return mbPieChart; } + bool isPieChart() const { return mbPieChart; } private: OUString maAutoTitle; |