From 9ab408277b8c68f3d987a36744171fc0ef1de2f6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 20 Oct 2016 09:39:07 +0200 Subject: loplugin:expandablemethodds in sw(part1) Change-Id: Ic3a558e6b646b6b6bc4cb7e09a00695553023534 Reviewed-on: https://gerrit.libreoffice.org/30073 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sw/inc/PostItMgr.hxx | 1 - sw/inc/SwNumberTree.hxx | 5 ----- sw/inc/cellatr.hxx | 3 +-- sw/inc/ddefld.hxx | 1 - sw/inc/docary.hxx | 1 - sw/inc/docufld.hxx | 2 -- sw/inc/expfld.hxx | 5 ----- sw/inc/flddat.hxx | 7 ++----- sw/inc/fmtfordr.hxx | 2 -- sw/inc/format.hxx | 3 --- sw/inc/grfatr.hxx | 9 ++++----- sw/inc/hhcwrp.hxx | 3 --- sw/inc/htmltbl.hxx | 2 -- sw/inc/shellio.hxx | 2 -- sw/inc/swtable.hxx | 2 -- sw/inc/unotbl.hxx | 1 - sw/inc/usrfld.hxx | 4 ---- sw/inc/view.hxx | 2 -- sw/inc/viewopt.hxx | 2 -- 19 files changed, 7 insertions(+), 50 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index e6fb35d5c0ca..85f1133cd33a 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -212,7 +212,6 @@ class SwPostItMgr: public SfxListener bool IsShowAnchor() { return mbIsShowAnchor;} unsigned long GetSidebarWidth(bool bPx = false) const; unsigned long GetSidebarBorderWidth(bool bPx = false) const; - unsigned long GetNoteWidth(); void PrepareView(bool bIgnoreCount = false); diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 3293963ed87a..28281fd887ca 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -577,11 +577,6 @@ protected: */ SwNumberTreeNode * CreatePhantom(); - /** - Set if this node is a phantom. - */ - void SetPhantom(); - /** Return if phantoms are counted. */ diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 22e4efd826fb..f07345b93b43 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -42,12 +42,11 @@ public: inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr ) { SetValue( rAttr.GetValue() ); - SetAutoFlag( rAttr.GetAutoFlag() ); + bAuto = rAttr.bAuto; return *this; } bool GetAutoFlag() const { return bAuto; } - void SetAutoFlag( bool bFlag ) { bAuto = bFlag; } }; class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index e663f613e287..c79e65a46d7e 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -64,7 +64,6 @@ public: bool IsDeleted() const { return bDeleted; } void SetDeleted( bool b ) { bDeleted = b; } - void UpdateNow() { refLink->Update(); } void Disconnect() { refLink->Disconnect(); } const ::sfx2::SvBaseLink& GetBaseLink() const { return *refLink; } diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 105cae3786f8..58ee21f2fdeb 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -190,7 +190,6 @@ public: // frees all SwFrameFormat! virtual ~SwFrameFormats() override; - void clear() { return m_Array.clear(); } bool empty() const { return m_Array.empty(); } size_t size() const { return m_Array.size(); } diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 2736161e381d..b3685bcdb826 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -193,7 +193,6 @@ public: virtual SwField* Copy() const override; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - const OUString& GetContent() const { return aContent; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; @@ -220,7 +219,6 @@ public: virtual SwField* Copy() const override; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - const OUString& GetContent() const { return aContent; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 618af04ba462..38344e151448 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -100,7 +100,6 @@ public: virtual void SetValue( const double& rVal ) override; virtual void SetLanguage(sal_uInt16 nLng) override; - inline const OUString& GetExpStr() const; inline void ChgExpStr(const OUString& rExpand); /// Called by formatting. @@ -132,9 +131,6 @@ public: inline void SwGetExpField::ChgExpStr(const OUString& rExpand) { sExpand = rExpand;} -inline const OUString& SwGetExpField::GetExpStr() const - { return sExpand; } - /// Called by formatting. inline bool SwGetExpField::IsInBodyText() const { return bIsInBodyText; } @@ -406,7 +402,6 @@ public: virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nType) override; - const OUString& GetExpStr() const { return sExpand; } void ChgExpStr(const OUString& rStr) { sExpand = rStr; } void CalcField( SwTableCalcPara& rCalcPara ); diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index e4f7643a2d56..0fd946059e5e 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -52,16 +52,13 @@ public: SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD, sal_uLong nFormat = 0, sal_uInt16 nLng = 0); - virtual sal_uInt16 GetSubType() const override; + virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nSub) override; virtual double GetValue() const override; virtual void SetPar2(const OUString& rStr) override; - virtual OUString GetPar2() const override; - - inline bool IsDate() const - { return (nSubType & DATEFLD) != 0; } + virtual OUString GetPar2() const override; inline void SetOffset(long nMinutes) { nOffset = nMinutes; } inline long GetOffset() const { return nOffset; } diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index d3416adf3998..5a09efbee57b 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -42,8 +42,6 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; - - SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } }; inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy ) diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 21e09108c00a..21f8db525627 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -155,9 +155,6 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText ) const { m_aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); } - /// Format-ID for reading/writing: - void ResetWritten() { m_bWritten = false; } - /// Query / set AutoFormat-flag. bool IsAuto() const { return m_bAutoFormat; } void SetAuto( bool bNew ) { m_bAutoFormat = bNew; } diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index f4a4ad137062..de586e9c7a60 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -202,10 +202,10 @@ public: {} inline SwGammaGrf& operator=( const SwGammaGrf& rCopy ) - { - SetValue( rCopy.GetValue() ); - return *this; - } + { + nValue = rCopy.nValue; + return *this; + } // pure virtual methods from SfxEnumItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -222,7 +222,6 @@ public: sal_uInt8 nMemberId ) override; const double& GetValue() const { return nValue; } - void SetValue( const double& rVal ) { nValue = rVal; } }; class SwInvertGrf: public SfxBoolItem diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 59321343c6f1..3248b62daab7 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -69,9 +69,6 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion SwPaM *pCursor ); void ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ); - inline bool IsDrawObj() { return m_bIsDrawObj; } - inline void SetDrawObj( bool bNew ) { m_bIsDrawObj = bNew; } - protected: virtual void GetNextPortion( OUString& rNextPortion, LanguageType& rLangOfPortion, diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 12ca36e911cd..a6564a235288 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -242,8 +242,6 @@ class SwHTMLTableLayout SwFrameFormat *FindFlyFrameFormat() const; const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); } - void ClearPass1Info() { m_nMin = m_nMax = 0; } - void Resize_( sal_uInt16 nAbsAvail, bool bRecalc ); DECL_LINK( DelayedResize_Impl, Timer*, void ); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index cf70536a1820..ce171924f106 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -167,8 +167,6 @@ public: bool HasGlossaries( const Reader& ); bool ReadGlossaries( const Reader&, SwTextBlocks&, bool bSaveRelFiles ); - const OUString& GetBaseURL() const { return sBaseURL;} - protected: void SetBaseURL( const OUString& rURL ) { sBaseURL = rURL; } void SetSkipImages( bool bSkipImages ) { mbSkipImages = bSkipImages; } diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 6e4251bbbfb7..96d212e68f5d 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -115,8 +115,6 @@ protected: bool m_bDontChangeModel; #endif - bool IsModifyLocked(){ return m_bModifyLocked;} - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; public: diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 329e758afd07..8bb80366d9bf 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -196,7 +196,6 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - const SwTableLine* GetTableRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); }; diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 325c0ae9ab70..45de281191c3 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -47,7 +47,6 @@ public: void SetContent( const OUString& rStr, sal_uInt32 nFormat = 0 ); inline bool IsValid() const; - inline void ChgValid( bool bNew ); double GetValue(SwCalc& rCalc); // Recalculate member nValue. inline double GetValue() const; @@ -69,9 +68,6 @@ protected: inline bool SwUserFieldType::IsValid() const { return bValidValue; } -inline void SwUserFieldType::ChgValid( bool bNew ) - { bValidValue = bNew; } - inline double SwUserFieldType::GetValue() const { return nValue; } diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 0ef086c0c3d4..536e75c63872 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -576,8 +576,6 @@ public: void SetCursorAtTop( bool bFlag, bool bCenter = false ) { m_bTopCursor = bFlag; m_bCenterCursor = bCenter; } - bool IsCursorAtTop() const { return m_bTopCursor; } - bool IsCursorAtCenter() const { return m_bCenterCursor; } bool JumpToSwMark( const OUString& rMark ); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index e3e2eec30bf0..63ba55c5fdee 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -198,8 +198,6 @@ public: static void Init( vcl::Window *pWin ); // Initializing of static data. - static sal_uInt16 GetPixelTwips() { return m_nPixelTwips; } - inline ViewOptFlags1 GetCoreOptions() const {return m_nCoreOptions;} inline void SetUIOptions( const SwViewOption& ); -- cgit