diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /svtools/source/table | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'svtools/source/table')
-rw-r--r-- | svtools/source/table/cellvalueconversion.cxx | 12 | ||||
-rw-r--r-- | svtools/source/table/mousefunction.hxx | 18 | ||||
-rw-r--r-- | svtools/source/table/tablecontrol_impl.cxx | 60 | ||||
-rw-r--r-- | svtools/source/table/tablecontrol_impl.hxx | 68 | ||||
-rw-r--r-- | svtools/source/table/tabledatawindow.hxx | 14 |
5 files changed, 86 insertions, 86 deletions
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index 0fa47bda9fbe..6669ad1203b3 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -149,7 +149,7 @@ namespace svt { } - virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE + virtual double convertToDouble( Any const & i_value ) const override { double returnValue(0); ::rtl::math::setNan( &returnValue ); @@ -173,7 +173,7 @@ namespace svt virtual ~IntegerNormalization() {} - virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE + virtual double convertToDouble( Any const & i_value ) const override { sal_Int64 value( 0 ); OSL_VERIFY( i_value >>= value ); @@ -194,7 +194,7 @@ namespace svt virtual ~BooleanNormalization() {} - virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE + virtual double convertToDouble( Any const & i_value ) const override { bool value( false ); OSL_VERIFY( i_value >>= value ); @@ -215,7 +215,7 @@ namespace svt virtual ~DateTimeNormalization() {} - virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE + virtual double convertToDouble( Any const & i_value ) const override { double returnValue(0); ::rtl::math::setNan( &returnValue ); @@ -249,7 +249,7 @@ namespace svt virtual ~DateNormalization() {} - virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE + virtual double convertToDouble( Any const & i_value ) const override { double returnValue(0); ::rtl::math::setNan( &returnValue ); @@ -279,7 +279,7 @@ namespace svt virtual ~TimeNormalization() {} - virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE + virtual double convertToDouble( Any const & i_value ) const override { double returnValue(0); ::rtl::math::setNan( &returnValue ); diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx index 6256259e6bd6..f819050bbb6e 100644 --- a/svtools/source/table/mousefunction.hxx +++ b/svtools/source/table/mousefunction.hxx @@ -76,9 +76,9 @@ namespace svt { namespace table public: // MouseFunction - virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; - virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; - virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; + virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) override; + virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) override; + virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) override; private: ColPos m_nResizingColumn; @@ -97,9 +97,9 @@ namespace svt { namespace table public: // MouseFunction - virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; - virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; - virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; + virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) override; + virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) override; + virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) override; private: bool m_bActive; @@ -118,9 +118,9 @@ namespace svt { namespace table public: // MouseFunction - virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; - virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; - virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE; + virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) override; + virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) override; + virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) override; private: ColPos m_nActiveColumn; diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 74234c5279f9..424dab7f8a3c 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -96,126 +96,126 @@ namespace svt { namespace table } // ITableModel overridables - virtual TableSize getColumnCount() const SAL_OVERRIDE + virtual TableSize getColumnCount() const override { return 0; } - virtual TableSize getRowCount() const SAL_OVERRIDE + virtual TableSize getRowCount() const override { return 0; } - virtual bool hasColumnHeaders() const SAL_OVERRIDE + virtual bool hasColumnHeaders() const override { return false; } - virtual bool hasRowHeaders() const SAL_OVERRIDE + virtual bool hasRowHeaders() const override { return false; } - virtual PColumnModel getColumnModel( ColPos column ) SAL_OVERRIDE + virtual PColumnModel getColumnModel( ColPos column ) override { OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" ); (void)column; return PColumnModel(); } - virtual PTableRenderer getRenderer() const SAL_OVERRIDE + virtual PTableRenderer getRenderer() const override { return PTableRenderer(); } - virtual PTableInputHandler getInputHandler() const SAL_OVERRIDE + virtual PTableInputHandler getInputHandler() const override { return PTableInputHandler(); } - virtual TableMetrics getRowHeight() const SAL_OVERRIDE + virtual TableMetrics getRowHeight() const override { return 5 * 100; } - virtual TableMetrics getColumnHeaderHeight() const SAL_OVERRIDE + virtual TableMetrics getColumnHeaderHeight() const override { return 0; } - virtual TableMetrics getRowHeaderWidth() const SAL_OVERRIDE + virtual TableMetrics getRowHeaderWidth() const override { return 0; } - virtual ScrollbarVisibility getVerticalScrollbarVisibility() const SAL_OVERRIDE + virtual ScrollbarVisibility getVerticalScrollbarVisibility() const override { return ScrollbarShowNever; } - virtual ScrollbarVisibility getHorizontalScrollbarVisibility() const SAL_OVERRIDE + virtual ScrollbarVisibility getHorizontalScrollbarVisibility() const override { return ScrollbarShowNever; } - virtual void addTableModelListener( const PTableModelListener& i_listener ) SAL_OVERRIDE + virtual void addTableModelListener( const PTableModelListener& i_listener ) override { (void)i_listener; } - virtual void removeTableModelListener( const PTableModelListener& i_listener ) SAL_OVERRIDE + virtual void removeTableModelListener( const PTableModelListener& i_listener ) override { (void)i_listener; } - virtual ::boost::optional< ::Color > getLineColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getLineColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getHeaderBackgroundColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getHeaderBackgroundColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getHeaderTextColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getHeaderTextColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getActiveSelectionBackColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getActiveSelectionBackColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getInactiveSelectionBackColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getInactiveSelectionBackColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getActiveSelectionTextColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getActiveSelectionTextColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getInactiveSelectionTextColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getInactiveSelectionTextColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getTextColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getTextColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::Color > getTextLineColor() const SAL_OVERRIDE + virtual ::boost::optional< ::Color > getTextLineColor() const override { return ::boost::optional< ::Color >(); } - virtual ::boost::optional< ::std::vector< ::Color > > getRowBackgroundColors() const SAL_OVERRIDE + virtual ::boost::optional< ::std::vector< ::Color > > getRowBackgroundColors() const override { return ::boost::optional< ::std::vector< ::Color > >(); } - virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const SAL_OVERRIDE + virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const override { return com::sun::star::style::VerticalAlignment(0); } - virtual ITableDataSort* getSortAdapter() SAL_OVERRIDE + virtual ITableDataSort* getSortAdapter() override { return NULL; } - virtual bool isEnabled() const SAL_OVERRIDE + virtual bool isEnabled() const override { return true; } - virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) SAL_OVERRIDE + virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) override { (void)i_row; (void)i_col; o_cellContent.clear(); } - virtual void getCellToolTip( ColPos const, RowPos const, ::com::sun::star::uno::Any& ) SAL_OVERRIDE + virtual void getCellToolTip( ColPos const, RowPos const, ::com::sun::star::uno::Any& ) override { } - virtual Any getRowHeading( RowPos const i_rowPos ) const SAL_OVERRIDE + virtual Any getRowHeading( RowPos const i_rowPos ) const override { (void)i_rowPos; return Any(); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index d082e20cde72..c004254fdfa2 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -247,27 +247,27 @@ namespace svt { namespace table void commitTableEvent( sal_Int16 const i_eventID, const com::sun::star::uno::Any& i_newValue, const com::sun::star::uno::Any& i_oldValue ); // ITableControl - virtual void hideCursor() SAL_OVERRIDE; - virtual void showCursor() SAL_OVERRIDE; - virtual bool dispatchAction( TableControlAction _eAction ) SAL_OVERRIDE; - virtual SelectionEngine* getSelEngine() SAL_OVERRIDE; - virtual PTableModel getModel() const SAL_OVERRIDE; - virtual ColPos getCurrentColumn() const SAL_OVERRIDE; - virtual RowPos getCurrentRow() const SAL_OVERRIDE; - virtual bool activateCell( ColPos const i_col, RowPos const i_row ) SAL_OVERRIDE; - virtual ::Size getTableSizePixel() const SAL_OVERRIDE; - virtual void setPointer( Pointer const & i_pointer ) SAL_OVERRIDE; - virtual void captureMouse() SAL_OVERRIDE; - virtual void releaseMouse() SAL_OVERRIDE; - virtual void invalidate( TableArea const i_what ) SAL_OVERRIDE; - virtual long pixelWidthToAppFont( long const i_pixels ) const SAL_OVERRIDE; - virtual void hideTracking() SAL_OVERRIDE; - virtual void showTracking( Rectangle const & i_location, sal_uInt16 const i_flags ) SAL_OVERRIDE; + virtual void hideCursor() override; + virtual void showCursor() override; + virtual bool dispatchAction( TableControlAction _eAction ) override; + virtual SelectionEngine* getSelEngine() override; + virtual PTableModel getModel() const override; + virtual ColPos getCurrentColumn() const override; + virtual RowPos getCurrentRow() const override; + virtual bool activateCell( ColPos const i_col, RowPos const i_row ) override; + virtual ::Size getTableSizePixel() const override; + virtual void setPointer( Pointer const & i_pointer ) override; + virtual void captureMouse() override; + virtual void releaseMouse() override; + virtual void invalidate( TableArea const i_what ) override; + virtual long pixelWidthToAppFont( long const i_pixels ) const override; + virtual void hideTracking() override; + virtual void showTracking( Rectangle const & i_location, sal_uInt16 const i_flags ) override; RowPos getRowAtPoint( const Point& rPoint ) const; ColPos getColAtPoint( const Point& rPoint ) const; - virtual TableCell hitTest( const Point& rPoint ) const SAL_OVERRIDE; - virtual ColumnMetrics getColumnMetrics( ColPos const i_column ) const SAL_OVERRIDE; - virtual bool isRowSelected( RowPos i_row ) const SAL_OVERRIDE; + virtual TableCell hitTest( const Point& rPoint ) const override; + virtual ColumnMetrics getColumnMetrics( ColPos const i_column ) const override; + virtual bool isRowSelected( RowPos i_row ) const override; long appFontWidthToPixel( long const i_appFontUnits ) const; @@ -290,14 +290,14 @@ namespace svt { namespace table inline bool isAccessibleAlive() const { return impl_isAccessibleAlive(); } // ITableModelListener - virtual void rowsInserted( RowPos first, RowPos last ) SAL_OVERRIDE; - virtual void rowsRemoved( RowPos first, RowPos last ) SAL_OVERRIDE; - virtual void columnInserted() SAL_OVERRIDE; - virtual void columnRemoved() SAL_OVERRIDE; - virtual void allColumnsRemoved() SAL_OVERRIDE; - virtual void cellsUpdated( RowPos const i_firstRow, RowPos const i_lastRow ) SAL_OVERRIDE; - virtual void columnChanged( ColPos const i_column, ColumnAttributeGroup const i_attributeGroup ) SAL_OVERRIDE; - virtual void tableMetricsChanged() SAL_OVERRIDE; + virtual void rowsInserted( RowPos first, RowPos last ) override; + virtual void rowsRemoved( RowPos first, RowPos last ) override; + virtual void columnInserted() override; + virtual void columnRemoved() override; + virtual void allColumnsRemoved() override; + virtual void cellsUpdated( RowPos const i_firstRow, RowPos const i_lastRow ) override; + virtual void columnChanged( ColPos const i_column, ColumnAttributeGroup const i_attributeGroup ) override; + virtual void tableMetricsChanged() override; private: bool impl_isAccessibleAlive() const; @@ -467,13 +467,13 @@ namespace svt { namespace table explicit TableFunctionSet(TableControl_Impl* _pTableControl); virtual ~TableFunctionSet(); - virtual void BeginDrag() SAL_OVERRIDE; - virtual void CreateAnchor() SAL_OVERRIDE; - virtual void DestroyAnchor() SAL_OVERRIDE; - virtual bool SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor) SAL_OVERRIDE; - virtual bool IsSelectionAtPoint( const Point& rPoint ) SAL_OVERRIDE; - virtual void DeselectAtPoint( const Point& rPoint ) SAL_OVERRIDE; - virtual void DeselectAll() SAL_OVERRIDE; + virtual void BeginDrag() override; + virtual void CreateAnchor() override; + virtual void DestroyAnchor() override; + virtual bool SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor) override; + virtual bool IsSelectionAtPoint( const Point& rPoint ) override; + virtual void DeselectAtPoint( const Point& rPoint ) override; + virtual void DeselectAll() override; }; diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 784dce4142ff..6507147ac4d4 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -43,7 +43,7 @@ namespace svt { namespace table public: explicit TableDataWindow( TableControl_Impl& _rTableControl ); virtual ~TableDataWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; inline void SetSelectHdl(const Link<LinkParamNone*,void>& rLink) { @@ -51,12 +51,12 @@ namespace svt { namespace table } // Window overridables - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void MouseMove( const MouseEvent& rMEvt) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt) override; + virtual bool Notify(NotifyEvent& rNEvt) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; void SetBackground(const Wallpaper& rColor); |