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 /sc | |
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 'sc')
-rw-r--r-- | sc/inc/attrib.hxx | 14 | ||||
-rw-r--r-- | sc/inc/defaultsoptions.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 2 | ||||
-rw-r--r-- | sc/inc/formulaopt.hxx | 2 | ||||
-rw-r--r-- | sc/inc/printopt.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/XclExpChangeTrack.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xecontent.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xeescher.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLExportIterator.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/anyrefdg.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/dwfunctr.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/navipi.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/privsplt.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tphfedit.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/uiitems.hxx | 18 | ||||
-rw-r--r-- | sc/source/ui/inc/validate.hxx | 4 |
18 files changed, 37 insertions, 37 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 5aca8a3ba5b5..6a28fe9a5b21 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -56,7 +56,7 @@ public: ScMergeAttr( const ScMergeAttr& ); virtual ~ScMergeAttr(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -110,7 +110,7 @@ public: ScProtectionAttr( const ScProtectionAttr& ); virtual ~ScProtectionAttr(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -283,11 +283,11 @@ public: ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode ); virtual ~ScViewObjectModeItem(); - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + 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 &, sal_uInt16) const SAL_OVERRIDE; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -303,7 +303,7 @@ public: ScDoubleItem( const ScDoubleItem& rItem ); virtual ~ScDoubleItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -311,7 +311,7 @@ public: double GetValue() const { return nValue; } - void SetValue( const double nVal ) { nValue = nVal;} + void SetValue( const double nVal ) { nValue = nVal;} private: double nValue; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 22513598210b..21673e10624c 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -51,7 +51,7 @@ public: ScTpDefaultsItem( const ScTpDefaultsItem& rItem ); virtual ~ScTpDefaultsItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 0b284efce4d7..024003d709dd 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -114,7 +114,7 @@ public: virtual bool getIsDataLayoutDimension(long nColumn) = 0; virtual bool IsDateDimension(long nDim) = 0; virtual sal_uLong GetNumberFormat(long nDim); - sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); + sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); virtual void DisposeData() = 0; virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) = 0; diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index eceddc0d9e5d..95ab0c888ea8 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -87,7 +87,7 @@ public: ScTpFormulaItem( const ScTpFormulaItem& rItem ); virtual ~ScTpFormulaItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index ed7e14f78b66..78aee0aa28a7 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -61,7 +61,7 @@ public: ScTpPrintItem( const ScTpPrintItem& rItem ); virtual ~ScTpPrintItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index e7538d62b4e9..b6e6ba485b97 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -404,7 +404,7 @@ public: // set own index & return new index // could override to use more indexes per action - void SetIndex( sal_uInt32& rIndex ); + void SetIndex( sal_uInt32& rIndex ); virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual sal_Size GetLen() const SAL_OVERRIDE; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 0d0888d00b50..8a960f5db307 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -108,7 +108,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - void WriteEmbeddedData( XclExpStream& rStrm ); + void WriteEmbeddedData( XclExpStream& rStrm ); void SetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; } /** Builds file name from the passed file URL. Tries to convert to relative file name. diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 6ff6e45aa43c..4db040f7d0f6 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -300,8 +300,8 @@ public: /** Writes the OBJ record and the entire chart substream. */ virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); - void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); + void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); + void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); const css::uno::Reference<css::chart::XChartDocument>& GetChartDoc() const; diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 5118672aa862..d075ebc97b97 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -56,7 +56,7 @@ public: virtual void SetCellData( ScMyCell& rMyCell ) = 0; virtual void Sort() = 0; - void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); }; struct ScMyShape diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 8f476190b6b5..4a7ee80233f9 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -127,7 +127,7 @@ private: DECL_LINK( UpdateFocusHdl, void* ); protected: - bool DoClose( sal_uInt16 nId ); + bool DoClose( sal_uInt16 nId ); void SetDispatcherLock( bool bLock ); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 3798998b9d1c..07b532f58718 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -91,7 +91,7 @@ protected: virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void Resizing( Size& rSize ) SAL_OVERRIDE; - void SetSize(); + void SetSize(); virtual void ToggleFloatingMode() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 1e61b9591a2c..b1878265ba4e 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -287,7 +287,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou protected: using Window::Resize; - void Resize( const Size& rSize ); + void Resize( const Size& rSize ); virtual void PrePaint() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; @@ -383,7 +383,7 @@ public: void DoInvertRect( const Rectangle& rPixel ); void CheckNeedsRepaint(); - void SwitchView(); + void SwitchView(); void UpdateDPFromFieldPopupMenu(); bool UpdateVisibleRange(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 6a976e9b7409..d3b374d84e63 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -302,7 +302,7 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - void Resizing( Size& rSize ); + void Resizing( Size& rSize ); public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index fdb8697e41b3..7018dfe969ca 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -54,10 +54,10 @@ class ScPrivatSplit : public Control ScPrivatSplit( vcl::Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); - short GetDeltaX(); - short GetDeltaY(); + short GetDeltaX(); + short GetDeltaY(); - void CtrModified(); + void CtrModified(); void SetYRange(Range cRgeY); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 6ef999235f23..344ca1d4ca88 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -214,7 +214,7 @@ protected: virtual OUString GetSelectionText( bool bWholeWord ) SAL_OVERRIDE; virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; - OUString GetDescription() const; + OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 81947fabeda4..f6c218162537 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -114,7 +114,7 @@ protected: virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; - void StartPopup(); + void StartPopup(); public: diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index baecc2659d29..80a7f41a6e25 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -63,7 +63,7 @@ public: ScInputStatusItem( const ScInputStatusItem& rItem ); virtual ~ScInputStatusItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -154,7 +154,7 @@ public: ScSortItem( const ScSortItem& rItem ); virtual ~ScSortItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -179,7 +179,7 @@ public: ScQueryItem( const ScQueryItem& rItem ); virtual ~ScQueryItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -208,7 +208,7 @@ public: ScSubTotalItem( const ScSubTotalItem& rItem ); virtual ~ScSubTotalItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -229,7 +229,7 @@ public: ScUserListItem( const ScUserListItem& rItem ); virtual ~ScUserListItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -249,7 +249,7 @@ public: ScConsolidateItem( const ScConsolidateItem& rItem ); virtual ~ScConsolidateItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -268,7 +268,7 @@ public: ScPivotItem( const ScPivotItem& rItem ); virtual ~ScPivotItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -291,7 +291,7 @@ public: ScSolveItem( const ScSolveItem& rItem ); virtual ~ScSolveItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -310,7 +310,7 @@ public: ScTabOpItem( const ScTabOpItem& rItem ); virtual ~ScTabOpItem(); - OUString GetValueText() const; + OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index ea1d9361714f..e00fa143d8b0 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -94,8 +94,8 @@ public: private: void Init(); - OUString GetFirstFormula() const; - OUString GetSecondFormula() const; + OUString GetFirstFormula() const; + OUString GetSecondFormula() const; void SetFirstFormula( const OUString& rFmlaStr ); void SetSecondFormula( const OUString& rFmlaStr ); |