From dca61b588a2426cfe9a18e4a1074b380e42884d7 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 8 Nov 2016 09:33:15 +0200
Subject: loplugin:expandablemethods in lotuswordpro..package

Change-Id: Ic9827c998f4f78775fdf5c1eaf9d4749d4986102
Reviewed-on: https://gerrit.libreoffice.org/30682
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 lotuswordpro/source/filter/lwpcolor.cxx       | 24 ++++++++++--------------
 lotuswordpro/source/filter/lwpcolor.hxx       |  1 -
 lotuswordpro/source/filter/lwpdivinfo.cxx     |  2 +-
 lotuswordpro/source/filter/lwpdivinfo.hxx     |  5 -----
 lotuswordpro/source/filter/lwpframelayout.cxx |  7 +------
 lotuswordpro/source/filter/lwpframelayout.hxx |  1 -
 lotuswordpro/source/filter/lwpfribmark.cxx    | 14 ++------------
 lotuswordpro/source/filter/lwpfribmark.hxx    |  2 --
 lotuswordpro/source/filter/lwpobjstrm.cxx     |  8 +-------
 lotuswordpro/source/filter/lwpobjstrm.hxx     |  1 -
 lotuswordpro/source/filter/lwptablelayout.hxx |  3 +--
 lotuswordpro/source/filter/lwptaboverride.hxx |  9 +--------
 12 files changed, 17 insertions(+), 60 deletions(-)

(limited to 'lotuswordpro')

diff --git a/lotuswordpro/source/filter/lwpcolor.cxx b/lotuswordpro/source/filter/lwpcolor.cxx
index b475ed365a9a..47eb247da16a 100644
--- a/lotuswordpro/source/filter/lwpcolor.cxx
+++ b/lotuswordpro/source/filter/lwpcolor.cxx
@@ -59,17 +59,6 @@
  ************************************************************************/
 
 #include "lwpcolor.hxx"
-/**
- * @descr       read color and then resolve the RGB values
-*/
-void LwpColor::Read(LwpObjectStream *pStrm)
-{
-    m_nRed = pStrm->QuickReaduInt16();
-    m_nGreen = pStrm->QuickReaduInt16();
-    m_nBlue = pStrm->QuickReaduInt16();
-    m_nExtra = pStrm->QuickReaduInt16();
-    ResolveRGB();
-}
 
 /**
  * @descr       return the BGR format
@@ -80,11 +69,18 @@ sal_uInt32 LwpColor::To24Color()
                 (m_nGreen & 0xFF00) |
                 (static_cast<sal_uInt32>((m_nBlue & 0xFF00) << 8)));
 }
+
 /**
- * @descr       resolver RGB values per the extra bytes
+ * @descr       read color and then resolve the RGB values
 */
-void LwpColor::ResolveRGB()
+void LwpColor::Read(LwpObjectStream *pStrm)
 {
+    m_nRed = pStrm->QuickReaduInt16();
+    m_nGreen = pStrm->QuickReaduInt16();
+    m_nBlue = pStrm->QuickReaduInt16();
+    m_nExtra = pStrm->QuickReaduInt16();
+
+    // resolve RGB values per the extra bytes
     switch(m_nExtra)
     {
         case AGLRGB_RGB:
@@ -135,7 +131,7 @@ void LwpColor::ResolveRGB()
             m_nRed = 0;
             m_nGreen = 0;
             m_nBlue = 0;
-        }
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpcolor.hxx b/lotuswordpro/source/filter/lwpcolor.hxx
index 61d7beb1e06e..9c3469382ba4 100644
--- a/lotuswordpro/source/filter/lwpcolor.hxx
+++ b/lotuswordpro/source/filter/lwpcolor.hxx
@@ -99,7 +99,6 @@ private:
           AGLRGB_INVALID = 99,
           AGLRGB_TRANSPARENT = 100
     };
-    void ResolveRGB();
 };
 inline sal_uInt16 LwpColor::GetRed()
 {
diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx b/lotuswordpro/source/filter/lwpdivinfo.cxx
index efa32f69561a..d3d50ce3b882 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.cxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.cxx
@@ -155,7 +155,7 @@ void LwpDivInfo::GetNumberOfPages(sal_uInt16 & nPageno)
 
 sal_uInt16 LwpDivInfo::GetMaxNumberOfPages()
 {
-    LwpDocument* pDiv = GetDivision();
+    LwpDocument* pDiv = dynamic_cast<LwpDocument*>(m_ParentID.obj().get());
     if(!pDiv)
         return 0;
     LwpDLVListHeadTailHolder* pHeadTail = dynamic_cast<LwpDLVListHeadTailHolder*>(pDiv->GetPageHintsID().obj().get());
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index fb1adca2ae4a..2fdd96dc67e7 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -83,7 +83,6 @@ public:
     inline bool IsOleDivision();
     inline bool IsScrollable();
     inline bool IsGotoable();
-    inline LwpDocument* GetDivision();
     void GetNumberOfPages(sal_uInt16& nPageno);
     sal_uInt16 GetMaxNumberOfPages();
 protected:
@@ -153,10 +152,6 @@ inline bool LwpDivInfo::IsGotoable()
     return HasContents() && (IsScrollable() || IsOleDivision());
 }
 
-inline LwpDocument* LwpDivInfo::GetDivision()
-{
-    return dynamic_cast<LwpDocument*>(m_ParentID.obj().get());
-}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index 7f593e4a2cd7..ef95f678ad2a 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1171,14 +1171,9 @@ void LwpDropcapLayout::XFConvert(XFContentContainer* pCont)
     }
 }
 
