From bd205223ec029a875c662474bb6d423d3cdd1994 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 1 Mar 2012 18:00:32 +0100 Subject: New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem ...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type" for the problem. --- svx/source/tbxctrls/colrctrl.cxx | 2 +- svx/source/tbxctrls/extrusioncontrols.cxx | 4 ++-- svx/source/tbxctrls/fillctrl.cxx | 2 +- svx/source/tbxctrls/fontworkgallery.cxx | 8 ++++---- svx/source/tbxctrls/formatpaintbrushctrl.cxx | 2 +- svx/source/tbxctrls/grafctrl.cxx | 4 ++-- svx/source/tbxctrls/itemwin.cxx | 2 +- svx/source/tbxctrls/layctrl.cxx | 2 +- svx/source/tbxctrls/lboxctrl.cxx | 4 ++-- svx/source/tbxctrls/linectrl.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 8 ++++---- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) (limited to 'svx/source/tbxctrls') diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index ddf01f7bbe29..192db50d3441 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -456,7 +456,7 @@ sal_Bool SvxColorDockingWindow::Close() |* \************************************************************************/ -IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); sal_uInt16 nPos = aColorSet.GetSelectItemId(); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 0cb08b1507db..e3597b17fd7b 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -464,7 +464,7 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) { int nSelected = getSelectedEntryId(); if( nSelected != -1 ) @@ -900,7 +900,7 @@ void SAL_CALL ExtrusionSurfaceWindow::statusChanged( // ----------------------------------------------------------------------- -IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 725b7f2a4be4..62aa9a140bf0 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -554,7 +554,7 @@ FillControl::~FillControl() //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( FillControl, DelayHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { SelectFillTypeHdl( NULL ); ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" ))); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index c5c25e253ce7..5c0e657aaec6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -253,7 +253,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork() // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkGalleryDialog, ClickOKHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) { insertSelectedFontwork(); EndDialog( true ); @@ -262,7 +262,7 @@ IMPL_LINK( FontWorkGalleryDialog, ClickOKHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) { insertSelectedFontwork(); EndDialog( true ); @@ -411,7 +411,7 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkAlignmentWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkAlignmentWindow, SelectHdl) { if ( IsInPopupMode() ) EndPopupMode(); @@ -621,7 +621,7 @@ void SAL_CALL FontWorkCharacterSpacingWindow::statusChanged( const ::com::sun::s // ----------------------------------------------------------------------- -IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FontWorkCharacterSpacingWindow, SelectHdl) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 3a6b02001e1c..2ec0687cfd69 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -93,7 +93,7 @@ void FormatPaintBrushToolBoxControl::Click() } // ----------------------------------------------------------------------- -IMPL_LINK(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) { //there was no second click during waiting this->impl_executePaintBrush(); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fb534742be53..9dd53da31af4 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -119,7 +119,7 @@ private: OUString maCommand; Reference< XFrame > mxFrame; - DECL_LINK( ImplModifyHdl, Timer* ); + DECL_LINK(ImplModifyHdl, void *); protected: @@ -190,7 +190,7 @@ void ImplGrafMetricField::Modify() // ----------------------------------------------------------------------------- -IMPL_LINK( ImplGrafMetricField, ImplModifyHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl) { const sal_Int64 nVal = GetValue(); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index fdb7b14fca61..a24ae633d851 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -92,7 +92,7 @@ SvxLineBox::~SvxLineBox() // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineBox, DelayHdl_Impl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl) { if ( GetEntryCount() == 0 ) { diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 603cc4fcbc24..13c689421c68 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -107,7 +107,7 @@ private: // ----------------------------------------------------------------------- -IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TableWindow, SelectHdl) { CloseAndShowTableDialog(); return 0; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 2d95a08ae2ca..b1d3b07ea216 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -192,7 +192,7 @@ void SvxListBoxControl::StateChanged( } -IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxListBoxControl, PopupModeEndHdl) { if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags() && pPopupWin->IsUserSelected() ) @@ -230,7 +230,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount ) } -IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl) { if (pPopupWin) { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 01334d416ac2..c81177ea4620 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -458,7 +458,7 @@ SvxLineEndWindow::~SvxLineEndWindow() // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) { XLineEndItem* pLineEndItem = NULL; XLineStartItem* pLineStartItem = NULL; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d24421d25e2c..e3669520f2a8 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -928,7 +928,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const // ----------------------------------------------------------------------- -IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) { sal_uInt16 nItemId = aColorSet.GetSelectItemId(); SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId ); @@ -1140,7 +1140,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) // Per default bleiben ungesetzte Linien unveraendert // Mit Shift werden ungesetzte Linien zurueckgsetzt // -IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) { ::Color aColBlack( COL_BLACK ); SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); @@ -1386,7 +1386,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const // ----------------------------------------------------------------------- -IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) { SvxLineItem aLineItem( SID_FRAME_LINESTYLE ); SvxBorderStyle nStyle = SvxBorderStyle( m_aLineStyleLb.GetSelectEntryStyle() ); @@ -1935,7 +1935,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, // ----------------------------------------------------------------------- -IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG ) +IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification) { sal_uInt16 i; diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index c974a2236f22..f26ce03f9fb2 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -432,7 +432,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur } } -IMPL_LINK( FindTextToolbarController, EditModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) { // enable or disable item DownSearch/UpSearch of findbar Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); -- cgit