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 /include/svtools | |
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 'include/svtools')
-rw-r--r-- | include/svtools/brwbox.hxx | 26 | ||||
-rw-r--r-- | include/svtools/calendar.hxx | 10 | ||||
-rw-r--r-- | include/svtools/colrdlg.hxx | 6 | ||||
-rw-r--r-- | include/svtools/grfmgr.hxx | 4 | ||||
-rw-r--r-- | include/svtools/headbar.hxx | 6 | ||||
-rw-r--r-- | include/svtools/imapobj.hxx | 6 | ||||
-rw-r--r-- | include/svtools/ivctrl.hxx | 20 | ||||
-rw-r--r-- | include/svtools/ruler.hxx | 2 | ||||
-rw-r--r-- | include/svtools/scrwin.hxx | 4 | ||||
-rw-r--r-- | include/svtools/simptabl.hxx | 8 | ||||
-rw-r--r-- | include/svtools/tabbar.hxx | 2 | ||||
-rw-r--r-- | include/svtools/treelistbox.hxx | 6 | ||||
-rw-r--r-- | include/svtools/valueset.hxx | 2 |
13 files changed, 51 insertions, 51 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 1dd3ca44d244..3be7495c6d44 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -362,9 +362,9 @@ protected: nRow starts at 0 */ virtual bool SeekRow( long nRow ) = 0; - void DrawCursor(); - void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); - void PaintData( vcl::Window& rWin, const Rectangle& rRect ); + void DrawCursor(); + void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); + void PaintData( vcl::Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const = 0; // Advice for the subclass: the visible scope of rows has changed. @@ -384,10 +384,10 @@ protected: virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows); // number of visible rows in the window (incl. "truncated" rows) - sal_uInt16 GetVisibleRows() + sal_uInt16 GetVisibleRows() { return (sal_uInt16)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); } long GetTopRow() { return nTopRow; } - sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } + sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } // Focus-Rect enable / disable void DoShowCursor( const char *pWhoLog ); @@ -450,9 +450,9 @@ public: // neue Handler virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); - void MouseMove( const BrowserMouseEvent& rEvt ); + void MouseMove( const BrowserMouseEvent& rEvt ); virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); - void StartScroll(); + void StartScroll(); virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); @@ -460,7 +460,7 @@ public: virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); - long QueryColumnResize( sal_uInt16 nColId, long nWidth ); + long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); @@ -497,8 +497,8 @@ public: void SetDataRowHeight( long nPixel ); long GetDataRowHeight() const; void SetTitleLines( sal_uInt16 nLines ); - sal_uInt16 GetTitleLines() const { return nTitleLines; } - long GetTitleHeight() const; + sal_uInt16 GetTitleLines() const { return nTitleLines; } + long GetTitleHeight() const; // access to dynamic values of cursor row OUString GetColumnTitle( sal_uInt16 nColumnId ) const; @@ -554,7 +554,7 @@ public: bool bComplete = false ) const; long GetRowAtYPosPixel( long nY, bool bRelToBrowser = true ) const; - sal_uInt16 GetColumnAtXPosPixel( long nX, + sal_uInt16 GetColumnAtXPosPixel( long nX, bool bRelToBrowser = true ) const; // invalidations @@ -816,8 +816,8 @@ public: virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; private: // the following declares some Window/OutputDevice methods private. This happened in the course diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 10dff86e49a8..e970842480a7 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -274,11 +274,11 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void SelectionChanging(); - void DateRangeChanged(); - void RequestDateInfo(); - void DoubleClick(); - void Select(); + void SelectionChanging(); + void DateRangeChanged(); + void RequestDateInfo(); + void DoubleClick(); + void Select(); const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index a898b08bc658..1919ba0666c4 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -47,12 +47,12 @@ public: void SetMode( sal_Int16 eMode ); - short Execute(); + short Execute(); private: vcl::Window* mpParent; - Color maColor; - sal_Int16 meMode; + Color maColor; + sal_Int16 meMode; }; #endif // INCLUDED_SVTOOLS_COLRDLG_HXX diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 377f92b29f95..42d9a708edb3 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -311,8 +311,8 @@ private: void SVT_DLLPRIVATE ImplAfterDataChange(); protected: - void GraphicManagerDestroyed(); - SvStream* GetSwapStream() const; + void GraphicManagerDestroyed(); + SvStream* GetSwapStream() const; void SetSwapState(); virtual void Load( SvStream& ) SAL_OVERRIDE; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index e9ff21b7d364..f7cb8c14ca1d 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -297,9 +297,9 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); - void StartDrag(); - void Drag(); + void UserDraw( const UserDrawEvent& rUDEvt ); + void StartDrag(); + void Drag(); virtual void EndDrag(); virtual void Select(); virtual void DoubleClick(); diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 874614ba214a..22b3d3546785 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -87,9 +87,9 @@ public: bool bActive ); virtual ~IMapObject() {}; - sal_uInt16 GetVersion() const; - virtual sal_uInt16 GetType() const = 0; - virtual bool IsHit( const Point& rPoint ) const = 0; + sal_uInt16 GetVersion() const; + virtual sal_uInt16 GetType() const = 0; + virtual bool IsHit( const Point& rPoint ) const = 0; void Write ( SvStream& rOStm, const OUString& rBaseURL ) const; void Read( SvStream& rIStm, const OUString& rBaseURL ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 2c086637bddc..84ec8d8748f8 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -228,10 +228,10 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); - void DocumentRectChanged(); - void VisibleRectChanged(); - bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); + void DocumentRectChanged(); + void VisibleRectChanged(); + bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -240,11 +240,11 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - void ClickIcon(); + void ClickIcon(); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void DrawEntryImage( + void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev ); @@ -320,10 +320,10 @@ public: void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); #endif - bool HasBackground() const; - bool HasFont() const; - bool HasFontTextColor() const; - bool HasFontFillColor() const; + bool HasBackground() const; + bool HasFont() const; + bool HasFontTextColor() const; + bool HasFontFillColor() const; void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; } bool AutoFontColor () { return _bAutoFontColor; } diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index f165f5a91b50..86b7773568ee 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -744,7 +744,7 @@ public: virtual void Drag(); virtual void EndDrag(); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void ExtraDown(); void Activate() SAL_OVERRIDE; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index a3f3bf4629ed..505397087896 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -69,8 +69,8 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDEvt ) SAL_OVERRIDE; - void StartScroll(); - void EndScroll( long nDeltaX, long nDeltaY ); + void StartScroll(); + void EndScroll( long nDeltaX, long nDeltaY ); using OutputDevice::SetMapMode; virtual void SetMapMode( const MapMode& rNewMapMode ) SAL_OVERRIDE; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 1f702147f894..b8414851256c 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -77,10 +77,10 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void HBarClick(); - void HBarDblClick(); - void HBarStartDrag(); - void HBarDrag(); - void HBarEndDrag(); + void HBarDblClick(); + void HBarStartDrag(); + void HBarDrag(); + void HBarEndDrag(); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index e41f52e8cbb2..675999d9cdb2 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -403,7 +403,7 @@ public: virtual void Select(); virtual void DoubleClick(); - void Split(); + void Split(); virtual void ActivatePage(); virtual bool DeactivatePage(); virtual bool StartRenaming(); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index f3558583a1d7..96c501d6ad8e 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -564,7 +564,7 @@ protected: void NotifyBeginScroll(); virtual void NotifyEndScroll(); // nLines == 0 => horizontal Scrolling - void NotifyScrolling( long nLines ); + void NotifyScrolling( long nLines ); virtual void NotifyScrolled(); void SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; } const Link& GetScrolledHdl() const { return aScrolledHdl; } @@ -577,7 +577,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void CursorMoved( SvTreeListEntry* pNewCursor ); + void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -595,7 +595,7 @@ protected: void AdjustEntryHeightAndRecalc( const vcl::Font& rFont ); public: - void SetExtendedWinBits( ExtendedWinBits _nBits ); + void SetExtendedWinBits( ExtendedWinBits _nBits ); void DisconnectFromModel(); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 8342b603eee6..fe6f8e5597f7 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -303,7 +303,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Select(); - void DoubleClick(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, const Image& rImage, |