-LwpStory* LwpDropcapLayout::GetContentStory()
-{
-    return static_cast<LwpStory*>(m_Content.obj(VO_STORY).get());
-}
-
 void LwpDropcapLayout::RegisterStyle(LwpFoundry* pFoundry)
 {
-    LwpStory* pStory = GetContentStory();
+    LwpStory* pStory = static_cast<LwpStory*>(m_Content.obj(VO_STORY).get());
     if (pStory)
     {
         pStory->SetDropcapFlag(true);
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index 603f0d33d15c..99b3a215ccc3 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -191,7 +191,6 @@ public:
     sal_uInt16 GetLines(){return m_nLines;}
     void SetChars(sal_uInt32 nChars){ m_nChars += nChars;}
     sal_uInt32 GetChars() const {return m_nChars;}
-    LwpStory* GetContentStory();
     void RegisterStyle(LwpFoundry* pFoundry);
     void RegisterStyle() override;
 protected:
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index 7b77d277eb76..a71a3921d462 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -86,17 +86,12 @@ void LwpFribCHBlock::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/)
     m_nType = pObjStrm->QuickReaduInt8();
 }
 
-LwpCHBlkMarker* LwpFribCHBlock::GetMarker()
-{
-    return dynamic_cast<LwpCHBlkMarker*>(m_objMarker.obj().get());
-}
-
 void LwpFribCHBlock::XFConvert(XFContentContainer* pXFPara,LwpStory* pStory)
 {
     sal_uInt8 type = GetType();
     if (!pStory)
         return;
-    LwpCHBlkMarker* pMarker = GetMarker();
+    LwpCHBlkMarker* pMarker = dynamic_cast<LwpCHBlkMarker*>(m_objMarker.obj().get());
 
     if (!pMarker)
         return;
@@ -1401,11 +1396,6 @@ LwpFribRubyMarker::LwpFribRubyMarker( LwpPara* pPara )
 {
 }
 
-LwpRubyMarker* LwpFribRubyMarker::GetMarker()
-{
-    return dynamic_cast<LwpRubyMarker*>(m_objMarker.obj(VO_RUBYMARKER).get());
-}
-
 void LwpFribRubyMarker::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/)
 {
     m_objMarker.ReadIndexed(pObjStrm);
@@ -1415,7 +1405,7 @@ void LwpFribRubyMarker::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/)
 void LwpFribRubyMarker::XFConvert(XFContentContainer* pXFPara)
 {
     sal_uInt8 type = GetType();
-    LwpRubyMarker* pMarker = GetMarker();
+    LwpRubyMarker* pMarker = dynamic_cast<LwpRubyMarker*>(m_objMarker.obj(VO_RUBYMARKER).get());
 
     if (type == MARKER_START)
     {
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx
index da2ee48552d8..9ea3730fbeda 100644
--- a/lotuswordpro/source/filter/lwpfribmark.hxx
+++ b/lotuswordpro/source/filter/lwpfribmark.hxx
@@ -76,7 +76,6 @@ public:
         {}
     virtual ~LwpFribCHBlock() override {}
     void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
-    LwpCHBlkMarker* GetMarker();
     enum{MARKER_START=1,MARKER_END,MARKER_NONE};
     void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
 private:
@@ -149,7 +148,6 @@ public:
     explicit LwpFribRubyMarker( LwpPara* pPara );
     virtual ~LwpFribRubyMarker() override {}
     void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
-    LwpRubyMarker* GetMarker();
     enum{MARKER_START=1,MARKER_END,MARKER_NONE};
     void XFConvert(XFContentContainer* pXFPara);
     void RegisterStyle(LwpFoundry* pFoundry) override;
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index bb7e255059b3..8a28c9fd214a 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -69,13 +69,7 @@ LwpObjectStream::LwpObjectStream(LwpSvStream *pStrm, bool isCompressed, sal_uInt
     m_pStrm(pStrm), m_bCompressed(isCompressed)
 {
     assert(size<IO_BUFFERSIZE);
-    ReadStream();
-}
-/**
- * @descr  read object data from stream
- */
-void LwpObjectStream::ReadStream()
-{
+    // read object data from stream
     if(m_nBufSize == 0)
     {
         m_pContentBuf = nullptr;
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx
index 826bd8e757b4..918659da82b4 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.hxx
@@ -105,7 +105,6 @@ public:
     void ReadComplete();
     LwpSvStream *GetStream();
 private:
-    void ReadStream();
     void Read2Buffer();
     sal_uInt8* AllocBuffer(sal_uInt16 size);
     static sal_uInt16 DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, sal_uInt16 Size);
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index 16d3b09d3497..48e00c871b07 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -182,9 +182,8 @@ protected:
     bool IsSizeRightToContent();
     bool IsJustifiable();
     LwpFrame* m_pFrame;
-
-private:
 };
+
 /**
  * @brief
  * VO_COLUMNLAYOUT object
diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx
index 4ebac3cd72fc..c5eeaa893d20 100644
--- a/lotuswordpro/source/filter/lwptaboverride.hxx
+++ b/lotuswordpro/source/filter/lwptaboverride.hxx
@@ -88,7 +88,6 @@ public:
     }
 
     inline LwpObjectID& GetTabRackID();
-    inline bool IsTabRackOverridden();
     inline void Override(LwpTabOverride* pOther);
 
 protected:
@@ -114,17 +113,11 @@ inline void LwpTabOverride::Override(LwpTabOverride* pOther)
 {
     if (m_nApply & TO_TABRACK)
     {
-        if (IsTabRackOverridden())
-            //m_aTabRackID = *(pOther->GetTabRackID());
+        if ((m_nOverride & TO_TABRACK) != 0)
             pOther->m_aTabRackID = GetTabRackID();
     }
 }
 
-inline bool LwpTabOverride::IsTabRackOverridden()
-{
-    return (m_nOverride & TO_TABRACK) != 0;
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit