diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /reportdesign | |
parent | 32781c2d268ed94eb46318a0398385baf31368c4 (diff) |
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 544dc03ecc39..724ea2f8e8df 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -214,7 +214,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) } } // ----------------------------------------------------------------------------- -IMPL_LINK( OColorPopup, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(OColorPopup, SelectHdl) { sal_uInt16 nItemId = m_aColorSet.GetSelectItemId(); Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet.GetItemColor( nItemId ) ); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 75ad612b7b35..53711b8b46d9 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -409,14 +409,14 @@ IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ ) return 0L; } //------------------------------------------------------------------------------ -IMPL_LINK(OFieldExpressionControl, AsynchActivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OFieldExpressionControl, AsynchActivate) { ActivateCell(); return 0L; } //------------------------------------------------------------------------------ -IMPL_LINK(OFieldExpressionControl, AsynchDeactivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OFieldExpressionControl, AsynchDeactivate) { DeactivateCell(); return 0L; diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 78ddf3530dfa..70fe37859d44 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -420,7 +420,7 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel ) } } //------------------------------------------------------------------------ -IMPL_LINK( NavigatorTree, OnDropActionTimer, void*, EMPTYARG ) +IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) { if (--m_nTimerCounter > 0) return 0L; diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index a85f500de4df..6c2fad9e4d4a 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -94,7 +94,7 @@ namespace rptui sal_Bool m_bDeleted; - DECL_LINK( MarkTimeout, Timer * ); + DECL_LINK(MarkTimeout, void *); DECL_LINK( SplitHdl, void* ); void ImplInitSettings(); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index e757083ed951..f66e4b75dc86 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -296,7 +296,7 @@ void ODesignView::setReadOnly(sal_Bool /*_bReadOnly*/) { } //---------------------------------------------------------------------------- -IMPL_LINK( ODesignView, MarkTimeout, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(ODesignView, MarkTimeout) { if ( m_pPropWin && m_pPropWin->IsVisible() ) { diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index bde3c7ff4d1a..9b55494b0c69 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2367,7 +2367,7 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr } } //------------------------------------------------------------------------------ -IMPL_LINK( OReportController, OnClipboardChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(OReportController, OnClipboardChanged) { OnInvalidateClipboard(); return 0; |