loplugin:expandablemethodds in include/editeng

Change-Id: Iaf56cb9c16a4cbfb9ab1636228c77d1033a334f5
Reviewed-on: https://gerrit.libreoffice.org/30132
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 14 insertions, 40 deletions

diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index f595104963d7..466a339ae428 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -265,7 +265,7 @@ namespace accessibility
                                                                               GetViewForwarder() );
 
             // offset from shape/cell
-            Point aOffset = GetEEOffset();
+            Point aOffset = maEEOffset;
 
             return awt::Rectangle( aScreenRect.Left() + aOffset.X(),
                                    aScreenRect.Top() + aOffset.Y(),
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 9ae54efb2f62..33939f5f6f23 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -379,7 +379,7 @@ void EditTextObject::Store( SvStream& rOStream ) const
     sal_uInt32 nStructSz = 0;
     rOStream.WriteUInt32( nStructSz );
 
-    StoreData( rOStream );
+    mpImpl->StoreData(rOStream);
 
     sal_uInt64 const nEndPos = rOStream.Tell();
     nStructSz = nEndPos - nStartPos - sizeof( nWhich ) - sizeof( nStructSz );
@@ -410,7 +410,7 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream )
         return nullptr;
 
     EditTextObject* pTxtObj = new EditTextObject(nullptr);
-    pTxtObj->CreateData(rIStream);
+    pTxtObj->mpImpl->CreateData(rIStream);
 
     // Make sure that the stream is left at the correct place.
     std::size_t nFullSz = sizeof( nWhich ) + sizeof( nStructSz ) + nStructSz;
@@ -418,16 +418,6 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream )
     return pTxtObj;
 }
 
-void EditTextObject::StoreData( SvStream& rStrm ) const
-{
-    mpImpl->StoreData(rStrm);
-}
-
-void EditTextObject::CreateData( SvStream& rStrm )
-{
-    mpImpl->CreateData(rStrm);
-}
-
 EditTextObject* EditTextObject::Clone() const
 {
     return new EditTextObject(*this);
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 5e2b91911357..1283f3287532 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -221,13 +221,13 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
     _aFont.SetFamily( aNewFont.GetFamilyType() );
     _aFont.SetStyleName( aNewFont.GetStyleName() );
     _aFont.SetColor( aNewFont.GetColor() );
-    SetSymbol( rCopyFrom.GetSymbol() );
+    SetSymbol( rCopyFrom.cSymbol );
     SetGraphicObject( rCopyFrom.GetGraphicObject() );
-    SetScale( rCopyFrom.GetScale() );
-    SetStart( rCopyFrom.GetStart() );
-    SetStyle( rCopyFrom.GetStyle() );
-    SetPrevText( rCopyFrom.GetPrevText() );
-    SetFollowText( rCopyFrom.GetFollowText() );
+    SetScale( rCopyFrom.nScale );
+    SetStart( rCopyFrom.nStart );
+    SetStyle( rCopyFrom.nStyle );
+    aPrevText = rCopyFrom.aPrevText;
+    aFollowText = rCopyFrom.aFollowText;
     SetFont( _aFont );
 }
 
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 98e17c9d4c6f..7a51ddc069d0 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3655,7 +3655,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             if (!(rVal >>= nVal))
                 return false;
 
-            SetShadingValue( nVal );
+            nShadingValue = nVal;
         }
         break;
     }
@@ -3979,12 +3979,6 @@ void SvxBrushItem::SetGraphicFilter( const OUString& rNew )
 }
 
 
-void SvxBrushItem::SetShadingValue( const sal_Int32 nNew )
-{
-    nShadingValue = nNew;
-}
-
-
 SvxGraphicPosition SvxBrushItem::WallpaperStyle2GraphicPos( WallpaperStyle eStyle )
 {
     SvxGraphicPosition eResult;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8c40e4b7b0c1..c88070c22f26 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -112,9 +112,9 @@ SvParserState SvxRTFParser::CallParser()
     if( !aColorTbl.empty() )
         ClearColorTbl();
     if (!m_FontTable.empty())
-        ClearFontTbl();
+        m_FontTable.clear();
     if (!m_StyleTable.empty())
-        ClearStyleTbl();
+        m_StyleTable.clear();
     if( !aAttrStack.empty() )
         ClearAttrStack();
 
@@ -747,16 +747,6 @@ void SvxRTFParser::ClearColorTbl()
     }
 }
 
-void SvxRTFParser::ClearFontTbl()
-{
-    m_FontTable.clear();
-}
-
-void SvxRTFParser::ClearStyleTbl()
-{
-    m_StyleTable.clear();
-}
-
 void SvxRTFParser::ClearAttrStack()
 {
     for( size_t nCnt = aAttrStack.size(); nCnt; --nCnt )
@@ -1178,7 +1168,7 @@ void SvxRTFItemStackType::MoveFullNode(const EditNodeIdx &rOldNode,
 {
     bool bSameEndAsStart = (pSttNd == pEndNd);
 
-    if (GetSttNodeIdx() == rOldNode.GetIdx())
+    if (pSttNd->GetIdx() == rOldNode.GetIdx())
     {
         delete pSttNd;
         pSttNd = rNewNode.Clone();
@@ -1186,7 +1176,7 @@ void SvxRTFItemStackType::MoveFullNode(const EditNodeIdx &rOldNode,
             pEndNd = pSttNd;
     }
 
-    if (!bSameEndAsStart && GetEndNodeIdx() == rOldNode.GetIdx())
+    if (!bSameEndAsStart && pEndNd->GetIdx() == rOldNode.GetIdx())
     {
         delete pEndNd;
         pEndNd = rNewNode.Clone();