From f61dbc302975aaa253b00ea6b141bb12474b3c95 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 21 Jan 2015 12:15:26 +0200 Subject: 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 --- include/editeng/editeng.hxx | 5 ++--- include/editeng/flditem.hxx | 4 ++-- include/editeng/justifyitem.hxx | 24 ++++++++++++------------ include/editeng/outliner.hxx | 34 +++++++++++++++++----------------- include/editeng/unoedprx.hxx | 2 +- include/editeng/unotext.hxx | 2 +- 6 files changed, 35 insertions(+), 36 deletions(-) (limited to 'include/editeng') diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index f85c43b00836..3bff7c932dc6 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -297,7 +297,7 @@ public: void SetText(sal_Int32 nPara, const OUString& rText); - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; void GetCharAttribs( sal_Int32 nPara, std::vector& rLst ) const; @@ -464,7 +464,7 @@ public: virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ); virtual void ParaAttribsChanged( sal_Int32 nParagraph ); virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - void ParagraphHeightChanged( sal_Int32 nPara ); + void ParagraphHeightChanged( sal_Int32 nPara ); virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, @@ -508,7 +508,6 @@ public: static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); - SdrObject* GetCurTextObj() { return NULL; } /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ); Link GetBeginDropHdl() const; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 7386faea93af..0c41aa8827a6 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -58,8 +58,8 @@ public: virtual SvxFieldData* Clone() const; virtual bool operator==( const SvxFieldData& ) const; - virtual MetaAction* createBeginComment() const; - MetaAction* createEndComment() const; + virtual MetaAction* createBeginComment() const; + MetaAction* createEndComment() const; }; /** diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index de71bd96f1a2..9189171a546b 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -44,10 +44,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) { @@ -77,10 +77,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) { @@ -106,10 +106,10 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; SvxJustifyMethodItem& operator=(const SvxJustifyMethodItem& r); }; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index b56ac7fd6878..836ad0665d3f 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -638,7 +638,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster bool ImpCanDeleteSelectedPages( OutlinerView* pCurView ); bool ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 nFirstPage, sal_Int32 nPages ); - sal_uInt16 ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } + sal_uInt16 ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } void ImplCheckDepth( sal_Int16& rnDepth ) const; protected: @@ -646,7 +646,7 @@ protected: void ParagraphDeleted( sal_Int32 nParagraph ); void ParaAttribsChanged( sal_Int32 nParagraph ); - void StyleSheetChanged( SfxStyleSheet* pStyle ); + void StyleSheetChanged( SfxStyleSheet* pStyle ); void InvalidateBullet(sal_Int32 nPara); void PaintBullet( sal_Int32 nPara, const Point& rStartPos, @@ -663,7 +663,7 @@ public: virtual ~Outliner(); void Init( sal_uInt16 nOutlinerMode ); - sal_uInt16 GetMode() const { return nOutlinerMode; } + sal_uInt16 GetMode() const { return nOutlinerMode; } void SetVertical( bool bVertical ); bool IsVertical() const; @@ -744,28 +744,28 @@ public: Paragraph* GetHdlParagraph() const { return pHdlParagraph; } bool IsExpanding() const { return bIsExpanding; } - void ExpandHdl(); + void ExpandHdl(); void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } Link GetExpandHdl() const { return aExpandHdl; } - void ParagraphInsertedHdl(); + void ParagraphInsertedHdl(); void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;} Link GetParaInsertedHdl() const { return aParaInsertedHdl; } - void ParagraphRemovingHdl(); + void ParagraphRemovingHdl(); void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;} Link GetParaRemovingHdl() const { return aParaRemovingHdl; } - void DepthChangedHdl(); + void DepthChangedHdl(); void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} Link GetDepthChangedHdl() const { return aDepthChangedHdl; } sal_Int16 GetPrevDepth() const { return static_cast(nDepthChangedHdlPrevDepth); } sal_uInt16 GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } - long RemovingPagesHdl( OutlinerView* ); + long RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } - long IndentingPagesHdl( OutlinerView* ); + long IndentingPagesHdl( OutlinerView* ); void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;} Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; } // valid only in the two upper handlers @@ -806,9 +806,9 @@ public: void SetFirstPageNumber( sal_Int32 n ) { nFirstPage = n; } sal_Int32 GetFirstPageNumber() const { return nFirstPage; } - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); - void ClearPolygon(); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); + void ClearPolygon(); const Size& GetMinAutoPaperSize() const; void SetMinAutoPaperSize( const Size& rSz ); @@ -828,9 +828,9 @@ public: EBulletInfo GetBulletInfo( sal_Int32 nPara ); - void SetWordDelimiters( const OUString& rDelimiters ); - OUString GetWordDelimiters() const; - OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); + void SetWordDelimiters( const OUString& rDelimiters ); + OUString GetWordDelimiters() const; + OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); void StripPortions(); @@ -910,8 +910,8 @@ public: bool UpdateFields(); void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); - void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetSpeller( ::com::sun::star::uno::Reference< diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index a9404de5862c..b135c7e7a1d6 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -42,7 +42,7 @@ public: virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const SAL_OVERRIDE; - sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); + sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; virtual SfxItemState GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 1612e5db3130..1c2cf6f0aedc 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -199,7 +199,7 @@ public: virtual bool IsValid() const SAL_OVERRIDE; - void SetNotifyHdl( const Link& ); + void SetNotifyHdl( const Link& ); virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; -- cgit v1.2.3