diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-21 12:15:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:29 +0200 |
commit | f61dbc302975aaa253b00ea6b141bb12474b3c95 (patch) | |
tree | 7150ea10f0111c4e6677030ac568c7be03424e08 /sw | |
parent | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (diff) |
followup code removal after changing virtual methods to non-virtual
This cleanups up indentation and removes dead classes.
This is a followup patch to commit
272b1dd55797aacf511fb4342b0054e3697243f6
"new loplugin: change virtual methods to non-virtual"
Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/expfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/numrule.hxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/inc/pview.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/uinums.hxx | 7 |
4 files changed, 9 insertions, 10 deletions
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 93525810ca4f..e58953cc7380 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -338,7 +338,7 @@ public: virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; /// aPromptText - virtual OUString GetPar2() const SAL_OVERRIDE; + virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; OUString GetHelp() const; diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 20422e6feb27..c83d1de861f7 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -74,14 +74,14 @@ public: bool operator!=( const SwNumFmt& r ) const { return !(*this == r); } SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); } - void SetCharFmt( SwCharFmt* ); + void SetCharFmt( SwCharFmt* ); - void SetCharFmtName(const OUString& rSet); - virtual OUString GetCharFmtName()const SAL_OVERRIDE; + void SetCharFmtName(const OUString& rSet); + virtual OUString GetCharFmtName() const SAL_OVERRIDE; //For i120928,access the cp info of graphic within bullet void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;} - sal_Unicode GetGrfBulletCP()const {return cGrfBulletCP;} + sal_Unicode GetGrfBulletCP() const {return cGrfBulletCP;} virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 2b2fa240a25c..feeb45f2c784 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -236,7 +236,7 @@ public: void DocSzChgd(const Size& rNewSize); const Size& GetDocSz() const { return aDocSz; } - void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); + void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); inline void AdjustEditWin(); diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index 5fc129de1104..16ed7c7f2583 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -86,7 +86,7 @@ public: protected: SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; - void Init(); + void Init(); void Save(); public: @@ -95,9 +95,8 @@ public: inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const; void CreateEmptyNumRule(sal_uInt16 nIdx); // for import - void ApplyNumRules( - const SwNumRulesWithName &rCopy, - sal_uInt16 nIdx); + void ApplyNumRules( const SwNumRulesWithName &rCopy, + sal_uInt16 nIdx); }; |