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 /chart2 | |
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 'chart2')
-rw-r--r-- | chart2/source/inc/PropertyHelper.hxx | 2 | ||||
-rw-r--r-- | chart2/source/inc/RegressionCalculationHelper.hxx | 12 | ||||
-rw-r--r-- | chart2/source/inc/XMLRangeHelper.hxx | 2 | ||||
-rw-r--r-- | chart2/source/model/inc/XMLFilter.hxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/ImplOPropertySet.cxx | 6 | ||||
-rw-r--r-- | chart2/source/view/axes/VCartesianAxis.cxx | 4 | ||||
-rw-r--r-- | chart2/source/view/inc/MinimumAndMaximumSupplier.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/main/VDataSeries.cxx | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index 4be22de5d6e9..52a38edfed6c 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -140,7 +140,7 @@ OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap & struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess { - inline bool operator() ( const css::beans::Property & first, + bool operator() ( const css::beans::Property & first, const css::beans::Property & second ) { return ( first.Name.compareTo( second.Name ) < 0 ); diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx index e4b94818bfb5..60ab60ddf621 100644 --- a/chart2/source/inc/RegressionCalculationHelper.hxx +++ b/chart2/source/inc/RegressionCalculationHelper.hxx @@ -63,7 +63,7 @@ tDoubleVectorPair class isValid : public std::binary_function< double, double, bool > { public: - inline bool operator()( double x, double y ) + bool operator()( double x, double y ) { return ! ( ::rtl::math::isNan( x ) || ::rtl::math::isNan( y ) || ::rtl::math::isInf( x ) || @@ -74,7 +74,7 @@ public: class isValidAndXPositive : public std::binary_function< double, double, bool > { public: - inline bool operator()( double x, double y ) + bool operator()( double x, double y ) { return ! ( ::rtl::math::isNan( x ) || ::rtl::math::isNan( y ) || ::rtl::math::isInf( x ) || @@ -86,7 +86,7 @@ public: class isValidAndYPositive : public std::binary_function< double, double, bool > { public: - inline bool operator()( double x, double y ) + bool operator()( double x, double y ) { return ! ( ::rtl::math::isNan( x ) || ::rtl::math::isNan( y ) || ::rtl::math::isInf( x ) || @@ -98,7 +98,7 @@ public: class isValidAndYNegative : public std::binary_function< double, double, bool > { public: - inline bool operator()( double x, double y ) + bool operator()( double x, double y ) { return ! ( ::rtl::math::isNan( x ) || ::rtl::math::isNan( y ) || ::rtl::math::isInf( x ) || @@ -110,7 +110,7 @@ public: class isValidAndBothPositive : public std::binary_function< double, double, bool > { public: - inline bool operator()( double x, double y ) + bool operator()( double x, double y ) { return ! ( ::rtl::math::isNan( x ) || ::rtl::math::isNan( y ) || ::rtl::math::isInf( x ) || @@ -123,7 +123,7 @@ public: class isValidAndXPositiveAndYNegative : public std::binary_function< double, double, bool > { public: - inline bool operator()( double x, double y ) + bool operator()( double x, double y ) { return ! ( ::rtl::math::isNan( x ) || ::rtl::math::isNan( y ) || ::rtl::math::isInf( x ) || diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index 455b9d55b754..207770dbbed9 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -44,7 +44,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS Cell bIsEmpty(true) {} - inline bool empty() const { return bIsEmpty; } + bool empty() const { return bIsEmpty; } }; struct OOO_DLLPUBLIC_CHARTTOOLS CellRange diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 00aa0279d970..de69e205b28f 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -80,7 +80,7 @@ protected: virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& Document ) override; - inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } + void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } virtual OUString getMediaType(bool _bOasis); diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index 0c58e659cdaa..bfe6fdb296a0 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -42,7 +42,7 @@ struct lcl_getPropertyStateByHandle : : m_rMap( rMap ) {} - inline beans::PropertyState operator() ( sal_Int32 nHandle ) + beans::PropertyState operator() ( sal_Int32 nHandle ) { if( m_rMap.end() == m_rMap.find( nHandle )) return beans::PropertyState_DEFAULT_VALUE; @@ -61,7 +61,7 @@ struct lcl_eraseMapEntry : : m_rMap( rMap ) {} - inline void operator() ( const K & aKey ) + void operator() ( const K & aKey ) { m_rMap.erase( aKey ); } @@ -73,7 +73,7 @@ private: struct lcl_replaceInterfacePropertiesByClones : public std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void > { - inline void operator() ( ::property::impl::ImplOPropertySet::tPropertyMap::value_type & rProp ) + void operator() ( ::property::impl::ImplOPropertySet::tPropertyMap::value_type & rProp ) { if( rProp.second.hasValue() && rProp.second.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ) diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 8a38c8cb1597..75c7bff6db55 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1095,7 +1095,7 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList; struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > { - inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) + bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) { return ( rPos1.aScreenPos.getX() < rPos2.aScreenPos.getX() ); } @@ -1103,7 +1103,7 @@ struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos struct lcl_GreaterYPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool > { - inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) + bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 ) { return ( rPos1.aScreenPos.getY() > rPos2.aScreenPos.getY() ); } diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index 303c1c5c8ac9..8afe7926bc7f 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -89,8 +89,8 @@ private: typedef std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet; MinimumAndMaximumSupplierSet m_aMinimumAndMaximumSupplierList; - inline MinimumAndMaximumSupplierSet::iterator begin() { return m_aMinimumAndMaximumSupplierList.begin(); } - inline MinimumAndMaximumSupplierSet::iterator end() { return m_aMinimumAndMaximumSupplierList.end(); } + MinimumAndMaximumSupplierSet::iterator begin() { return m_aMinimumAndMaximumSupplierList.begin(); } + MinimumAndMaximumSupplierSet::iterator end() { return m_aMinimumAndMaximumSupplierList.end(); } }; } //namespace chart diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index e9a16e7dbf3a..53bf1ad8f619 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -96,7 +96,7 @@ namespace { struct lcl_LessXOfPoint { - inline bool operator() ( const std::vector< double >& first, + bool operator() ( const std::vector< double >& first, const std::vector< double >& second ) { if( !first.empty() && !second.empty() ) |