summaryrefslogtreecommitdiff
path: root/svtools/source/table
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/table')
-rw-r--r--svtools/source/table/cellvalueconversion.cxx14
-rw-r--r--svtools/source/table/mousefunction.hxx22
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx62
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx68
-rw-r--r--svtools/source/table/tabledatawindow.hxx12
5 files changed, 89 insertions, 89 deletions
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index 14a7be2873ec..9b74cacfdc12 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -139,7 +139,7 @@ namespace svt
}
}
- virtual ::sal_Int32 getFormatKey() const
+ virtual ::sal_Int32 getFormatKey() const SAL_OVERRIDE
{
return m_nFormatKey;
}
@@ -159,7 +159,7 @@ namespace svt
{
}
- virtual double convertToDouble( Any const & i_value ) const
+ virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE
{
double returnValue(0);
::rtl::math::setNan( &returnValue );
@@ -183,7 +183,7 @@ namespace svt
virtual ~IntegerNormalization() {}
- virtual double convertToDouble( Any const & i_value ) const
+ virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE
{
sal_Int64 value( 0 );
OSL_VERIFY( i_value >>= value );
@@ -204,7 +204,7 @@ namespace svt
virtual ~BooleanNormalization() {}
- virtual double convertToDouble( Any const & i_value ) const
+ virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE
{
bool value( false );
OSL_VERIFY( i_value >>= value );
@@ -225,7 +225,7 @@ namespace svt
virtual ~DateTimeNormalization() {}
- virtual double convertToDouble( Any const & i_value ) const
+ virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE
{
double returnValue(0);
::rtl::math::setNan( &returnValue );
@@ -259,7 +259,7 @@ namespace svt
virtual ~DateNormalization() {}
- virtual double convertToDouble( Any const & i_value ) const
+ virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE
{
double returnValue(0);
::rtl::math::setNan( &returnValue );
@@ -289,7 +289,7 @@ namespace svt
virtual ~TimeNormalization() {}
- virtual double convertToDouble( Any const & i_value ) const
+ virtual double convertToDouble( Any const & i_value ) const SAL_OVERRIDE
{
double returnValue(0);
::rtl::math::setNan( &returnValue );
diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx
index 97e7c1d8ddcd..5db88a5322fc 100644
--- a/svtools/source/table/mousefunction.hxx
+++ b/svtools/source/table/mousefunction.hxx
@@ -77,8 +77,8 @@ namespace svt { namespace table
}
public:
- virtual oslInterlockedCount SAL_CALL acquire();
- virtual oslInterlockedCount SAL_CALL release();
+ virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
+ virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
private:
oslInterlockedCount m_refCount;
@@ -97,9 +97,9 @@ namespace svt { namespace table
public:
// IMouseFunction
- virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event );
- virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event );
- virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event );
+ 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;
private:
ColPos m_nResizingColumn;
@@ -118,9 +118,9 @@ namespace svt { namespace table
public:
// IMouseFunction
- virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event );
- virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event );
- virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event );
+ 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;
private:
bool m_bActive;
@@ -139,9 +139,9 @@ namespace svt { namespace table
public:
// IMouseFunction
- virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event );
- virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event );
- virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event );
+ 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;
private:
ColPos m_nActiveColumn;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 31372d00ee9f..9ee8e2168dee 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -96,43 +96,43 @@ namespace svt { namespace table
}
// ITableModel overridables
- virtual TableSize getColumnCount() const
+ virtual TableSize getColumnCount() const SAL_OVERRIDE
{
return 0;
}
- virtual TableSize getRowCount() const
+ virtual TableSize getRowCount() const SAL_OVERRIDE
{
return 0;
}
- virtual bool hasColumnHeaders() const
+ virtual bool hasColumnHeaders() const SAL_OVERRIDE
{
return false;
}
- virtual bool hasRowHeaders() const
+ virtual bool hasRowHeaders() const SAL_OVERRIDE
{
return false;
}
- virtual bool isCellEditable( ColPos col, RowPos row ) const
+ virtual bool isCellEditable( ColPos col, RowPos row ) const SAL_OVERRIDE
{
(void)col;
(void)row;
return false;
}
- virtual PColumnModel getColumnModel( ColPos column )
+ virtual PColumnModel getColumnModel( ColPos column ) SAL_OVERRIDE
{
OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" );
(void)column;
return PColumnModel();
}
- virtual PTableRenderer getRenderer() const
+ virtual PTableRenderer getRenderer() const SAL_OVERRIDE
{
return PTableRenderer();
}
- virtual PTableInputHandler getInputHandler() const
+ virtual PTableInputHandler getInputHandler() const SAL_OVERRIDE
{
return PTableInputHandler();
}
- virtual TableMetrics getRowHeight() const
+ virtual TableMetrics getRowHeight() const SAL_OVERRIDE
{
return 5 * 100;
}
@@ -140,92 +140,92 @@ namespace svt { namespace table
{
(void)_nRowHeight;
}
- virtual TableMetrics getColumnHeaderHeight() const
+ virtual TableMetrics getColumnHeaderHeight() const SAL_OVERRIDE
{
return 0;
}
- virtual TableMetrics getRowHeaderWidth() const
+ virtual TableMetrics getRowHeaderWidth() const SAL_OVERRIDE
{
return 0;
}
- virtual ScrollbarVisibility getVerticalScrollbarVisibility() const
+ virtual ScrollbarVisibility getVerticalScrollbarVisibility() const SAL_OVERRIDE
{
return ScrollbarShowNever;
}
- virtual ScrollbarVisibility getHorizontalScrollbarVisibility() const
+ virtual ScrollbarVisibility getHorizontalScrollbarVisibility() const SAL_OVERRIDE
{
return ScrollbarShowNever;
}
- virtual void addTableModelListener( const PTableModelListener& i_listener )
+ virtual void addTableModelListener( const PTableModelListener& i_listener ) SAL_OVERRIDE
{
(void)i_listener;
}
- virtual void removeTableModelListener( const PTableModelListener& i_listener )
+ virtual void removeTableModelListener( const PTableModelListener& i_listener ) SAL_OVERRIDE
{
(void)i_listener;
}
- virtual ::boost::optional< ::Color > getLineColor() const
+ virtual ::boost::optional< ::Color > getLineColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getHeaderBackgroundColor() const
+ virtual ::boost::optional< ::Color > getHeaderBackgroundColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getHeaderTextColor() const
+ virtual ::boost::optional< ::Color > getHeaderTextColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getActiveSelectionBackColor() const
+ virtual ::boost::optional< ::Color > getActiveSelectionBackColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getInactiveSelectionBackColor() const
+ virtual ::boost::optional< ::Color > getInactiveSelectionBackColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getActiveSelectionTextColor() const
+ virtual ::boost::optional< ::Color > getActiveSelectionTextColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getInactiveSelectionTextColor() const
+ virtual ::boost::optional< ::Color > getInactiveSelectionTextColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getTextColor() const
+ virtual ::boost::optional< ::Color > getTextColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::Color > getTextLineColor() const
+ virtual ::boost::optional< ::Color > getTextLineColor() const SAL_OVERRIDE
{
return ::boost::optional< ::Color >();
}
- virtual ::boost::optional< ::std::vector< ::Color > > getRowBackgroundColors() const
+ virtual ::boost::optional< ::std::vector< ::Color > > getRowBackgroundColors() const SAL_OVERRIDE
{
return ::boost::optional< ::std::vector< ::Color > >();
}
- virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const
+ virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const SAL_OVERRIDE
{
return com::sun::star::style::VerticalAlignment(0);
}
- virtual ITableDataSort* getSortAdapter()
+ virtual ITableDataSort* getSortAdapter() SAL_OVERRIDE
{
return NULL;
}
- virtual bool isEnabled() const
+ virtual bool isEnabled() const SAL_OVERRIDE
{
return true;
}
- virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent )
+ virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) SAL_OVERRIDE
{
(void)i_row;
(void)i_col;
o_cellContent.clear();
}
- virtual void getCellToolTip( ColPos const, RowPos const, ::com::sun::star::uno::Any& )
+ virtual void getCellToolTip( ColPos const, RowPos const, ::com::sun::star::uno::Any& ) SAL_OVERRIDE
{
}
- virtual Any getRowHeading( RowPos const i_rowPos ) const
+ virtual Any getRowHeading( RowPos const i_rowPos ) const SAL_OVERRIDE
{
(void)i_rowPos;
return Any();
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 35ccaa02313e..71bbdfb9e622 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -273,27 +273,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();
- virtual void showCursor();
- virtual bool dispatchAction( TableControlAction _eAction );
- virtual SelectionEngine* getSelEngine();
- virtual PTableModel getModel() const;
- virtual ColPos getCurrentColumn() const;
- virtual RowPos getCurrentRow() const;
- virtual bool activateCell( ColPos const i_col, RowPos const i_row );
- virtual ::Size getTableSizePixel() const;
- virtual void setPointer( Pointer const & i_pointer );
- virtual void captureMouse();
- virtual void releaseMouse();
- virtual void invalidate( TableArea const i_what );
- virtual long pixelWidthToAppFont( long const i_pixels ) const;
- virtual void hideTracking();
- virtual void showTracking( Rectangle const & i_location, sal_uInt16 const i_flags );
+ 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 RowPos getRowAtPoint( const Point& rPoint ) const;
virtual ColPos getColAtPoint( const Point& rPoint ) const;
- virtual TableCell hitTest( const Point& rPoint ) const;
- virtual ColumnMetrics getColumnMetrics( ColPos const i_column ) const;
- virtual bool isRowSelected( RowPos i_row ) 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;
long appFontWidthToPixel( long const i_appFontUnits ) const;
@@ -316,14 +316,14 @@ namespace svt { namespace table
inline bool isAccessibleAlive() const { return impl_isAccessibleAlive(); }
// ITableModelListener
- virtual void rowsInserted( RowPos first, RowPos last );
- virtual void rowsRemoved( RowPos first, RowPos last );
- virtual void columnInserted( ColPos const i_colIndex );
- virtual void columnRemoved( ColPos const i_colIndex );
- virtual void allColumnsRemoved();
- virtual void cellsUpdated( ColPos const i_firstCol, ColPos i_lastCol, RowPos const i_firstRow, RowPos const i_lastRow );
- virtual void columnChanged( ColPos const i_column, ColumnAttributeGroup const i_attributeGroup );
- virtual void tableMetricsChanged();
+ virtual void rowsInserted( RowPos first, RowPos last ) SAL_OVERRIDE;
+ virtual void rowsRemoved( RowPos first, RowPos last ) SAL_OVERRIDE;
+ virtual void columnInserted( ColPos const i_colIndex ) SAL_OVERRIDE;
+ virtual void columnRemoved( ColPos const i_colIndex ) SAL_OVERRIDE;
+ virtual void allColumnsRemoved() SAL_OVERRIDE;
+ virtual void cellsUpdated( ColPos const i_firstCol, ColPos i_lastCol, 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;
private:
bool impl_isAccessibleAlive() const;
@@ -493,13 +493,13 @@ namespace svt { namespace table
TableFunctionSet(TableControl_Impl* _pTableControl);
virtual ~TableFunctionSet();
- virtual void BeginDrag();
- virtual void CreateAnchor();
- virtual void DestroyAnchor();
- virtual bool SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor);
- virtual bool IsSelectionAtPoint( const Point& rPoint );
- virtual void DeselectAtPoint( const Point& rPoint );
- virtual void DeselectAll();
+ 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;
};
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index afe792151eb3..0e153b8bc511 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -54,14 +54,14 @@ namespace svt { namespace table
inline const Link& GetSelectHdl() const { return m_aSelectHdl; }
// Window overridables
- virtual void Paint( const Rectangle& rRect );
- virtual void MouseMove( const MouseEvent& rMEvt);
- virtual void MouseButtonDown( const MouseEvent& rMEvt);
- virtual void MouseButtonUp( const MouseEvent& rMEvt);
- virtual bool Notify(NotifyEvent& rNEvt);
+ virtual void Paint( 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 SetControlBackground(const Color& rColor);
virtual void SetControlBackground();
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
void SetBackground(const Wallpaper& rColor);