summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
commitbd205223ec029a875c662474bb6d423d3cdd1994 (patch)
tree6531a292edb0d2a13103a4c55cbd10e7137b8a58 /framework/source
parent32781c2d268ed94eb46318a0398385baf31368c4 (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 'framework/source')
-rw-r--r--framework/source/classes/fwktabwindow.cxx4
-rw-r--r--framework/source/classes/menumanager.cxx2
-rw-r--r--framework/source/dispatch/closedispatcher.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx6
-rw-r--r--framework/source/services/autorecovery.cxx4
-rw-r--r--framework/source/services/backingwindow.cxx2
-rw-r--r--framework/source/services/license.cxx10
-rw-r--r--framework/source/services/substitutepathvars.cxx2
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx12
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--framework/source/uielement/statusbarmanager.cxx4
-rw-r--r--framework/source/uielement/toolbarmanager.cxx14
12 files changed, 32 insertions, 32 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 2f89d8ded3f8..e46fc441a4b7 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -286,7 +286,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
// -----------------------------------------------------------------------
-IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG )
+IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
{
const sal_uInt16 nId = m_aTabCtrl.GetCurPageId();
FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl.GetTabPage( nId ) );
@@ -310,7 +310,7 @@ IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( FwkTabWindow, DeactivatePageHdl, TabControl *, EMPTYARG )
+IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl)
{
m_aTabCtrl.BroadcastEvent( VCLEVENT_TABPAGE_DEACTIVATE );
return 1;
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index e2a08deb13db..8f015638737b 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -956,7 +956,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
}
-IMPL_LINK( MenuManager, Highlight, Menu *, EMPTYARG )
+IMPL_LINK_NOARG(MenuManager, Highlight)
{
return 0;
}
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 2a8d20b02abf..01523d2e4f06 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -266,7 +266,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
- decide then, if we must close this frame only, establish the backing mode
or shutdown the whole application.
*/
-IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG )
+IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
{
try
{
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e25d74b7de18..3b4774ca2948 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2666,7 +2666,7 @@ sal_Bool LayoutManager::implts_resetMenuBar()
return sal_False;
}
-IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
+IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
{
ReadGuard aReadLock( m_aLock );
uno::Reference< frame::XDispatchProvider > xProvider(m_xFrame, uno::UNO_QUERY);
@@ -2689,7 +2689,7 @@ IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
return 0;
}
-IMPL_LINK( LayoutManager, SettingsChanged, void*, EMPTYARG )
+IMPL_LINK_NOARG(LayoutManager, SettingsChanged)
{
return 1;
}
@@ -2832,7 +2832,7 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr
}
}
-IMPL_LINK( LayoutManager, AsyncLayoutHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl)
{
ReadGuard aReadLock( m_aLock );
m_aAsyncLayoutTimer.Stop();
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 343671030c17..eb534842cf15 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1536,7 +1536,7 @@ void AutoRecovery::implts_stopTimer()
}
//-----------------------------------------------
-IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
+IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
{
try
{
@@ -1637,7 +1637,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
}
//-----------------------------------------------
-IMPL_LINK(AutoRecovery, implts_asyncDispatch, void*, EMPTYARG)
+IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch)
{
// SAFE ->
WriteGuard aWriteLock(m_aLock);
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 2db5879071bd..0b8976981840 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -893,7 +893,7 @@ void BackingWindow::Resize()
maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
}
-IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(BackingWindow, ToolboxHdl)
{
const char* pNodePath = NULL;
const char* pNode = NULL;
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 3b2ef61eed7c..fdf60e270349 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -463,13 +463,13 @@ LicenseDialog::~LicenseDialog()
{
}
-IMPL_LINK( LicenseDialog, PageDownHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, PageDownHdl)
{
aLicenseML.ScrollDown( SCROLL_PAGEDOWN );
return 0;
}
-IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, EndReachedHdl)
{
bEndReached = sal_True;
@@ -478,19 +478,19 @@ IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG )
return 0;
}
-IMPL_LINK( LicenseDialog, ScrolledHdl, LicenseView *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, ScrolledHdl)
{
EnableControls();
return 0;
}
-IMPL_LINK( LicenseDialog, DeclineBtnHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, DeclineBtnHdl)
{
EndDialog(0);
return 0;
}
-IMPL_LINK( LicenseDialog, AcceptBtnHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialog, AcceptBtnHdl)
{
EndDialog(1);
return 0;
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 7ef9502114dc..b96bb715b87a 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -678,7 +678,7 @@ throw ( NoSuchElementException, RuntimeException )
// protected methods
//_________________________________________________________________________________________________________________
-IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNotify*, EMPTYARG )
+IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
ResetableGuard aLock( m_aLock );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 6ae3d09cbe5c..4f698299e820 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -421,7 +421,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
AddFrameActionListener();
}
-IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Click)
{
if ( m_bDisposed )
return 1;
@@ -439,7 +439,7 @@ IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG )
return 1;
}
-IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, DoubleClick)
{
if ( m_bDisposed )
return 1;
@@ -457,7 +457,7 @@ IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
return 1;
}
-IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Command)
{
ResetableGuard aGuard( m_aLock );
@@ -467,7 +467,7 @@ IMPL_LINK( AddonsToolBarManager, Command, CommandEvent*, EMPTYARG )
return 0;
}
-IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Select)
{
if ( m_bDisposed )
return 1;
@@ -486,12 +486,12 @@ IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG )
return 1;
}
-IMPL_LINK( AddonsToolBarManager, Activate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Activate)
{
return 1;
}
-IMPL_LINK( AddonsToolBarManager, Deactivate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate)
{
return 1;
}
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 64e86f995595..0ff34d6d097b 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1125,7 +1125,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
}
-IMPL_LINK( MenuBarManager, Highlight, Menu *, EMPTYARG )
+IMPL_LINK_NOARG(MenuBarManager, Highlight)
{
return 0;
}
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 95ed4c1d57b1..3093ec77ad0e 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -664,7 +664,7 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt )
MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp);
}
-IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG )
+IMPL_LINK_NOARG(StatusBarManager, Click)
{
ResetableGuard aGuard( m_aLock );
@@ -683,7 +683,7 @@ IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG )
return 1;
}
-IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG )
+IMPL_LINK_NOARG(StatusBarManager, DoubleClick)
{
ResetableGuard aGuard( m_aLock );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 0104b65fd531..067dbe4eacb1 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1613,12 +1613,12 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
return 1;
}
-IMPL_LINK( ToolBarManager, Click, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Click)
{
return HandleClick(&XToolbarController::click);
}
-IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, DropdownClick)
{
ResetableGuard aGuard( m_aLock );
@@ -1641,7 +1641,7 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
return 1;
}
-IMPL_LINK( ToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, DoubleClick)
{
return HandleClick(&XToolbarController::doubleClick);
}
@@ -2056,7 +2056,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
return 1;
}
-IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Select)
{
if ( m_bDisposed )
return 1;
@@ -2076,12 +2076,12 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
return 1;
}
-IMPL_LINK( ToolBarManager, Activate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Activate)
{
return 1;
}
-IMPL_LINK( ToolBarManager, Deactivate, ToolBox*, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, Deactivate)
{
return 1;
}
@@ -2139,7 +2139,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent )
return 1;
}
-IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl)
{
// The guard must be in its own context as the we can get destroyed when our
// own xInterface reference get destroyed!