improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e

10 files changed, 13 insertions, 69 deletions

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 970a0c64ac8e..ffb0021ef37b 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -565,10 +565,6 @@ namespace accessibility
                           rForwarder.LogicToPixel( rRect.BottomRight(), rMapMode ) );
     }
 
-    const Point& AccessibleEditableTextPara::GetEEOffset() const
-    {
-        return maEEOffset;
-    }
 
     void AccessibleEditableTextPara::SetEEOffset( const Point& rOffset )
     {
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 334782ac6d44..155da1286e96 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -561,11 +561,6 @@ namespace accessibility
                                           ( const_cast< AccessibleImageBullet* > (this) )  ) ); // disambiguate hierarchy
     }
 
-    const Point& AccessibleImageBullet::GetEEOffset() const
-    {
-
-        return maEEOffset;
-    }
 
 } // end of namespace accessibility
 
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 33c823d915b7..c18420849089 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -332,10 +332,6 @@ void EditCharAttribField::SetFont( SvxFont& rFont, OutputDevice* )
         rFont.SetColor( *pTxtColor );
 }
 
-const OUString& EditCharAttribField::GetFieldValue() const
-{
-    return aFieldValue;
-}
 
 void EditCharAttribField::SetFieldValue(const OUString& rVal)
 {
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 505d6876917f..81ecb1952b48 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -365,7 +365,7 @@ public:
     Color*&         GetTxtColor()           { return pTxtColor; }
     Color*&         GetFldColor()           { return pFldColor; }
 
-    const OUString& GetFieldValue() const;
+    const OUString& GetFieldValue() const { return aFieldValue;}
     void SetFieldValue(const OUString& rVal);
 
     void Reset();
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 54c96aba59cb..8c48fe98da45 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1002,15 +1002,7 @@ EditLine::~EditLine()
 {
 }
 
-EditLine::CharPosArrayType& EditLine::GetCharPosArray()
-{
-    return aPositions;
-}
 
-const EditLine::CharPosArrayType& EditLine::GetCharPosArray() const
-{
-    return aPositions;
-}
 
 EditLine* EditLine::Clone() const
 {
@@ -1180,10 +1172,6 @@ EditPaM::EditPaM() : pNode(NULL), nIndex(0) {}
 EditPaM::EditPaM(const EditPaM& r) : pNode(r.pNode), nIndex(r.nIndex) {}
 EditPaM::EditPaM(ContentNode* p, sal_Int32 n) : pNode(p), nIndex(n) {}
 
-const ContentNode* EditPaM::GetNode() const
-{
-    return pNode;
-}
 
 
 void EditPaM::SetNode(ContentNode* p)
@@ -1657,10 +1645,6 @@ sal_Int32 ContentNode::Len() const
     return maString.getLength();
 }
 
-const OUString& ContentNode::GetString() const
-{
-    return maString;
-}
 
 void ContentNode::SetChar(sal_Int32 nPos, sal_Unicode c)
 {
@@ -2778,15 +2762,7 @@ bool CharAttribList::HasAttrib( sal_Int32 nStartPos, sal_Int32 nEndPos ) const
     return false;
 }
 
-CharAttribList::AttribsType& CharAttribList::GetAttribs()
-{
-    return aAttribs;
-}
 
-const CharAttribList::AttribsType& CharAttribList::GetAttribs() const
-{
-    return aAttribs;
-}
 
 namespace {
 
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 40d5a9db7536..c9ba4496c3ce 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -222,8 +222,8 @@ public:
     bool HasBoundingAttrib( sal_Int32 nBound ) const;
     bool HasAttrib( sal_Int32 nStartPos, sal_Int32 nEndPos ) const;
 
-    AttribsType& GetAttribs();
-    const AttribsType& GetAttribs() const;
+    AttribsType& GetAttribs() { return aAttribs;}
+    const AttribsType& GetAttribs() const { return aAttribs;}
 
     void Remove(const EditCharAttrib* p);
     void Remove(sal_Int32 nPos);
@@ -279,7 +279,7 @@ public:
     bool IsFeature( sal_Int32 nPos ) const;
 
     sal_Int32 Len() const;
-    const OUString& GetString() const;
+    const OUString& GetString() const { return maString;}
 
     void SetChar(sal_Int32 nPos, sal_Unicode c);
     void Insert(const OUString& rStr, sal_Int32 nPos);
@@ -305,7 +305,7 @@ public:
     EditPaM(const EditPaM& r);
     EditPaM(ContentNode* p, sal_Int32 n);
 
-    const ContentNode* GetNode() const;
+    const ContentNode* GetNode() const { return pNode;}
     ContentNode* GetNode() { return pNode;}
     void SetNode(ContentNode* p);
 
@@ -536,8 +536,8 @@ public:
 
     bool            IsEmpty() const                 { return (nEnd > nStart) ? sal_False : sal_True; }
 
-    CharPosArrayType& GetCharPosArray();
-    const CharPosArrayType& GetCharPosArray() const;
+    CharPosArrayType& GetCharPosArray() { return aPositions;}
+    const CharPosArrayType& GetCharPosArray() const { return aPositions;}
 
     EditLine*       Clone() const;
 
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 9938e9cd964c..be0e9fba153f 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -150,10 +150,6 @@ void ContentInfo::NormalizeString( svl::SharedStringPool& rPool )
     maText = rPool.intern(OUString(maText.getData()));
 }
 
-const svl::SharedString& ContentInfo::GetSharedString() const
-{
-    return maText;
-}
 
 OUString ContentInfo::GetText() const
 {
@@ -676,15 +672,7 @@ void EditTextObjectImpl::DestroyAttrib( XEditAttribute* pAttr )
     delete pAttr;
 }
 
-EditTextObjectImpl::ContentInfosType& EditTextObjectImpl::GetContents()
-{
-    return aContents;
-}
 
-const EditTextObjectImpl::ContentInfosType& EditTextObjectImpl::GetContents() const
-{
-    return aContents;
-}
 
 ContentInfo* EditTextObjectImpl::CreateAndInsertContent()
 {
@@ -1056,10 +1044,6 @@ void EditTextObjectImpl::ChangeStyleSheetName( SfxStyleFamily eFamily,
     ImpChangeStyleSheets( rOldName, eFamily, rNewName, eFamily );
 }
 
-editeng::FieldUpdater EditTextObjectImpl::GetFieldUpdater()
-{
-    return editeng::FieldUpdater(*mpFront);
-}
 
 namespace {
 
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 1e9773c0be02..131a68f99d2a 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_EDITENG_SOURCE_EDITENG_EDITOBJ2_HXX
 
 #include <editeng/editobj.hxx>
+#include <editeng/fieldupdater.hxx>
 #include <editdoc.hxx>
 
 #include <unotools/fontcvt.hxx>
@@ -144,7 +145,7 @@ public:
                         ~ContentInfo();
 
     void NormalizeString( svl::SharedStringPool& rPool );
-    const svl::SharedString& GetSharedString() const;
+    const svl::SharedString& GetSharedString() const { return maText;}
     OUString GetText() const;
     void SetText( const OUString& rStr );
 
@@ -221,8 +222,8 @@ public:
     XEditAttribute*         CreateAttrib( const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd );
     void                    DestroyAttrib( XEditAttribute* pAttr );
 
-    ContentInfosType&       GetContents();
-    const ContentInfosType& GetContents() const;
+    ContentInfosType&       GetContents() { return aContents;}
+    const ContentInfosType& GetContents() const { return aContents;}
     SfxItemPool*            GetPool() const         { return pPool; }
     XParaPortionList*       GetPortionInfo() const  { return pPortionInfo; }
     void                    SetPortionInfo( XParaPortionList* pP )
@@ -255,7 +256,7 @@ public:
         const OUString& rOldName, SfxStyleFamily eOldFamily, const OUString& rNewName, SfxStyleFamily eNewFamily);
     void ChangeStyleSheetName(SfxStyleFamily eFamily, const OUString& rOldName, const OUString& rNewName);
 
-    editeng::FieldUpdater GetFieldUpdater();
+    editeng::FieldUpdater GetFieldUpdater() { return editeng::FieldUpdater(*mpFront);}
 
     bool HasMetric() const { return nMetric != 0xFFFF; }
     sal_uInt16                  GetMetric() const           { return nMetric; }
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 56a7cf95aa58..52196a668426 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -208,10 +208,6 @@ WrongList::WrongList(const WrongList& r) :
 
 WrongList::~WrongList() {}
 
-const std::vector<editeng::MisspellRange>& WrongList::GetRanges() const
-{
-    return maRanges;
-}
 
 void WrongList::SetRanges( const std::vector<editeng::MisspellRange>& rRanges )
 {
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 7f1f5c54027d..797e41b1143e 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -86,7 +86,7 @@ public:
     WrongList(const WrongList& r);
     ~WrongList();
 
-    const std::vector<editeng::MisspellRange>& GetRanges() const;
+    const std::vector<editeng::MisspellRange>& GetRanges() const { return maRanges;}
     void SetRanges( const std::vector<editeng::MisspellRange>& rRanges );
 
     bool IsValid() const;