From 4f00dce2b3f08aea41390786ffdaa29179598dec Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 9 May 2015 21:59:01 +0200 Subject: Use IMPL_[STATIC_]LINK_NOARG where applicable Change-Id: I1e24b032bdeea017b0e77c5446e55310899ce752 --- cui/source/tabpages/tpline.cxx | 2 +- forms/source/component/Edit.cxx | 2 +- forms/source/component/FormattedField.cxx | 2 +- fpicker/source/office/PlacesListBox.cxx | 2 +- fpicker/source/office/iodlg.cxx | 10 +++++----- framework/source/fwe/classes/addonsoptions.cxx | 2 +- sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 12 ++++++------ sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 2 +- sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 2 +- sfx2/source/sidebar/AsynchronousCall.cxx | 2 +- sfx2/source/sidebar/Deck.cxx | 2 +- sfx2/source/sidebar/TabBar.cxx | 2 +- svtools/source/dialogs/PlaceEditDialog.cxx | 6 +++--- svtools/source/dialogs/ServerDetailsControls.cxx | 8 ++++---- svx/source/gallery2/GalleryControl.cxx | 2 +- svx/source/sidebar/area/AreaPropertyPanel.cxx | 4 ++-- svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 14 +++++++------- svx/source/sidebar/line/LinePropertyPanel.cxx | 10 +++++----- svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 12 ++++++------ svx/source/sidebar/tools/Popup.cxx | 2 +- sw/source/uibase/sidebar/PageColumnControl.cxx | 2 +- sw/source/uibase/sidebar/PageSizeControl.cxx | 2 +- sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2 +- test/source/vclbootstrapprotector.cxx | 2 +- vcl/source/app/svapp.cxx | 2 +- vcl/source/control/combobox.cxx | 2 +- vcl/source/control/lstbox.cxx | 2 +- vcl/unx/generic/app/sm.cxx | 6 +++--- 28 files changed, 60 insertions(+), 60 deletions(-) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 99cad0db63a8..e0440c7caf45 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1630,7 +1630,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl) // fdo#43209 -IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG( SvxLineTabPage, ChangeCapStyleHdl_Impl ) { ChangePreviewHdl_Impl( this ); diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index ffcc37a88633..d52353dfbe50 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -247,7 +247,7 @@ void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) thr } -IMPL_LINK(OEditControl, OnKeyPressed, void*, /*EMPTYARG*/) +IMPL_LINK_NOARG(OEditControl, OnKeyPressed) { m_nKeyEvent = 0; diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index ac7112db484e..79eab7e334eb 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -240,7 +240,7 @@ void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/ { } -IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/) +IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed) { m_nKeyEvent = 0; Reference xFComp(getModel(), UNO_QUERY); diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index b6ae4eb1c492..7235c1b8244f 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -188,7 +188,7 @@ IMPL_LINK( PlacesListBox, Selection, void* , EMPTYARG ) return 0; } -IMPL_LINK ( PlacesListBox, DoubleClick, void*, EMPTYARG ) +IMPL_LINK_NOARG( PlacesListBox, DoubleClick ) { sal_uInt16 nSelected = mpImpl->GetCurrRow(); PlacePtr pPlace = maPlaces[nSelected]; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 87a130087409..cfb4ce423de2 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1147,7 +1147,7 @@ void SvtFileDialog::EnableAutocompletion( bool _bEnable ) -IMPL_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl ) { OUString sSelectedFilterDisplayName; SvtFileDialogFilter_Impl* pSelectedFilter = _pImp->GetSelectedFilterEntry( sSelectedFilterDisplayName ); @@ -1228,7 +1228,7 @@ IMPL_LINK_TYPED( ExecuteFilter(); } -IMPL_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG( SvtFileDialog, FileNameGetFocusHdl_Impl ) { _pFileView->SetNoSelection(); _pFileView->Update(); @@ -1237,7 +1237,7 @@ IMPL_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG ) -IMPL_LINK( SvtFileDialog, FileNameModifiedHdl_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG( SvtFileDialog, FileNameModifiedHdl_Impl ) { FileNameGetFocusHdl_Impl( NULL ); return 0; @@ -1245,7 +1245,7 @@ IMPL_LINK( SvtFileDialog, FileNameModifiedHdl_Impl, void*, EMPTYARG ) -IMPL_LINK ( SvtFileDialog, URLBoxModifiedHdl_Impl, void*, EMPTYARG ) +IMPL_LINK_NOARG( SvtFileDialog, URLBoxModifiedHdl_Impl ) { OUString _aPath = _pImp->_pEdCurrentPath->GetURL(); OpenURL_Impl(_aPath); @@ -1254,7 +1254,7 @@ IMPL_LINK ( SvtFileDialog, URLBoxModifiedHdl_Impl, void*, EMPTYARG ) -IMPL_LINK ( SvtFileDialog, ConnectToServerPressed_Hdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl ) { _pFileView->EndInplaceEditing( false ); diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 570ca906b964..925bb439b2b8 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1651,7 +1651,7 @@ Mutex& AddonsOptions::GetOwnStaticMutex() return *pMutex; } -IMPL_STATIC_LINK( AddonsOptions, Notify, void*, EMPTYARG ) +IMPL_STATIC_LINK_NOARG( AddonsOptions, Notify ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->ReadConfigurationData(); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 98eff3043f5b..c27d0e994f79 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -132,7 +132,7 @@ void AlignmentPropertyPanel::Initialize() mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate); } -IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl ) { OUString sTmp = mpMtrAngle->GetText(); if (sTmp.isEmpty()) @@ -171,7 +171,7 @@ IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, RotationHdl ) { sal_Int32 nTmp = mpCtrlDial->GetRotation(); SfxInt32Item aAngleItem( SID_ATTR_ALIGN_DEGREES,(sal_uInt32) nTmp); @@ -182,7 +182,7 @@ IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl ) { bool bVertical = mpCbStacked->IsChecked(); SfxBoolItem aStackItem( SID_ATTR_ALIGN_STACKED, bVertical ); @@ -191,7 +191,7 @@ IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl) { mpCBXWrapText->EnableTriState(false); sal_uInt16 nVal = (sal_uInt16)mpMFLeftIndent->GetValue(); @@ -201,7 +201,7 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) return 0L; } -IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl) { bool bState = mpCBXMergeCell->IsChecked(); @@ -218,7 +218,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) return 0; } -IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl) { bool bState = mpCBXWrapText->IsChecked(); SfxBoolItem aItem( SID_ATTR_ALIGN_LINEBREAK , bState); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index a805a28b6f9b..5c7ade47726f 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -232,7 +232,7 @@ IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pT } } -IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(CellAppearancePropertyPanel, CBOXGridShowClkHdl) { bool bState = mpCBXShowGrid->IsChecked(); SfxBoolItem aItem( FID_TAB_TOGGLE_GRID , bState); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index f3c492f38855..137643b36685 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -149,7 +149,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox ) return 0L; } -IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl ) { OUString aFormat; OUString sBreak = ","; diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index 2806804efb4c..a4080fdffc01 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -56,7 +56,7 @@ void AsynchronousCall::CancelRequest() } } -IMPL_LINK(AsynchronousCall, HandleUserCall, void*, EMPTYARG ) +IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall ) { mnCallId = 0; if (maAction) diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index fe68160173a4..ae6ba6da825f 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -302,7 +302,7 @@ void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation) PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation+1); } -IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) +IMPL_LINK_NOARG(Deck, HandleVerticalScrollBarChange) { const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos()); mpScrollContainer->SetPosPixel( diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index d40d3cbe630e..f976942654b3 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -343,7 +343,7 @@ void TabBar::UpdateFocusManager (FocusManager& rFocusManager) rFocusManager.SetButtons(aButtons); } -IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG) +IMPL_LINK_NOARG(TabBar, OnToolboxClicked) { if ( ! mpMenuButton) return 0; diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 7d4267bdf530..2db914235d80 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -159,7 +159,7 @@ IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, EMPTYARG ) return 1; } -IMPL_LINK ( PlaceEditDialog, EditHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PlaceEditDialog, EditHdl ) { OUString sUrl = GetServerUrl( ); OUString sName = OUString( m_pEDServerName->GetText() ).trim( ); @@ -167,7 +167,7 @@ IMPL_LINK ( PlaceEditDialog, EditHdl, void *, EMPTYARG ) return 1; } -IMPL_LINK ( PlaceEditDialog, EditUsernameHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl ) { for ( std::vector< std::shared_ptr< DetailsContainer > >::iterator it = m_aDetailsContainers.begin( ); it != m_aDetailsContainers.end( ); ++it ) @@ -177,7 +177,7 @@ IMPL_LINK ( PlaceEditDialog, EditUsernameHdl, void *, EMPTYARG ) return 1; } -IMPL_LINK( PlaceEditDialog, SelectTypeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl ) { if (m_xCurrentDetails.get()) m_xCurrentDetails->show(false); diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 90e8df4ffc47..7a17bfde68c6 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -63,7 +63,7 @@ void DetailsContainer::notifyChange( ) m_aChangeHdl.Call( this ); } -IMPL_LINK( DetailsContainer, ValueChangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( DetailsContainer, ValueChangeHdl ) { notifyChange( ); return 0; @@ -356,7 +356,7 @@ void CmisDetailsContainer::selectRepository( ) notifyChange( ); } -IMPL_LINK( CmisDetailsContainer, SelectServerTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( CmisDetailsContainer, SelectServerTypeHdl ) { // Set a sample URL for the server sal_uInt16 nId = m_pLBServerType->GetSelectEntryPos( ); @@ -364,7 +364,7 @@ IMPL_LINK( CmisDetailsContainer, SelectServerTypeHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl ) { OUString sBindingUrl = m_pEDBinding->GetText().trim( ); @@ -420,7 +420,7 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( CmisDetailsContainer, SelectRepoHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl ) { selectRepository( ); return 0; diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index ff694bdd7a28..6f87d311b272 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -225,7 +225,7 @@ void GalleryControl::ThemeSelectionHasChanged() mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); } -IMPL_LINK( GalleryControl, SplitHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( GalleryControl, SplitHdl ) { if(mpSplitter->IsHorizontal()) { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index a065235c3e3d..766ba52f0821 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1107,7 +1107,7 @@ IMPL_LINK_TYPED( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void -IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG) +IMPL_LINK_NOARG(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl) { sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos(); bool bGradient = false; @@ -1204,7 +1204,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG) -IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG) +IMPL_LINK_NOARG(AreaPropertyPanel, ModifyTransparentHdl_Impl) { const sal_uInt16 nTrans = (sal_uInt16)mpMTRTransparent->GetValue(); mnLastTransSolid = nTrans; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 35aa1b6e3c9c..53806eaad936 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -148,7 +148,7 @@ void GraphicPropertyPanel::Initialize() -IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyBrightnessHdl ) { const sal_Int16 nBright = mpMtrBrightness->GetValue(); const SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright ); @@ -158,7 +158,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG ) -IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyContrastHdl ) { const sal_Int16 nContrast = mpMtrContrast->GetValue(); const SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast ); @@ -168,7 +168,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG ) -IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyTransHdl ) { const sal_Int16 nTrans = mpMtrTrans->GetValue(); const SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans ); @@ -188,7 +188,7 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl ) -IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( GraphicPropertyPanel, RedHdl ) { const sal_Int16 nRed = mpMtrRed->GetValue(); const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed ); @@ -198,7 +198,7 @@ IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG ) -IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( GraphicPropertyPanel, GreenHdl ) { const sal_Int16 nGreen = mpMtrGreen->GetValue(); const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen ); @@ -208,7 +208,7 @@ IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG ) -IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG) +IMPL_LINK_NOARG(GraphicPropertyPanel, BlueHdl) { const sal_Int16 nBlue = mpMtrBlue->GetValue(); const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue ); @@ -218,7 +218,7 @@ IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG) -IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG) +IMPL_LINK_NOARG(GraphicPropertyPanel, GammaHdl) { const sal_Int32 nGamma = mpMtrGamma->GetValue(); const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma ); diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 90224e57f86d..589247e35ee4 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -663,7 +663,7 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl) return 0; } -IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(LinePropertyPanel, ChangeStartHdl) { sal_Int32 nPos = mpLBStart->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBStart->IsValueChangedFromSaved() ) @@ -678,7 +678,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG) return 0; } -IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(LinePropertyPanel, ChangeEndHdl) { sal_Int32 nPos = mpLBEnd->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBEnd->IsValueChangedFromSaved() ) @@ -693,7 +693,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG) return 0; } -IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(LinePropertyPanel, ChangeEdgeStyleHdl) { const sal_Int32 nPos(mpLBEdgeStyle->GetSelectEntryPos()); @@ -730,7 +730,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG) return 0; } -IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(LinePropertyPanel, ChangeCapStyleHdl) { const sal_Int32 nPos(mpLBCapStyle->GetSelectEntryPos()); @@ -771,7 +771,7 @@ IMPL_LINK_TYPED(LinePropertyPanel, ToolboxWidthSelectHdl,ToolBox*, pToolBox, voi } } -IMPL_LINK( LinePropertyPanel, ChangeTransparentHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( LinePropertyPanel, ChangeTransparentHdl ) { sal_uInt16 nVal = (sal_uInt16)mpMFTransparent->GetValue(); XLineTransparenceItem aItem( nVal ); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index d0495b63237f..3d0d836ed736 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -451,7 +451,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangeWidthHdl, void*, /*pBox*/ ) -IMPL_LINK( PosSizePropertyPanel, ChangeHeightHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeHeightHdl ) { if( mpCbxScale->IsChecked() && mpCbxScale->IsEnabled() ) @@ -475,7 +475,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangeHeightHdl, void *, EMPTYARG ) -IMPL_LINK( PosSizePropertyPanel, ChangePosXHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosXHdl ) { executePosX(); return 0; @@ -483,7 +483,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangePosXHdl, void *, EMPTYARG ) -IMPL_LINK( PosSizePropertyPanel, ChangePosYHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl ) { executePosY(); return 0; @@ -491,7 +491,7 @@ IMPL_LINK( PosSizePropertyPanel, ChangePosYHdl, void *, EMPTYARG ) -IMPL_LINK( PosSizePropertyPanel, ClickAutoHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl ) { if ( mpCbxScale->IsChecked() ) { @@ -508,7 +508,7 @@ IMPL_LINK( PosSizePropertyPanel, ClickAutoHdl, void *, EMPTYARG ) -IMPL_LINK( PosSizePropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PosSizePropertyPanel, AngleModifiedHdl ) { OUString sTmp = mpMtrAngle->GetText(); if (sTmp.isEmpty()) @@ -556,7 +556,7 @@ IMPL_LINK( PosSizePropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) -IMPL_LINK( PosSizePropertyPanel, RotationHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl ) { sal_Int32 nTmp = mpDial->GetRotation(); diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index c1a04c3bc177..221af081cfb5 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -111,7 +111,7 @@ void Popup::CreateContainerAndControl() mxControl.reset(maControlCreator(mxContainer.get())); } -IMPL_LINK(Popup, PopupModeEndHandler, void*, EMPTYARG) +IMPL_LINK_NOARG(Popup, PopupModeEndHandler) { if (maPopupModeEndCallback) maPopupModeEndCallback(); diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index d73654b7d0fb..db1c85693c66 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -104,7 +104,7 @@ IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) return 0; } -IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) +IMPL_LINK_NOARG(PageColumnControl, MoreButtonClickHdl_Impl) { mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SfxCallMode::ASYNCHRON ); diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 5ff924683c21..0b287f8a5299 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -172,7 +172,7 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) return 0; } -IMPL_LINK(PageSizeControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) +IMPL_LINK_NOARG(PageSizeControl, MoreButtonClickHdl_Impl) { mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SfxCallMode::ASYNCHRON ); diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index 78369ee77f29..62d28b665e21 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -164,7 +164,7 @@ void WrapPropertyPanel::Initialize() mpBindings->Update( FN_FRAME_WRAP_IDEAL ); } -IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) +IMPL_LINK_NOARG(WrapPropertyPanel, WrapTypeHdl) { sal_uInt16 nSlot = 0; if ( mpRBWrapLeft->IsChecked() ) diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx index d2671aaeee49..2aad56303df6 100644 --- a/test/source/vclbootstrapprotector.cxx +++ b/test/source/vclbootstrapprotector.cxx @@ -63,7 +63,7 @@ private: // unobootstrapprotector) is called before InitVCL (above), but component // context is disposed (redundantly again in unobootstrapprotector) from within // DeInitVCL (cf. Desktop::DeInit, desktop/source/app/app.cxx): -IMPL_STATIC_LINK(Protector, deinitHook, void *, EMPTYARG) { +IMPL_STATIC_LINK_NOARG(Protector, deinitHook) { css::uno::Reference context; try { context = comphelper::getProcessComponentContext(); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 7910b83b65e1..4edae11f6abe 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -382,7 +382,7 @@ void Application::Yield() ImplYield( true, false ); } -IMPL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg ) { ImplGetSVData()->maAppData.mbAppQuit = true; return 0; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index b55f1cb734df..e222bdff8dc5 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -430,7 +430,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) return 0; } -IMPL_LINK( ComboBox, ImplListItemSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( ComboBox, ImplListItemSelectHdl ) { CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); return 1; diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 156561b61634..a84a238e2a51 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -244,7 +244,7 @@ IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos ) return 1; } -IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG( ListBox, ImplListItemSelectHdl ) { CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); return 1; diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 9d309213bbb3..6d2bf82c12e5 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -283,7 +283,7 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal ) return 0; } -IMPL_STATIC_LINK( SessionManagerClient, InteractionHdl, void*, EMPTYARG ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, InteractionHdl ) { SAL_INFO("vcl.sm", "interaction link"); if( m_pSession ) @@ -295,7 +295,7 @@ IMPL_STATIC_LINK( SessionManagerClient, InteractionHdl, void*, EMPTYARG ) return 0; } -IMPL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void*, EMPTYARG ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownCancelHdl ) { SAL_INFO("vcl.sm", "shutdown cancel"); if( m_pSession ) @@ -345,7 +345,7 @@ void SessionManagerClient::SaveYourselfProc( SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" ); } -IMPL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void*, EMPTYARG ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl ) { if( m_pSession ) { -- cgit v1.2.3