summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog
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 /sfx2/source/dialog
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 'sfx2/source/dialog')
-rw-r--r--sfx2/source/dialog/basedlgs.cxx6
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx20
-rw-r--r--sfx2/source/dialog/dockwin.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx4
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/dialog/passwd.cxx4
-rw-r--r--sfx2/source/dialog/securitypage.cxx4
-rw-r--r--sfx2/source/dialog/srchdlg.cxx4
-rw-r--r--sfx2/source/dialog/tabdlg.cxx10
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/dialog/versdlg.cxx4
11 files changed, 31 insertions, 31 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 81c404cfd526..8cb8a0741492 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -324,7 +324,7 @@ void SfxModelessDialog::Move()
Implements a timer event that is triggered by a move or resize of the window
This will save config information to Views.xcu with a small delay
*/
-IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl)
{
pImp->aMoveTimer.Stop();
if ( pImp->bConstructed && pImp->pMgr )
@@ -612,7 +612,7 @@ void SfxFloatingWindow::Move()
Implements a timer event that is triggered by a move or resize of the window
This will save config information to Views.xcu with a small delay
*/
-IMPL_LINK( SfxFloatingWindow, TimerHdl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl)
{
pImp->aMoveTimer.Stop();
if ( pImp->bConstructed && pImp->pMgr )
@@ -677,7 +677,7 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const
// SfxSingleTabDialog ----------------------------------------------------
-IMPL_LINK( SfxSingleTabDialog, OKHdl_Impl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
/* [Description]
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 215212140aa9..8d9a3b0c0b38 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -877,7 +877,7 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet )
//------------------------------------------------------------------------
-IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl)
{
String aName;
if ( bEnableUseUserData && aUseUserDataCB.IsChecked() )
@@ -898,7 +898,7 @@ IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG )
return 0;
}
-IMPL_LINK( SfxDocumentPage, SignatureHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl)
{
SfxObjectShell* pDoc = SfxObjectShell::Current();
if( pDoc )
@@ -911,7 +911,7 @@ IMPL_LINK( SfxDocumentPage, SignatureHdl, PushButton*, EMPTYARG )
return 0;
}
-IMPL_LINK( SfxDocumentPage, ChangePassHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl)
{
SfxObjectShell* pShell = SfxObjectShell::Current();
do
@@ -1371,7 +1371,7 @@ IMPL_LINK( SfxInternetPage, ClickHdlForward, Control*, pCtrl )
//------------------------------------------------------------------------
-IMPL_LINK( SfxInternetPage, ClickHdlBrowseURL, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxInternetPage, ClickHdlBrowseURL)
{
if ( !pFileDlg )
pFileDlg = new sfx2::FileDialogHelper(
@@ -1384,7 +1384,7 @@ IMPL_LINK( SfxInternetPage, ClickHdlBrowseURL, PushButton*, EMPTYARG )
//------------------------------------------------------------------------
-IMPL_LINK( SfxInternetPage, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG )
+IMPL_LINK_NOARG(SfxInternetPage, DialogClosedHdl)
{
DBG_ASSERT( pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
@@ -1756,7 +1756,7 @@ CustomPropertiesEditButton::~CustomPropertiesEditButton()
{
}
-IMPL_LINK( CustomPropertiesEditButton, ClickHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl)
{
DurationDialog_Impl* pDurationDlg = new DurationDialog_Impl( this, m_pLine->m_aDurationField.GetDuration() );
if( RET_OK == pDurationDlg->Execute() )
@@ -1941,13 +1941,13 @@ IMPL_LINK( CustomPropertiesWindow, BoxLoseFocusHdl, CustomPropertiesTypeBox*, pB
return 0;
}
-IMPL_LINK( CustomPropertiesWindow, EditTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesWindow, EditTimeoutHdl)
{
ValidateLine( m_pCurrentLine, false );
return 0;
}
-IMPL_LINK( CustomPropertiesWindow, BoxTimeoutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesWindow, BoxTimeoutHdl)
{
ValidateLine( m_pCurrentLine, true );
return 0;
@@ -2371,7 +2371,7 @@ IMPL_LINK( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar )
return 0;
}
-IMPL_LINK( CustomPropertiesControl, RemovedHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(CustomPropertiesControl, RemovedHdl)
{
m_aVertScroll.SetRangeMax( m_aPropertiesWin.GetVisibleLineCount() + 1 );
if ( m_aPropertiesWin.GetOutputSizePixel().Height() < m_aPropertiesWin.GetVisibleLineCount() * m_aPropertiesWin.GetLineHeight() )
@@ -2402,7 +2402,7 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItem
m_aAddBtn.SetClickHdl( LINK( this, SfxCustomPropertiesPage, AddHdl ) );
}
-IMPL_LINK( SfxCustomPropertiesPage, AddHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl)
{
Any aAny;
m_aPropertiesCtrl.AddLine( ::rtl::OUString(), aAny, true );
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 4fa2f035f466..cfaa5ffd58bf 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1939,7 +1939,7 @@ void SfxDockingWindow::Move()
pImp->aMoveTimer.Start();
}
-IMPL_LINK( SfxDockingWindow, TimerHdl, Timer*, EMPTYARG)
+IMPL_LINK_NOARG(SfxDockingWindow, TimerHdl)
{
pImp->aMoveTimer.Stop();
if ( IsReallyVisible() && IsFloatingMode() )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index cb24cffbb7df..8da6138caa3b 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -694,7 +694,7 @@ void FileDialogHelper_Impl::updateVersions()
}
// -----------------------------------------------------------------------
-IMPL_LINK( FileDialogHelper_Impl, TimeOutHdl_Impl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl)
{
if ( !mbHasPreview )
return 0;
@@ -2298,7 +2298,7 @@ void FileDialogHelper::SetContext( Context _eNewContext )
}
// ------------------------------------------------------------------------
-IMPL_LINK( FileDialogHelper, ExecuteSystemFilePicker, void*, EMPTYARG )
+IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker)
{
m_nError = mpImp->execute();
if ( m_aDialogClosedLink.IsSet() )
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 5bfce3c8db42..4f4e86d7089d 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -156,7 +156,7 @@ namespace sfx2
std::vector<rtl::OUString>& rpURLList,
const SfxFilter* pFilter );
- DECL_LINK( TimeOutHdl_Impl, Timer* );
+ DECL_LINK(TimeOutHdl_Impl, void *);
DECL_LINK( HandleEvent, FileDialogHelper* );
DECL_LINK( InitControls, void* );
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index d66d14281dfd..681d3683bb0a 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -73,11 +73,11 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
maOKBtn.Enable( bEnable );
return 0;
}
-IMPL_LINK_INLINE_END( SfxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit)
// -----------------------------------------------------------------------
-IMPL_LINK( SfxPasswordDialog, OKHdl, OKButton *, EMPTYARG )
+IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
{
bool bConfirmFailed = ( ( mnExtras & SHOWEXTRAS_CONFIRM ) == SHOWEXTRAS_CONFIRM ) &&
( GetConfirm() != GetPassword() );
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index d30b8d64ce22..22efcf333ebb 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -387,7 +387,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
}
-IMPL_LINK( SfxSecurityPage_Impl, RecordChangesCBToggleHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl)
{
// when change recording gets disabled protection must be disabled as well
if (!m_aRecordChangesCB.IsChecked()) // the new check state is already present, thus the '!'
@@ -437,7 +437,7 @@ IMPL_LINK( SfxSecurityPage_Impl, RecordChangesCBToggleHdl, void*, EMPTYARG )
}
-IMPL_LINK( SfxSecurityPage_Impl, ChangeProtectionPBHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl)
{
if (m_eRedlingMode == RL_NONE)
return 0;
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 5ea75dd7f385..0d5528a7398b 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -141,7 +141,7 @@ void SearchDialog::SaveConfig()
aViewOpt.SetUserItem( USERITEM_NAME, aUserItem );
}
-IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SearchDialog, FindHdl)
{
String sSrchTxt = m_aSearchEdit.GetText();
sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt );
@@ -153,7 +153,7 @@ IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG )
return 0;
}
-IMPL_LINK( SearchDialog, ToggleHdl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(SearchDialog, ToggleHdl)
{
String sTemp = m_aWrapAroundBox.GetText();
m_aWrapAroundBox.SetText( m_sToggleText );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 8fd76ed79929..64d28b731c10 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -945,7 +945,7 @@ short SfxTabDialog::Ok()
// -----------------------------------------------------------------------
-IMPL_LINK( SfxTabDialog, CancelHdl, Button*, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, CancelHdl)
{
EndDialog( RET_USER_CANCEL );
return 0;
@@ -984,7 +984,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet()
// -----------------------------------------------------------------------
-IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, OkHdl)
/* [Description]
@@ -1048,7 +1048,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage()
// -----------------------------------------------------------------------
-IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, UserHdl)
/* [Description]
@@ -1074,7 +1074,7 @@ IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, ResetHdl)
/* [Description]
@@ -1101,7 +1101,7 @@ IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl)
/* [Description]
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index a24cb892d859..b5809ba5018d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -332,7 +332,7 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
}
-IMPL_LINK( DropListBox_Impl, OnAsyncExecuteDrop, SvLBoxEntry*, EMPTYARG )
+IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop)
{
pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE );
return 0;
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index f6ae242d7373..b43c6faa6bd3 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -353,13 +353,13 @@ void SfxVersionDialog::RecalcDateColumn()
}
}
-IMPL_LINK( SfxVersionDialog, DClickHdl_Impl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl)
{
Open_Impl();
return 0L;
}
-IMPL_LINK( SfxVersionDialog, SelectHdl_Impl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl)
{
bool bEnable = ( aVersionBox.FirstSelected() != NULL );
SfxObjectShell* pObjShell = pViewFrame->GetObjectShell();