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 /xmloff | |
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 'xmloff')
-rw-r--r-- | xmloff/inc/MultiPropertySetHelper.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/StyleMap.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/txtfldi.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/txtvfldi.hxx | 8 | ||||
-rw-r--r-- | xmloff/source/chart/MultiPropertySetHandler.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/forms/formattributes.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/forms/formcellbinding.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/forms/layerimport.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/forms/propertyexport.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/forms/propertyimport.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/text/XMLSectionExport.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextListItemContext.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextNumRuleInfo.hxx | 20 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerActions.hxx | 8 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerBase.hxx | 4 |
17 files changed, 47 insertions, 47 deletions
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index 924e0d201c5e..cbc61f5e1633 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -157,7 +157,7 @@ public: const css::uno::Any& getValue( sal_Int16 nIndex, const css::uno::Reference<css::beans::XMultiPropertySet> & ); - inline void resetValues() { pValues = nullptr; } + void resetValues() { pValues = nullptr; } }; diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index f5b99a3278b2..a3edc2e35832 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -29,7 +29,7 @@ struct StyleNameKey_Impl sal_uInt16 m_nFamily; OUString m_aName; - inline StyleNameKey_Impl( sal_uInt16 nFamily, + StyleNameKey_Impl( sal_uInt16 nFamily, const OUString& rName ) : m_nFamily( nFamily ), m_aName( rName ) diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 5d2e5c225331..106545c34503 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -149,10 +149,10 @@ public: protected: /// get helper - inline XMLTextImportHelper& GetImportHelper() { return rTextImportHelper; } + XMLTextImportHelper& GetImportHelper() { return rTextImportHelper; } const OUString& GetServiceName() { return sServiceName; } - inline void SetServiceName(const OUString& sStr) { sServiceName = sStr; } + void SetServiceName(const OUString& sStr) { sServiceName = sStr; } OUString const & GetContent(); diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index bfe990375d7c..b5e1d6dcae86 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -73,12 +73,12 @@ public: const css::uno::Reference<css::beans::XPropertySet> & xPropertySet); /// is value a string (rather than double)? - inline bool IsStringValue() { return bStringType; } + bool IsStringValue() { return bStringType; } /// has format been read? - inline bool IsFormatOK() { return bFormatOK; } + bool IsFormatOK() { return bFormatOK; } - inline void SetDefault(const OUString& sStr) { sDefault = sStr; } + void SetDefault(const OUString& sStr) { sDefault = sStr; } }; @@ -169,7 +169,7 @@ protected: // various accessor methods: const OUString& GetName() { return sName; } - inline bool IsStringValue() { return aValueHelper.IsStringValue();} + bool IsStringValue() { return aValueHelper.IsStringValue();} }; diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index f9cffea53ea6..5b70383ea6ab 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -94,7 +94,7 @@ class OUStringComparison { public: /// Compare two strings. Returns true if the first is before the second. - inline bool operator() (const OUString & a, const OUString & b) const + bool operator() (const OUString & a, const OUString & b) const { return (a.compareTo (b) < 0); } diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 44b067b6f45e..b530058cfbac 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1421,7 +1421,7 @@ namespace xmloff const sal_Int32 m_nHandle; explicit EqualHandle( sal_Int32 _nHandle ) : m_nHandle( _nHandle ) { } - inline bool operator()( const PropertyValue& _rProp ) + bool operator()( const PropertyValue& _rProp ) { return _rProp.Handle == m_nHandle; } @@ -1474,7 +1474,7 @@ namespace xmloff const OUString & m_sName; explicit EqualName( const OUString& _rName ) : m_sName( _rName ) { } - inline bool operator()( const PropertyValue& _rProp ) + bool operator()( const PropertyValue& _rProp ) { return _rProp.Name == m_sName; } diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index c41ebfdf1ff3..fcfab79fbde7 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -211,7 +211,7 @@ namespace xmloff @param _nId the id of the attribute. Has to be one of the DA_* constants. */ - static inline sal_uInt16 getDatabaseAttributeNamespace(DAFlags ) + static sal_uInt16 getDatabaseAttributeNamespace(DAFlags ) { // nothing special here return XML_NAMESPACE_FORM; @@ -233,7 +233,7 @@ namespace xmloff @param _nId the id of the attribute. Has to be one of the BA_* constants. */ - static inline sal_uInt16 getBindingAttributeNamespace(BAFlags ) + static sal_uInt16 getBindingAttributeNamespace(BAFlags ) { // nothing special here return XML_NAMESPACE_FORM; @@ -255,7 +255,7 @@ namespace xmloff @param _nId the id of the attribute */ - static inline sal_uInt16 getOfficeFormsAttributeNamespace(OfficeFormsAttributes ) + static sal_uInt16 getOfficeFormsAttributeNamespace(OfficeFormsAttributes ) { // nothing special here return XML_NAMESPACE_FORM; } diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 06e4b50c82c0..f81142640929 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -88,7 +88,7 @@ namespace public: explicit StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const OUString& _rCompare ) + bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ); } diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index d3387a8e34db..d54c970f35e1 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -95,8 +95,8 @@ namespace xmloff const OUString& _rReferringControls); // OFormLayerXMLImport_Impl - inline OAttribute2Property& getAttributeMap() { return m_aAttributeMetaData; } - inline SvXMLImport& getGlobalContext() { return m_rImporter; } + OAttribute2Property& getAttributeMap() { return m_aAttributeMetaData; } + SvXMLImport& getGlobalContext() { return m_rImporter; } const SvXMLStyleContext* getStyleElement(const OUString& _rStyleName) const; void enterEventContext(); void leaveEventContext(); diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index d25e768c0c8d..ff2efadb3a41 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -238,7 +238,7 @@ namespace xmloff <p>If _bAddType is set, an additional xlink:type="simple" attribute is also added.</p> */ - inline void exportTargetLocationAttribute(bool _bAddType) { exportRelativeTargetLocation(PROPERTY_TARGETURL,CCAFlags::TargetLocation,_bAddType); } + void exportTargetLocationAttribute(bool _bAddType) { exportRelativeTargetLocation(PROPERTY_TARGETURL,CCAFlags::TargetLocation,_bAddType); } /** add the form:image attribute to the export context. @@ -246,7 +246,7 @@ namespace xmloff <p>The property needs a special handling because the URL's need to be made relative</p> */ - inline void exportImageDataAttribute() { exportRelativeTargetLocation(PROPERTY_IMAGEURL,CCAFlags::ImageData,false); } + void exportImageDataAttribute() { exportRelativeTargetLocation(PROPERTY_IMAGEURL,CCAFlags::ImageData,false); } /** flag the style properties as 'already exported' diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 23d2b4c64c77..8cb81595f04e 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -123,18 +123,18 @@ namespace xmloff */ void enableTrackAttributes() { m_bTrackAttributes = true; } - inline void implPushBackPropertyValue(const css::beans::PropertyValue& _rProp) + void implPushBackPropertyValue(const css::beans::PropertyValue& _rProp) { m_aValues.push_back(_rProp); } - inline void implPushBackPropertyValue( const OUString& _rName, const css::uno::Any& _rValue ) + void implPushBackPropertyValue( const OUString& _rName, const css::uno::Any& _rValue ) { m_aValues.push_back( css::beans::PropertyValue( _rName, -1, _rValue, css::beans::PropertyState_DIRECT_VALUE ) ); } - inline void implPushBackGenericPropertyValue(const css::beans::PropertyValue& _rProp) + void implPushBackGenericPropertyValue(const css::beans::PropertyValue& _rProp) { m_aGenericValues.push_back(_rProp); } diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index ba9aef6e6583..ccb171c197fd 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -222,23 +222,23 @@ public: sal_Int32 GetLevel() const { return nLevel; } Sequence<beans::PropertyValue> GetProperties(); - inline void SetPosAndSpaceMode( sal_Int16 eValue ) + void SetPosAndSpaceMode( sal_Int16 eValue ) { ePosAndSpaceMode = eValue; } - inline void SetLabelFollowedBy( sal_Int16 eValue ) + void SetLabelFollowedBy( sal_Int16 eValue ) { eLabelFollowedBy = eValue; } - inline void SetListtabStopPosition( sal_Int32 nValue ) + void SetListtabStopPosition( sal_Int32 nValue ) { nListtabStopPosition = nValue; } - inline void SetFirstLineIndent( sal_Int32 nValue ) + void SetFirstLineIndent( sal_Int32 nValue ) { nFirstLineIndent = nValue; } - inline void SetIndentAt( sal_Int32 nValue ) + void SetIndentAt( sal_Int32 nValue ) { nIndentAt = nValue; } diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index 7b60c031ab9f..d7f403adbdd5 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -134,8 +134,8 @@ public: protected: - inline SvXMLExport& GetExport() { return rExport; } - inline XMLTextParagraphExport& GetParaExport() { return rParaExport; } + SvXMLExport& GetExport() { return rExport; } + XMLTextParagraphExport& GetParaExport() { return rParaExport; } // export methods for section and index start: diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index 6f9e500d819b..dcf49f226c3a 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -56,11 +56,11 @@ public: bool HasStartValue() const { return -1 != nStartValue; } sal_Int16 GetStartValue() const { return nStartValue; } - inline bool HasNumRulesOverride() const + bool HasNumRulesOverride() const { return mxNumRulesOverride.is(); } - inline const css::uno::Reference < css::container::XIndexReplace >& GetNumRulesOverride() const + const css::uno::Reference < css::container::XIndexReplace >& GetNumRulesOverride() const { return mxNumRulesOverride; } diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index 6ec6bd1fa173..26394e17b059 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -70,50 +70,50 @@ public: const bool bExportTextNumberElement ); inline void Reset(); - inline const OUString& GetNumRulesName() const + const OUString& GetNumRulesName() const { return msNumRulesName; } - inline sal_Int16 GetListLevelStartValue() const + sal_Int16 GetListLevelStartValue() const { return mnListLevelStartValue; } - inline const OUString& GetListId() const + const OUString& GetListId() const { return msListId; } - inline sal_Int16 GetLevel() const + sal_Int16 GetLevel() const { return mnListLevel; } - inline bool HasStartValue() const + bool HasStartValue() const { return mnListStartValue != -1; } - inline sal_uInt32 GetStartValue() const + sal_uInt32 GetStartValue() const { return mnListStartValue; } - inline bool IsNumbered() const + bool IsNumbered() const { return mbIsNumbered; } - inline bool IsRestart() const + bool IsRestart() const { return mbIsRestart; } bool BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) const; - inline bool IsContinueingPreviousSubTree() const + bool IsContinueingPreviousSubTree() const { return mbContinueingPreviousSubTree; } - inline const OUString& ListLabelString() const + const OUString& ListLabelString() const { return msListLabelString; } diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index f7016db0aeda..606709ca6539 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -31,18 +31,18 @@ struct NameKey_Impl sal_uInt16 m_nPrefix; OUString m_aLocalName; - inline NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) : + NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) : m_nPrefix( nPrfx ), m_aLocalName( rLclNm ) { } - inline NameKey_Impl() : + NameKey_Impl() : m_nPrefix( XML_NAMESPACE_UNKNOWN ) { } - inline void SetLocalName( ::xmloff::token::XMLTokenEnum eLclNm ) + void SetLocalName( ::xmloff::token::XMLTokenEnum eLclNm ) { m_aLocalName = ::xmloff::token::GetXMLToken( eLclNm ); } @@ -75,7 +75,7 @@ struct TransformerAction_Impl sal_uInt32 m_nParam2; sal_uInt32 m_nParam3; - inline TransformerAction_Impl() : + TransformerAction_Impl() : m_nActionType( XML_TACTION_EOT ), m_nParam1( 0 ), m_nParam2( 0 ), diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index ad0257f11048..e34427c8e23d 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -182,8 +182,8 @@ public: const XMLTransformerContext *GetAncestorContext( sal_uInt32 i ) const; // C++ - inline void SetClass( const OUString& r ) { m_aClass = r; } - inline const OUString& GetClass() const { return m_aClass; } + void SetClass( const OUString& r ) { m_aClass = r; } + const OUString& GetClass() const { return m_aClass; } bool isWriter() const; |