summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/core/contexthandler2.cxx2
-rw-r--r--oox/source/core/filterbase.cxx2
-rw-r--r--oox/source/core/recordparser.cxx4
-rw-r--r--oox/source/drawingml/chart/converterbase.cxx4
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx2
-rw-r--r--oox/source/drawingml/chart/plotareaconverter.cxx10
-rw-r--r--oox/source/dump/dffdumper.cxx2
-rw-r--r--oox/source/helper/containerhelper.cxx2
-rw-r--r--oox/source/ole/vbacontrol.cxx4
9 files changed, 16 insertions, 16 deletions
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 4caf0f9364d8..baffe4ba2b76 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -37,7 +37,7 @@ struct ElementInfo
sal_Int32 mnElement; /// The element identifier.
bool mbTrimSpaces; /// True = trims leading/trailing spaces from text data.
- inline explicit ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
+ explicit ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
};
ContextHandler2Helper::ContextHandler2Helper( bool bEnableTrimSpace ) :
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 38c25ba312dc..9e20540544ab 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -82,7 +82,7 @@ public:
DocumentOpenedGuard(const DocumentOpenedGuard&) = delete;
DocumentOpenedGuard& operator=(const DocumentOpenedGuard&) = delete;
- inline bool isValid() const { return mbValid; }
+ bool isValid() const { return mbValid; }
private:
OUString maUrl;
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 3165626ab3b4..4459bfc3e93c 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -39,7 +39,7 @@ namespace prv {
class Locator : public ::cppu::WeakImplHelper< XLocator >
{
public:
- inline explicit Locator( RecordParser* pParser ) : mpParser( pParser ) {}
+ explicit Locator( RecordParser* pParser ) : mpParser( pParser ) {}
void dispose();
/// @throws css::uno::RuntimeException
@@ -94,7 +94,7 @@ class ContextStack
public:
explicit ContextStack( FragmentHandlerRef const & xHandler );
- inline bool empty() const { return maStack.empty(); }
+ bool empty() const { return maStack.empty(); }
sal_Int32 getCurrentRecId() const;
bool hasCurrentEndRecId() const;
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;
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 220bf29aba82..d35cc1cf2ff6 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -163,7 +163,7 @@ struct PropInfo
PropType meType;
sal_uInt16 mnId;
sal_uInt32 mnSize;
- inline explicit PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
+ explicit PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
maName( rName ), meType( eType ), mnId( nId ), mnSize( nSize ) {}
};
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index eedf306483b9..99a14231190c 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -39,7 +39,7 @@ namespace {
struct ValueRangeComp
{
- inline bool operator()( const ValueRange& rLHS, const ValueRange& rRHS ) const
+ bool operator()( const ValueRange& rLHS, const ValueRange& rRHS ) const
{
return rLHS.mnLast < rRHS.mnFirst;
}
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 805bb2d7a504..eb7a54b94b9c 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -131,8 +131,8 @@ struct VbaControlNameInserter
{
public:
VbaControlNamesSet& mrCtrlNames;
- inline explicit VbaControlNameInserter( VbaControlNamesSet& rCtrlNames ) : mrCtrlNames( rCtrlNames ) {}
- inline void operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
+ explicit VbaControlNameInserter( VbaControlNamesSet& rCtrlNames ) : mrCtrlNames( rCtrlNames ) {}
+ void operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
};
/** A dummy invisible form control (fixed label without text) that is used to