summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-10-09 10:28:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-10-09 14:47:17 +0200
commit7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 (patch)
tree616ab419fe0f01e94740de7faacb393775420589 /xmloff
parent664db0d945fbb23e115eeea8377e3a4e88541da1 (diff)
Extend loplugin:redundantinline to catch inline functions w/o external linkage
...where "inline" (in its meaning of "this function can be defined in multiple translation units") thus doesn't make much sense. (As discussed in compilerplugins/clang/redundantinline.cxx, exempt such "static inline" functions in include files for now.) All the rewriting has been done automatically by the plugin, except for one instance in sw/source/ui/frmdlg/column.cxx that used to involve an #if), plus some subsequent solenv/clang-format/reformat-formatted-files. Change-Id: Ib8b996b651aeafc03bbdc8890faa05ed50517224 Reviewed-on: https://gerrit.libreoffice.org/61573 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/RDFaImportHelper.cxx2
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx4
-rw-r--r--xmloff/source/text/txtflde.cxx36
3 files changed, 21 insertions, 21 deletions
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index e4651faa0f1d..d2255d17640b 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -138,7 +138,7 @@ struct RDFaEntry
{ }
};
-static inline bool isWS(const sal_Unicode i_Char)
+static bool isWS(const sal_Unicode i_Char)
{
return ('\t' == i_Char) || ('\n' == i_Char) || ('\r' == i_Char)
|| (' ' == i_Char);
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 224ae8e95cbe..7673c9d48756 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::beans;
using namespace ::comphelper;
using namespace ::xmloff::token;
-static inline bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 )
+static bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 )
{
return (rLine1.InnerLineWidth == rLine2.InnerLineWidth) &&
(rLine1.OuterLineWidth == rLine2.OuterLineWidth) &&
@@ -40,7 +40,7 @@ static inline bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const
(rLine1.LineWidth == rLine2.LineWidth);
}
-static inline void lcl_RemoveState( XMLPropertyState* pState )
+static void lcl_RemoveState( XMLPropertyState* pState )
{
pState->mnIndex = -1;
pState->maValue.clear();
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index d607e15540dd..cb192f8df4fb 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -250,25 +250,25 @@ SvXMLEnumStringMapEntry<FieldIdEnum> const aFieldServiceNameMapping[] =
// property accessor helper functions
-static inline bool GetBoolProperty(const OUString&,
+static bool GetBoolProperty(const OUString&,
const Reference<XPropertySet> &);
-static inline bool GetOptionalBoolProperty(const OUString&,
+static bool GetOptionalBoolProperty(const OUString&,
const Reference<XPropertySet> &,
const Reference<XPropertySetInfo> &,
bool bDefault);
-static inline double GetDoubleProperty(const OUString&,
+static double GetDoubleProperty(const OUString&,
const Reference<XPropertySet> &);
-static inline OUString const GetStringProperty(const OUString&,
+static OUString const GetStringProperty(const OUString&,
const Reference<XPropertySet> &);
-static inline sal_Int32 GetIntProperty(const OUString&,
+static sal_Int32 GetIntProperty(const OUString&,
const Reference<XPropertySet> &);
-static inline sal_Int16 GetInt16Property(const OUString&,
+static sal_Int16 GetInt16Property(const OUString&,
const Reference<XPropertySet> &);
-static inline sal_Int8 GetInt8Property(const OUString&,
+static sal_Int8 GetInt8Property(const OUString&,
const Reference<XPropertySet> &);
-static inline util::DateTime const GetDateTimeProperty( const OUString& sPropName,
+static util::DateTime const GetDateTimeProperty( const OUString& sPropName,
const Reference<XPropertySet> & xPropSet);
-static inline Sequence<OUString> const GetStringSequenceProperty(
+static Sequence<OUString> const GetStringSequenceProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet);
@@ -3457,7 +3457,7 @@ OUString XMLTextFieldExport::MakeSequenceRefName(
// to be relegated (does that word exist?) to a more appropriate place
-inline bool GetBoolProperty(
+bool GetBoolProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3466,7 +3466,7 @@ inline bool GetBoolProperty(
return bBool;
}
-inline bool GetOptionalBoolProperty(
+bool GetOptionalBoolProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet,
const Reference<XPropertySetInfo> & xPropSetInfo,
@@ -3476,7 +3476,7 @@ inline bool GetOptionalBoolProperty(
? GetBoolProperty( sPropName, xPropSet ) : bDefault;
}
-inline double GetDoubleProperty(
+double GetDoubleProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3486,7 +3486,7 @@ inline double GetDoubleProperty(
return fDouble;
}
-inline OUString const GetStringProperty(
+OUString const GetStringProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3496,7 +3496,7 @@ inline OUString const GetStringProperty(
return sString;
}
-inline sal_Int32 GetIntProperty(
+sal_Int32 GetIntProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3506,7 +3506,7 @@ inline sal_Int32 GetIntProperty(
return nInt;
}
-inline sal_Int16 GetInt16Property(
+sal_Int16 GetInt16Property(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3516,7 +3516,7 @@ inline sal_Int16 GetInt16Property(
return nInt;
}
-inline sal_Int8 GetInt8Property(
+sal_Int8 GetInt8Property(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3526,7 +3526,7 @@ inline sal_Int8 GetInt8Property(
return nInt;
}
-inline util::DateTime const GetDateTimeProperty(
+util::DateTime const GetDateTimeProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{
@@ -3536,7 +3536,7 @@ inline util::DateTime const GetDateTimeProperty(
return aTime;
}
-inline Sequence<OUString> const GetStringSequenceProperty(
+Sequence<OUString> const GetStringSequenceProperty(
const OUString& sPropName,
const Reference<XPropertySet> & xPropSet)
{