improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e

16 files changed, 11 insertions, 52 deletions

diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 005f36a7fe4f..710475b67e71 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -64,7 +64,7 @@ public:
     /** @returns the numbering type that is used to format page fields in drawing shapes */
     virtual SvxNumType  GetPageNumType() const SAL_OVERRIDE;
 
-    OXUndoEnvironment&  GetUndoEnv();
+    OXUndoEnvironment&  GetUndoEnv() { return *m_pUndoEnv;}
     void                SetModified(bool _bModified);
 
     inline dbaui::DBSubComponentController* getController() const { return m_pController; }
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 76a544f1a72d..443f53328870 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -116,7 +116,7 @@ public:
 
     bool        supportsService( const OUString& _sServiceName ) const;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const { return m_xReportComponent;}
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
     inline void setOldParent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) { m_xSection = _xSection; }
     inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getOldParent() const { return m_xSection;}
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 8fe4401a9a5d..518293b8149b 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -83,7 +83,7 @@ public:
     */
     void insertObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection;}
 };
 }
 #endif // INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 6550b0c50600..506ec8f0d7c7 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -68,7 +68,7 @@ namespace rptui
 
         /// returns the complete formula represented by the object
         const OUString&
-                    getCompleteFormula() const;
+                    getCompleteFormula() const { return m_sCompleteFormula; }
 
         /** gets the <em>undecorated formula</em> content
 
@@ -78,7 +78,7 @@ namespace rptui
             If the formula denotes an expression, then the <em>undecorated content</em> is the expression
             itself.
         */
-        const OUString& getUndecoratedContent() const;
+        const OUString& getUndecoratedContent() const { return m_sUndecoratedContent; }
 
         /// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression
         inline OUString  getFieldName() const;
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index a6ad2a2e9295..0b53d279f1a1 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -140,11 +140,6 @@ namespace rptui
         return aFieldContent.makeStringAndClear();
     }
 
-    const OUString& ReportFormula::getUndecoratedContent() const
-    {
-        return m_sUndecoratedContent;
-    }
-    const OUString&  ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; }
     bool                    ReportFormula::isValid() const { return getType() != Invalid; }
     ReportFormula& ReportFormula::operator=(class ReportFormula const & _rHd)
     {
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index f244817dd8a1..5c50ad72144b 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -89,10 +89,6 @@ void OReportModel::SetChanged( bool bChanged )
 
 
 
-OXUndoEnvironment&  OReportModel::GetUndoEnv()
-{
-    return *m_pUndoEnv;
-}
 
 void OReportModel::SetModified(bool _bModified)
 {
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index a32f242b4e8a..6c2287c4e0dd 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -339,10 +339,6 @@ uno::Reference< report::XSection> OObjectBase::getSection() const
     return xSection;
 }
 
-uno::Reference< report::XReportComponent> OObjectBase::getReportComponent() const
-{
-    return m_xReportComponent;
-}
 
 uno::Reference< beans::XPropertySet> OObjectBase::getAwtComponent()
 {
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 6b8300d03c98..242c7b4ead80 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -132,10 +132,6 @@ void OReportPage::insertObject(const uno::Reference< report::XReportComponent >&
         pObject->StartListening();
 }
 
-uno::Reference< report::XSection > OReportPage::getSection() const
-{
-    return m_xSection;
-}
 
 uno::Reference< uno::XInterface > OReportPage::createUnoPage()
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 9eb4f80600c7..efa5d798e934 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1380,10 +1380,6 @@ OUString ORptExport::implConvertNumber(sal_Int32 _nValue)
     return aBuffer.makeStringAndClear();
 }
 
-UniReference < XMLPropertySetMapper > ORptExport::GetCellStylePropertyMapper() const
-{
-    return m_xCellStylesPropertySetMapper;
-}
 
 SvXMLAutoStylePoolP* ORptExport::CreateAutoStylePool()
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 7828eecbb523..77f42bab770f 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -196,7 +196,7 @@ public:
 
     inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; }
 
-    UniReference < XMLPropertySetMapper > GetCellStylePropertyMapper() const;
+    UniReference < XMLPropertySetMapper > GetCellStylePropertyMapper() const { return m_xCellStylesPropertySetMapper;}
 };
 
 /** Exports only settings
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 8e7ca2f4cb4b..6c3a25447502 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -150,10 +150,6 @@ void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
         XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue );
 }
 
-ORptFilter& OControlStyleContext::GetOwnImport() const
-{
-    return m_rImport;
-}
 
 
 OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
@@ -422,10 +418,6 @@ sal_Int32 OReportStylesContext::GetIndex(const sal_Int16 nContextID)
     return -1;
 }
 
-ORptFilter& OReportStylesContext::GetOwnImport() const
-{
-    return m_rImport;
-}
 
 sal_uInt16 OReportStylesContext::GetFamily( const OUString& rFamily ) const
 {
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index ce32875f06ef..ec549b3f6b3a 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -49,7 +49,7 @@ namespace rptxml
         bool                    bConditionalFormatCreated : 1;
         bool                    bParentSet : 1;
 
-        ORptFilter& GetOwnImport() const;
+        ORptFilter& GetOwnImport() const { return m_rImport;}
 
         OControlStyleContext(const OControlStyleContext&);
         void operator =(const OControlStyleContext&);
@@ -106,7 +106,7 @@ namespace rptxml
         mutable ::com::sun::star::uno::Reference <
                         ::com::sun::star::container::XNameContainer > m_xTableStyles;
 
-        ORptFilter& GetOwnImport() const;
+        ORptFilter& GetOwnImport() const { return m_rImport;}
 
         OReportStylesContext(const OReportStylesContext&);
         void operator =(const OReportStylesContext&);
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 56fdfe41a772..fd69b2497713 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -436,13 +436,13 @@ namespace rptui
 
         /** returns the number formatter
         */
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >    getReportNumberFormatter() const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >    getReportNumberFormatter() const { return m_xFormatter;}
 
         /** return the SdrModel of the real model
         *
         * \return
         */
-        ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const;
+        ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_aReportModel;}
 
         inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >  getContext() const { return m_xContext; }
         inline sal_Int16   getZoomValue() const     { return m_nZoomValue; }
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 355219ce4bd4..fde7caf0d79d 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -202,7 +202,7 @@ namespace rptui
         inline bool     empty() const { return m_aSections.empty(); }
         void            SetMode( DlgEdMode m_eMode );
         void            SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
-        OUString   GetInsertObjString() const;
+        OUString   GetInsertObjString() const { return m_sShapeType;}
         /** copies the current selection in this section
         */
         void Copy();
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 1b391814587a..c442fd89c525 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3036,10 +3036,6 @@ void OReportController::insertGraphic()
     }
 }
 
-::boost::shared_ptr<rptui::OReportModel> OReportController::getSdrModel() const
-{
-    return m_aReportModel;
-}
 
 sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
 {
@@ -3980,10 +3976,6 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert
     }
 }
 
-uno::Reference< util::XNumberFormatter > OReportController::getReportNumberFormatter() const
-{
-    return m_xFormatter;
-}
 
 void OReportController::checkChartEnabled()
 {
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 617dc14535b9..5715f3700912 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -351,10 +351,6 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
     m_sShapeType = _sShapeType;
 }
 
-OUString OViewsWindow::GetInsertObjString() const
-{
-    return m_sShapeType;
-}
 
 
 void OViewsWindow::SetMode( DlgEdMode eNewMode )