summaryrefslogtreecommitdiff
path: root/basctl
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 /basctl
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 'basctl')
-rw-r--r--basctl/source/basicide/baside2.hxx4
-rw-r--r--basctl/source/basicide/baside2b.cxx6
-rw-r--r--basctl/source/basicide/basides2.cxx4
-rw-r--r--basctl/source/basicide/bastype3.hxx4
-rw-r--r--basctl/source/basicide/bastypes.cxx4
-rw-r--r--basctl/source/basicide/macrodlg.cxx4
-rw-r--r--basctl/source/basicide/macrodlg.hxx2
-rw-r--r--basctl/source/basicide/moduldl2.cxx6
-rw-r--r--basctl/source/basicide/moduldlg.hxx6
-rw-r--r--basctl/source/dlged/dlged.cxx4
-rw-r--r--basctl/source/dlged/managelang.cxx8
-rw-r--r--basctl/source/inc/basidesh.hxx2
-rw-r--r--basctl/source/inc/dlged.hxx4
-rw-r--r--basctl/source/inc/managelang.hxx8
14 files changed, 33 insertions, 33 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index a44e02b8e796..0be4bb76d2b5 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -110,7 +110,7 @@ private:
SyntaxHighlighter aHighlighter;
Timer aSyntaxIdleTimer;
Table aSyntaxLineTable;
- DECL_LINK( SyntaxTimerHdl, Timer * );
+ DECL_LINK(SyntaxTimerHdl, void *);
ProgressInfo* pProgress;
ModulWindow* pModulWindow;
@@ -248,7 +248,7 @@ protected:
virtual void Paint( const Rectangle& rRect );
DECL_LINK( ButtonHdl, ImageButton * );
- DECL_LINK( TreeListHdl, SvTreeListBox * );
+ DECL_LINK(TreeListHdl, void *);
DECL_LINK( implEndDragHdl, HeaderBar * );
DECL_LINK( EditAccHdl, Accelerator * );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index d42a407a405f..b7e394c91cb3 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -876,7 +876,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
}
}
-IMPL_LINK( EditorWindow, SyntaxTimerHdl, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl)
{
DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" );
@@ -1454,7 +1454,7 @@ IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton )
-IMPL_LINK_INLINE_START( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
{
SvLBoxEntry* pCurEntry = aTreeListBox.GetCurEntry();
if ( pCurEntry && pCurEntry->GetUserData() )
@@ -1462,7 +1462,7 @@ IMPL_LINK_INLINE_START( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG )
return 0;
}
-IMPL_LINK_INLINE_END( WatchWindow, TreeListHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(WatchWindow, TreeListHdl)
IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 791732153352..f4a0d0e29e8d 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -58,12 +58,12 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
namespace css = ::com::sun::star;
-IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(BasicIDEShell, ObjectDialogCancelHdl)
{
ShowObjectDialog( sal_False, sal_True );
return 0;
}
-IMPL_LINK_INLINE_END( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(BasicIDEShell, ObjectDialogCancelHdl)
Reference< view::XRenderable > BasicIDEShell::GetRenderable()
{
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index bc27eaa6cf90..c3e978073c74 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -48,8 +48,8 @@ private:
protected:
DECL_LINK( EditAccHdl, Accelerator * );
- DECL_LINK( ImplGetFocusHdl, Control* );
- DECL_LINK( ImplLoseFocusHdl, Control* );
+ DECL_LINK(ImplGetFocusHdl, void *);
+ DECL_LINK(ImplLoseFocusHdl, void *);
public:
ExtendedEdit( Window* pParent, IDEResId nRes );
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 67244eac269c..7cffc4b2cea7 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -344,7 +344,7 @@ ExtendedEdit::ExtendedEdit( Window* pParent, IDEResId nRes ) :
Control::SetLoseFocusHdl( LINK( this, ExtendedEdit, ImplLoseFocusHdl ) );
}
-IMPL_LINK( ExtendedEdit, ImplGetFocusHdl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl)
{
Application::InsertAccel( &aAcc );
aLoseFocusHdl.Call( this );
@@ -352,7 +352,7 @@ IMPL_LINK( ExtendedEdit, ImplGetFocusHdl, Control*, EMPTYARG )
}
-IMPL_LINK( ExtendedEdit, ImplLoseFocusHdl, Control*, EMPTYARG )
+IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl)
{
Application::RemoveAccel( &aAcc );
return 0;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index dea7cc0f711d..05e27d37f4b1 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -497,7 +497,7 @@ void MacroChooser::CheckButtons()
-IMPL_LINK_INLINE_START( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_START(MacroChooser, MacroDoubleClickHdl)
{
StoreMacroDescription();
if ( nMode == MACROCHOOSER_RECORDING )
@@ -510,7 +510,7 @@ IMPL_LINK_INLINE_START( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPT
EndDialog( MACRO_OK_RUN );
return 0;
}
-IMPL_LINK_INLINE_END( MacroChooser, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG )
+IMPL_LINK_NOARG_INLINE_END(MacroChooser, MacroDoubleClickHdl)
IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
{
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 85cce75898e9..ef4f3bf24a33 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -79,7 +79,7 @@ private:
sal_uInt16 nMode;
DECL_LINK( MacroSelectHdl, SvTreeListBox * );
- DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
+ DECL_LINK(MacroDoubleClickHdl, void *);
DECL_LINK( BasicSelectHdl, SvTreeListBox * );
DECL_LINK( EditModifyHdl, Edit * );
DECL_LINK( ButtonHdl, Button * );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 0f7a1ce0d65d..ebb113765fc7 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -380,7 +380,7 @@ sal_Bool BasicCheckBox::EditedEntry( SvLBoxEntry* pEntry, const String& rNewText
// NewObjectDialog
//----------------------------------------------------------------------------
-IMPL_LINK(NewObjectDialog, OkButtonHandler, Button *, EMPTYARG)
+IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
{
if (BasicIDE::IsValidSbxName(aEdit.GetText()))
EndDialog(1);
@@ -455,7 +455,7 @@ sal_Int32 GotoLineDialog::GetLineNumber()
return rtl::OUString( aEdit.GetText() ).toInt32();
}
-IMPL_LINK(GotoLineDialog, OkButtonHandler, Button *, EMPTYARG)
+IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
{
if ( GetLineNumber() )
EndDialog(1);
@@ -469,7 +469,7 @@ IMPL_LINK(GotoLineDialog, OkButtonHandler, Button *, EMPTYARG)
// ExportDialog
//----------------------------------------------------------------------------
-IMPL_LINK(ExportDialog, OkButtonHandler, Button *, EMPTYARG)
+IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
{
mbExportAsPackage = maExportAsPackageButton.IsChecked();
EndDialog(1);
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index dd4e03a86946..0626bab789ff 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -62,7 +62,7 @@ private:
OKButton aOKButton;
CancelButton aCancelButton;
- DECL_LINK(OkButtonHandler, Button *);
+ DECL_LINK(OkButtonHandler, void *);
public:
NewObjectDialog(Window * pParent, NewObjectMode nMode, bool bCheckName = false);
@@ -78,7 +78,7 @@ class GotoLineDialog : public ModalDialog
Edit aEdit;
OKButton aOKButton;
CancelButton aCancelButton;
- DECL_LINK(OkButtonHandler, Button *);
+ DECL_LINK(OkButtonHandler, void *);
public:
GotoLineDialog( Window * pParent );
sal_Int32 GetLineNumber();
@@ -94,7 +94,7 @@ private:
sal_Bool mbExportAsPackage;
- DECL_LINK(OkButtonHandler, Button *);
+ DECL_LINK(OkButtonHandler, void *);
public:
ExportDialog( Window * pParent );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 2769145074cb..c90e0f2e036c 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -507,7 +507,7 @@ void DlgEditor::Paint( const Rectangle& rRect )
}
-IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
{
if( !pDlgEdView )
return 0;
@@ -618,7 +618,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
}
-IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG )
+IMPL_LINK_NOARG(DlgEditor, MarkTimeout)
{
BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index c224f85e0424..01935d5d1046 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -203,7 +203,7 @@ void ManageLanguageDialog::ClearLanguageBox()
m_aLanguageLB.Clear();
}
-IMPL_LINK( ManageLanguageDialog, AddHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
{
SetDefaultLanguageDialog aDlg( this, m_pLocalizationMgr );
if ( RET_OK == aDlg.Execute() )
@@ -222,7 +222,7 @@ IMPL_LINK( ManageLanguageDialog, AddHdl, Button *, EMPTYARG )
return 1;
}
-IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
{
QueryBox aQBox( this, IDEResId( RID_QRYBOX_LANGUAGE ) );
aQBox.SetButtonText( RET_OK, m_sDeleteStr );
@@ -253,7 +253,7 @@ IMPL_LINK( ManageLanguageDialog, DeleteHdl, Button *, EMPTYARG )
return 1;
}
-IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl)
{
sal_uInt16 nPos = m_aLanguageLB.GetSelectEntryPos();
LanguageEntry* pSelectEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData( nPos ) );
@@ -272,7 +272,7 @@ IMPL_LINK( ManageLanguageDialog, MakeDefHdl, Button *, EMPTYARG )
return 1;
}
-IMPL_LINK( ManageLanguageDialog, SelectHdl, ListBox *, EMPTYARG )
+IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
{
sal_uInt16 nCount = m_aLanguageLB.GetEntryCount();
bool bEmpty = ( !nCount ||
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 3f1b757df62b..2978eed81849 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -118,7 +118,7 @@ friend class ContainerListenerImpl;
void ImplStartListening( StarBASIC* pBasic );
DECL_LINK( TabBarHdl, TabBar* );
- DECL_LINK( ObjectDialogCancelHdl, ObjectCatalog * );
+ DECL_LINK(ObjectDialogCancelHdl, void *);
DECL_LINK( TabBarSplitHdl, TabBar * );
#endif
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 1d7b1f98e2a4..ae7483ec1c33 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -96,8 +96,8 @@ class Window;
class DlgEditor: public SfxBroadcaster
{
private:
- DECL_LINK( PaintTimeout, Timer * );
- DECL_LINK( MarkTimeout, Timer * );
+ DECL_LINK(PaintTimeout, void *);
+ DECL_LINK(MarkTimeout, void *);
void Print( Printer* pPrinter, const ::rtl::OUString& rTitle );
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 3ff9db6fe324..4828bf9002b5 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -79,10 +79,10 @@ private:
void FillLanguageBox();
void ClearLanguageBox();
- DECL_LINK( AddHdl, Button * );
- DECL_LINK( DeleteHdl, Button * );
- DECL_LINK( MakeDefHdl, Button * );
- DECL_LINK( SelectHdl, ListBox * );
+ DECL_LINK(AddHdl, void *);
+ DECL_LINK(DeleteHdl, void *);
+ DECL_LINK(MakeDefHdl, void *);
+ DECL_LINK(SelectHdl, void *);
public:
ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr );