loplugin:expandablemethodds in sw(part3)

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

20 files changed, 25 insertions, 76 deletions

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d5d62a18c8c5..9dd13c1b619a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -3203,7 +3203,7 @@ void SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo
 
     //Create a destination storage for the microsoft control
     OUStringBuffer sStorageName;
-    sal_uInt32 nObjId = GenerateObjectID();
+    sal_uInt32 nObjId = ++mnObjectId;
     sStorageName.append('_').append( static_cast<sal_Int64>( nObjId ));
     tools::SvRef<SotStorage> xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear());
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 491694c8e9b1..d2d2b47ea6a5 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -384,7 +384,7 @@ static bool lcl_isFontsizeItem( const SfxPoolItem& rItem )
 
 void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
 {
-    m_rExport.AttrOutput().RTLAndCJKState( IsCharRTL(), GetScript() );
+    m_rExport.AttrOutput().RTLAndCJKState( mbCharIsRTL, GetScript() );
 
     /*
      Depending on whether text is in CTL/CJK or Western, get the id of that
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 9fdf61a63028..272aa7ac3113 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1499,7 +1499,6 @@ public:
 
     sal_Int32 WhereNext() const { return nAktSwPos; }
     sal_uInt16 GetScript() const { return mnScript; }
-    bool IsCharRTL() const { return mbCharIsRTL; }
     bool IsParaRTL() const { return mbParaIsRTL; }
     rtl_TextEncoding GetCharSet() const { return meChrSet; }
     OUString GetSnippet(const OUString &rStr, sal_Int32 nAktPos,
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f6add22360f6..d307ecb80753 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4405,7 +4405,7 @@ void GiveNodePageDesc(SwNodeIndex &rIdx, const SwFormatPageDesc &rPgDesc,
 SwFormatPageDesc wwSectionManager::SetSwFormatPageDesc(mySegIter &rIter,
     mySegIter &rStart, bool bIgnoreCols)
 {
-    if (IsNewDoc() && rIter == rStart)
+    if (mrReader.m_bNewDoc && rIter == rStart)
     {
         rIter->mpPage =
             mrReader.m_rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD);
@@ -4441,11 +4441,6 @@ SwFormatPageDesc wwSectionManager::SetSwFormatPageDesc(mySegIter &rIter,
     return aRet;
 }
 
-bool wwSectionManager::IsNewDoc() const
-{
-    return mrReader.m_bNewDoc;
-}
-
 void wwSectionManager::InsertSegments()
 {
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 39c7df745e1f..54c9fd14e798 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -730,7 +730,6 @@ public:
         css::uno::Reference< css::drawing::XShape > *pShapeRef,
         bool bFloatingCtrl=false );
 private:
-    sal_uInt32 GenerateObjectID() { return ++mnObjectId; }
     SwPaM *pPaM;
     sal_uInt32 mnObjectId;
 };
@@ -854,7 +853,6 @@ private:
         sal_uInt32 nNetWidth);
     bool SectionIsProtected(const wwSection &rSection) const;
     void SetLeftRight(wwSection &rSection);
-    bool IsNewDoc() const;
     /*
      The segment we're inserting, the start of the segments container, and the
      nodeindex of where we want the page break to (normally the segments start
@@ -1526,7 +1524,6 @@ private:
     bool InEqualApo(int nLvl) const;
     bool InLocalApo() const { return InEqualApo(m_nInTable); }
     bool InEqualOrHigherApo(int nLvl) const;
-    bool InAnyApo() const { return InEqualOrHigherApo(1); }
     void TabCellEnd();
     void StopTable();
     bool IsInvalidOrToBeMergedTabCell() const;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 2e5b820ca806..5f5c4f82b412 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -564,7 +564,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
     if (!bTestAllowed)
         return aRet;
 
-    aRet.mbStartApo = bNowApo && !InAnyApo(); // APO-start
+    aRet.mbStartApo = bNowApo && !InEqualOrHigherApo(1); // APO-start
     aRet.mbStopApo = InEqualOrHigherApo(nCellLevel) && !bNowApo;  // APO-end
 
     //If it happens that we are in a table, then if it's not the first cell
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index af32be2e83d0..b75d96ed5617 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -404,7 +404,7 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe
 
 bool Customization::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
 {
-    if ( GetTBIDForTB() == 0x25 )
+    if ( tbidForTBD == 0x25 )
         return ImportMenu( rWrapper, helper );
     if ( !customizationDataCTB.get() )
         return false;
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 5dd318177faf..2ee0af5f6419 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -137,7 +137,6 @@ public:
 #if OSL_DEBUG_LEVEL > 1
     virtual void Print( FILE* ) override;
 #endif
-    sal_Int32 GetTBIDForTB(){ return tbidForTBD; }
     SwCTB*  GetCustomizationData() { return customizationDataCTB.get(); };
 };
 
diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx
index c6c22a1419f5..e9096a5a7230 100644
--- a/sw/source/filter/xml/xmlbrshe.hxx
+++ b/sw/source/filter/xml/xmlbrshe.hxx
@@ -30,8 +30,6 @@ class SwXMLBrushItemExport
 {
     SwXMLExport&        rExport;
 
-protected:
-
     SwXMLExport& GetExport() { return rExport; }
 public:
 
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index abbb8f5bc6c5..50c002e8f179 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -98,12 +98,6 @@ SwXMLExport::SwXMLExport(
     InitItemExport();
 }
 
-void SwXMLExport::setBlockMode()
-{
-    m_bBlock = true;
-
-}
-
 sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
 {
     if( !GetModel().is() )
@@ -126,7 +120,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
                 if( auto b = o3tl::tryAccess<bool>(aAny) )
                 {
                     if( *b )
-                        setBlockMode();
+                        m_bBlock = true;
                 }
             }
         }
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 1f405ce43d5d..bc1ced23c22b 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -97,7 +97,6 @@ class SwXMLExport : public SvXMLExport
     virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
     virtual sal_Int32 GetDocumentSpecificSettings( std::list< SettingsGroup >& _out_rSettings ) override;
 
-    void setBlockMode();
 private:
     void DeleteTableLines();
 protected:
@@ -122,11 +121,8 @@ public:
     void ExportTableAutoStyles( const SwTableNode& rTableNd );
     void ExportTable( const SwTableNode& rTableNd );
 
-    SvXMLExportItemMapper& GetTableItemMapper() { return *m_pTableItemMapper; }
-
     bool IsShowProgress() const { return m_bShowProgress; }
     void SetShowProgress( bool b ) { m_bShowProgress = b; }
-    bool IsBlockMode() const { return m_bBlock; }
 
     // XUnoTunnel
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 5440a19e1ef8..b65cb0dc525b 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -387,7 +387,6 @@ public:
     // The item set may be empty!
     SfxItemSet *GetItemSet() { return pItemSet; }
 
-    const OUString& GetMasterPageName() const { return sMasterPageName; }
     bool HasMasterPageName() const { return bHasMasterPageName; }
 
     bool IsPageDescConnected() const { return bPageDescConnected; }
@@ -551,7 +550,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc()
     // #i40788# - first determine the display name of the page style,
     // then map this name to the corresponding user interface name.
     OUString sName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_MASTER_PAGE,
-                                             GetMasterPageName() );
+                                             sMasterPageName );
     SwStyleNameMapper::FillUIName( sName,
                                    sName,
                                    SwGetPoolIdFromName::PageDesc,
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 6717b2c61afc..7cb3f66b4350 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -148,10 +148,8 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami
 
         if( xItemMap.Is() )
         {
-            SvXMLExportItemMapper& rItemMapper = GetTableItemMapper();
-            rItemMapper.setMapEntries( xItemMap );
-
-            GetTableItemMapper().exportXML( *this,
+            m_pTableItemMapper->setMapEntries( xItemMap );
+            m_pTableItemMapper->exportXML( *this,
                                            rFormat.GetAttrSet(),
                                            GetTwipUnitConverter(),
                                            ePropToken );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 4ee54299d8a2..a72fd26e1a06 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -445,16 +445,6 @@ void SwXMLImport::setStyleInsertMode( SfxStyleFamily nFamilies,
     m_bLoadDoc = false;
 }
 
-void SwXMLImport::setBlockMode( )
-{
-    m_bBlock = true;
-}
-
-void SwXMLImport::setOrganizerMode( )
-{
-    m_bOrganizerMode = true;
-}
-
 namespace
 {
     class theSwXMLImportUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXMLImportUnoTunnelId > {};
@@ -571,7 +561,7 @@ void SwXMLImport::startDocument()
             if( auto b = o3tl::tryAccess<bool>(aAny) )
             {
                 if( *b )
-                    setBlockMode();
+                    m_bBlock = true;
             }
         }
 
@@ -583,7 +573,7 @@ void SwXMLImport::startDocument()
             if( auto b = o3tl::tryAccess<bool>(aAny) )
             {
                 if( *b )
-                    setOrganizerMode();
+                    m_bOrganizerMode = true;
             }
         }
     }
@@ -978,7 +968,7 @@ XMLTextImportHelper* SwXMLImport::CreateTextImport()
     return new SwXMLTextImportHelper( GetModel(), *this, getImportInfo(),
                                       IsInsertMode(),
                                       IsStylesOnlyMode(),
-                                      IsBlockMode(), IsOrganizerMode(),
+                                      IsBlockMode(), m_bOrganizerMode,
                                       m_bPreserveRedlineFlags );
 }
 
@@ -1000,7 +990,7 @@ SvXMLImportContext *SwXMLImport::CreateFontDeclsContext(
 }
 void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps)
 {
-    if (IsInsertMode() || IsStylesOnlyMode() || IsBlockMode() || IsOrganizerMode() || !GetModel().is() )
+    if (IsInsertMode() || IsStylesOnlyMode() || IsBlockMode() || m_bOrganizerMode || !GetModel().is() )
         return;
 
     // this method will modify the document directly -> lock SolarMutex
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 17a54b99ab9f..621f35b5873b 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -99,8 +99,6 @@ class SwXMLImport: public SvXMLImport
                      const css::uno::Reference< css::text::XTextRange > & rInsertPos );
     void         setStyleInsertMode( SfxStyleFamily nFamilies,
                                      bool bOverwrite );
-    void         setBlockMode();
-    void         setOrganizerMode();
 
 protected:
 
@@ -160,9 +158,7 @@ public:
     bool IsInsertMode() const { return m_bInsert; }
     bool IsStylesOnlyMode() const { return !m_bLoadDoc; }
     bool IsBlockMode() const { return m_bBlock; }
-    bool IsOrganizerMode() const { return m_bOrganizerMode; }
 
-    inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
     inline const SvXMLImportItemMapper& GetTableItemMapper() const;
     inline       SvXMLImportItemMapper& GetTableItemMapper();
     SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix,
@@ -198,11 +194,6 @@ public:
     SwDoc* getDoc();
 };
 
-inline const SvXMLUnitConverter& SwXMLImport::GetTwipUnitConverter() const
-{
-    return *m_pTwipUnitConv;
-}
-
 inline const SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper() const
 {
     return *m_pTableItemMapper;
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 42c26d2d391f..f13405ab6e3a 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -376,7 +376,7 @@ SvXMLImportContext *SwXMLImport::CreateTableItemImportContext(
     return new SwXMLItemSetContext_Impl( *this, nPrefix, rLocalName,
                                             xAttrList, rItemSet,
                                             GetTableItemMapper(),
-                                            GetTwipUnitConverter() );
+                                            *m_pTwipUnitConv );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 75ba494e69e3..724ca5e9e369 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -43,7 +43,7 @@ using namespace ::xmloff::token;
 uno::Reference<document::XDocumentProperties>
 SwXMLImport::GetDocumentProperties() const
 {
-    if (IsOrganizerMode() || IsStylesOnlyMode() ||
+    if (m_bOrganizerMode || IsStylesOnlyMode() ||
         IsBlockMode() || IsInsertMode())
     {
         return nullptr;
@@ -160,7 +160,7 @@ void SwXMLExport::ExportMeta_()
 {
     SvXMLExport::ExportMeta_();
 
-    if( !IsBlockMode() )
+    if( !m_bBlock )
     {
 
         if( IsShowProgress() )
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index b440533e24b2..bb91b4362091 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -165,8 +165,6 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base
     long    m_nCurrentRow;
     bool    m_bModified;
 
-    void                            SetModified() {m_bModified = true;}
-
 protected:
     virtual bool                    SeekRow( long nRow ) override;
     virtual void                    PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const override;
@@ -3991,7 +3989,7 @@ void SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
 
 bool SwEntryBrowseBox::SaveModified()
 {
-    SetModified();
+    m_bModified = true;
     const size_t nRow = GetCurRow();
     const sal_uInt16 nCol = GetCurColumnId();
 
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index 5d6a2ad1df9b..c3a6ea8a863d 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -72,12 +72,8 @@ public:
     {}
 
     // data access
-    const basegfx::B2DPolygon& getTriangle() const { return maTriangle; }
     const basegfx::B2DPolygon& getLine() const { return maLine; }
-    const basegfx::B2DPolygon& getLineTop() const { return maLineTop; }
-    AnchorState getAnchorState() const { return maAnchorState; }
     const basegfx::BColor& getColor() const { return maColor; }
-    double getDiscreteLineWidth() const { return mfDiscreteLineWidth; }
     bool getLineSolid() const { return mbLineSolid; }
 
     virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const override;
@@ -97,7 +93,7 @@ drawinglayer::primitive2d::Primitive2DContainer AnchorPrimitive::create2DDecompo
         // create triangle
         const drawinglayer::primitive2d::Primitive2DReference aTriangle(
             new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
-                basegfx::B2DPolyPolygon(getTriangle()),
+                basegfx::B2DPolyPolygon(maTriangle),
                 getColor()));
 
         aRetval.push_back(aTriangle);
@@ -106,7 +102,7 @@ drawinglayer::primitive2d::Primitive2DContainer AnchorPrimitive::create2DDecompo
     // prepare view-independent LineWidth and color
     const drawinglayer::attribute::LineAttribute aLineAttribute(
         getColor(),
-        getDiscreteLineWidth() * getDiscreteUnit());
+        mfDiscreteLineWidth * getDiscreteUnit());
 
     if ( AS_ALL == maAnchorState ||
          AS_START == maAnchorState )
@@ -151,7 +147,7 @@ drawinglayer::primitive2d::Primitive2DContainer AnchorPrimitive::create2DDecompo
         // the other parts are created
         const drawinglayer::primitive2d::Primitive2DReference aLineTop(
             new drawinglayer::primitive2d::PolygonStrokePrimitive2D(
-                getLineTop(),
+                maLineTop,
                 aLineAttribute));
 
         aRetval.push_back(aLineTop);
@@ -166,12 +162,12 @@ bool AnchorPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive
     {
         const AnchorPrimitive& rCompare = static_cast< const AnchorPrimitive& >(rPrimitive);
 
-        return (getTriangle() == rCompare.getTriangle()
+        return (maTriangle == rCompare.maTriangle
             && getLine() == rCompare.getLine()
-            && getLineTop() == rCompare.getLineTop()
-            && getAnchorState() == rCompare.getAnchorState()
+            && maLineTop == rCompare.maLineTop
+            && maAnchorState == rCompare.maAnchorState
             && getColor() == rCompare.getColor()
-            && getDiscreteLineWidth() == rCompare.getDiscreteLineWidth()
+            && mfDiscreteLineWidth == rCompare.mfDiscreteLineWidth
             && getLineSolid() == rCompare.getLineSolid());
     }
 
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 8cdd2b8155ad..5b450303a053 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -232,7 +232,6 @@ public:
     const Point& GetLastPos() const { return aLastPos; }
     void SetLastPos( const Point& rNew ) { aLastPos = rNew; }
     void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); }
-    const Point& GetPos() { return pHdl->GetPos(); }
     const Point& GetHdlPos() { return aHdlPos; }
     SdrHdl* GetHdl() const { return pHdl; }
     void ChgHdl( SdrHdl* pNew )
@@ -245,7 +244,7 @@ public:
     }
     const Point GetPosForHitTest( const OutputDevice& rOut )
     {
-        Point aHitTestPos( GetPos() );
+        Point aHitTestPos( pHdl->GetPos() );
         aHitTestPos = rOut.LogicToPixel( aHitTestPos );
         if ( bTopRightHandle )
         {