From 3e82897353e576dc6e3fbf55371fda5a0c3415df Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 12 Jun 2014 14:06:28 +0200 Subject: improve the inlinesimplememberfunctions clang plugin Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e --- xmloff/inc/txtlists.hxx | 4 ++-- xmloff/source/chart/SchXMLExport.cxx | 6 +----- xmloff/source/chart/SchXMLPlotAreaContext.cxx | 4 ---- xmloff/source/chart/SchXMLPlotAreaContext.hxx | 2 +- xmloff/source/core/SvXMLAttr.cxx | 7 ------- xmloff/source/core/SvXMLAttr.hxx | 4 ++-- xmloff/source/core/xmlexp.cxx | 4 ---- xmloff/source/text/XMLTextListBlockContext.cxx | 8 -------- xmloff/source/text/XMLTextListBlockContext.hxx | 4 ++-- xmloff/source/text/txtlists.cxx | 8 -------- xmloff/source/transform/PersAttrListTContext.cxx | 5 ----- xmloff/source/transform/PersAttrListTContext.hxx | 3 ++- xmloff/source/xforms/XFormsModelContext.cxx | 4 ---- xmloff/source/xforms/XFormsModelContext.hxx | 2 +- 14 files changed, 11 insertions(+), 54 deletions(-) (limited to 'xmloff') diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index c5a9a4452f8b..891fb7967337 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -67,8 +67,8 @@ class XMLTextListsHelper : private boost::noncopyable const OUString& sListId ) const; OUString GetContinueListIdOfProcessedList( const OUString& sListId ) const; - const OUString& GetLastProcessedListId() const; - const OUString& GetListStyleOfLastProcessedList() const; + const OUString& GetLastProcessedListId() const { return msLastProcessedListId;} + const OUString& GetListStyleOfLastProcessedList() const { return msListStyleOfLastProcessedList;} OUString GenerateNewListId() const; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 08b6c1507860..5691a5b9ce75 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -154,7 +154,7 @@ public: com::sun::star::chart::XChartDocument > rChartDoc, bool bIncludeTable ); - UniReference< XMLPropertySetMapper > GetPropertySetMapper() const; + UniReference< XMLPropertySetMapper > GetPropertySetMapper() const { return mxPropertySetMapper;} void SetChartRangeAddress( const OUString& rAddress ) { msChartAddress = rAddress; } @@ -1010,10 +1010,6 @@ const OUString& SchXMLExportHelper::getChartCLSID() return m_pImpl->msCLSID; } -UniReference< XMLPropertySetMapper > SchXMLExportHelper_Impl::GetPropertySetMapper() const -{ - return mxPropertySetMapper; -} void SchXMLExportHelper_Impl::exportAutoStyles() { diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 0e915ea06a4d..93bcbb37d16b 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -706,10 +706,6 @@ bool SchXMLPositonAttributesHelper::isAutomatic() const { return m_bAutoSize || m_bAutoPosition; } -awt::Rectangle SchXMLPositonAttributesHelper::getRectangle() const -{ - return awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height ); -} bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 128e6364d2ab..3ba899091b7f 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -65,7 +65,7 @@ public: bool hasPosSize() const; bool isAutomatic() const; - ::com::sun::star::awt::Rectangle getRectangle() const; + ::com::sun::star::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );} private: bool hasSize() const; diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index 58997a44d4d7..a5be7be2698c 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -35,13 +35,6 @@ bool SvXMLAttr::operator== (const SvXMLAttr &rCmp) const } -const OUString& SvXMLAttr::getLName() const -{ - return aLName; -} -const OUString& SvXMLAttr::getValue() const { - return aValue; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx index 7725a3dc03c7..354b67497cd8 100644 --- a/xmloff/source/core/SvXMLAttr.hxx +++ b/xmloff/source/core/SvXMLAttr.hxx @@ -28,8 +28,8 @@ public: bool operator== (const SvXMLAttr &rCmp) const; sal_uInt16 getPrefixPos() const { return aPrefixPos;} - const OUString& getLName() const; - const OUString& getValue() const; + const OUString& getLName() const { return aLName;} + const OUString& getValue() const { return aValue;} }; #endif // INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTR_HXX diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 7730c882002e..2086d2a7b5b2 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2364,10 +2364,6 @@ void SvXMLExport::DisposingModel() mxEventListener.clear(); } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SvXMLExport::getComponentContext() -{ - return m_xContext; -} ::comphelper::UnoInterfaceToUniqueIdentifierMapper& SvXMLExport::getInterfaceToIdentifierMapper() { diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index 9e6c716ff564..ec0c91872198 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -282,14 +282,6 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( return pContext; } -const OUString& XMLTextListBlockContext::GetListId() const -{ - return msListId; -} -const OUString& XMLTextListBlockContext::GetContinueListId() const -{ - return msContinueListId; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index 21530e891698..27961782f28c 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -78,8 +78,8 @@ public: ::com::sun::star::container::XIndexReplace >& GetNumRules() const { return mxNumRules; } - const OUString& GetListId() const; - const OUString& GetContinueListId() const; + const OUString& GetListId() const { return msListId;} + const OUString& GetContinueListId() const { return msContinueListId;} }; diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index 5b882a6514cc..71663660c83c 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -216,15 +216,7 @@ OUString XMLTextListsHelper::GetContinueListIdOfProcessedList( return OUString(); } -const OUString& XMLTextListsHelper::GetLastProcessedListId() const -{ - return msLastProcessedListId; -} -const OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() const -{ - return msListStyleOfLastProcessedList; -} OUString XMLTextListsHelper::GenerateNewListId() const { diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index 215500317da0..6b0112119f41 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -177,9 +177,4 @@ void XMLPersAttrListTContext::ExportContent() // nothing to export } -Reference< XAttributeList > XMLPersAttrListTContext::GetAttrList() const -{ - return m_xAttrList; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 43e8838f0875..5bf0a701ebc5 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -107,7 +107,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > - GetAttrList() const; + GetAttrList() const { return m_xAttrList; } + }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSATTRLISTTCONTEXT_HXX diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index 4965f2a5ffa8..f98613ded3dc 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -77,10 +77,6 @@ XFormsModelContext::~XFormsModelContext() } -Reference XFormsModelContext::getModel() -{ - return mxModel; -} void XFormsModelContext::HandleAttribute( diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index ef4a4b550750..b439c2771111 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -48,7 +48,7 @@ public: const OUString& rLName ); virtual ~XFormsModelContext(); - com::sun::star::uno::Reference getModel(); + com::sun::star::uno::Reference getModel() { return mxModel;} // implement SvXMLImportContext & TokenContext methods: -- cgit