summaryrefslogtreecommitdiff
path: root/formula
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 /formula
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 'formula')
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx2
-rw-r--r--formula/source/ui/dlg/formula.cxx26
-rw-r--r--formula/source/ui/dlg/funcpage.cxx2
-rw-r--r--formula/source/ui/dlg/funcpage.hxx2
-rw-r--r--formula/source/ui/dlg/funcutl.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.cxx2
-rw-r--r--formula/source/ui/dlg/parawin.hxx2
7 files changed, 20 insertions, 20 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 63c0a7eebebf..0cc96d284abe 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -60,7 +60,7 @@ private:
Link aSelChangedLink;
Selection aOldSel;
sal_Bool bMouseFlag;
- DECL_LINK( ChangedHdl, EditBox* );
+ DECL_LINK(ChangedHdl, void *);
protected:
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 23febccef72f..3789538a3d80 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -142,15 +142,15 @@ namespace formula
DECL_LINK( ModifyHdl, ParaWin* );
DECL_LINK( FxHdl, ParaWin* );
- DECL_LINK( MatrixHdl, CheckBox *);
- DECL_LINK( FormulaHdl, MultiLineEdit* );
- DECL_LINK( FormulaCursorHdl, EditBox*);
+ DECL_LINK(MatrixHdl, void *);
+ DECL_LINK(FormulaHdl, void *);
+ DECL_LINK(FormulaCursorHdl, void *);
DECL_LINK( BtnHdl, PushButton* );
DECL_LINK( GetEdFocusHdl, ArgInput* );
DECL_LINK( GetFxFocusHdl, ArgInput* );
- DECL_LINK( DblClkHdl, FuncPage* );
- DECL_LINK( FuncSelHdl, FuncPage*);
- DECL_LINK( StructSelHdl, StructPage * );
+ DECL_LINK(DblClkHdl, void *);
+ DECL_LINK(FuncSelHdl, void *);
+ DECL_LINK(StructSelHdl, void *);
public:
OModuleClient m_aModuleClient;
mutable uno::Reference< sheet::XFormulaOpCodeMapper> m_xOpCodeMapper;
@@ -1029,7 +1029,7 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
// Handler for Listboxes
-IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
+IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl)
{
sal_uInt16 nFunc = pFuncPage->GetFunction();
@@ -1242,7 +1242,7 @@ IMPL_LINK( FormulaDlg_Impl, ModifyHdl, ParaWin*, pPtr )
return 0;
}
-IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
+IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl)
{
FormEditData* pData = m_pHelper->getFormEditData();
@@ -1307,7 +1307,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
return 0;
}
-IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG )
+IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl)
{
FormEditData* pData = m_pHelper->getFormEditData();
if (!pData) return 0;
@@ -1537,7 +1537,7 @@ sal_Bool FormulaDlg_Impl::CheckMatrix(String& aFormula)
aTabCtrl.SetCurPageId(TP_STRUCT);
return bMatrix;
}
-IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG )
+IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl)
{
bStructUpdate=sal_False;
if(pStructPage->IsVisible()) aBtnForward.Enable(sal_False); //@New
@@ -1545,13 +1545,13 @@ IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG )
bStructUpdate=sal_True;
return 0;
}
-IMPL_LINK( FormulaDlg_Impl, MatrixHdl, CheckBox *, EMPTYARG )
+IMPL_LINK_NOARG(FormulaDlg_Impl, MatrixHdl)
{
bUserMatrixFlag=sal_True;
return 0;
}
-IMPL_LINK( FormulaDlg_Impl, FuncSelHdl, FuncPage*, EMPTYARG )
+IMPL_LINK_NOARG(FormulaDlg_Impl, FuncSelHdl)
{
sal_uInt16 nCat = pFuncPage->GetCategory();
if ( nCat == LISTBOX_ENTRY_NOTFOUND ) nCat = 0;
@@ -1872,7 +1872,7 @@ void FormulaDlg::SetEdSelection()
{
m_pImpl->SetEdSelection();
}
-IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl)
{
FormEditData* pData = m_pImpl->m_pHelper->getFormEditData();
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 22ea529b5003..46696e7f87c1 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -201,7 +201,7 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb )
return 0;
}
-IMPL_LINK( FuncPage, DblClkHdl, ListBox*, EMPTYARG )
+IMPL_LINK_NOARG(FuncPage, DblClkHdl)
{
aDoubleClickLink.Call(this);
return 0;
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index b71dd4aee5cd..a6542ebed536 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -88,7 +88,7 @@ private:
void impl_addFunctions(const IFunctionCategory* _pCategory);
DECL_LINK( SelHdl, ListBox* );
- DECL_LINK( DblClkHdl, ListBox* );
+ DECL_LINK(DblClkHdl, void *);
protected:
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index d13a4b6dd62a..36115d0f6a4a 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -873,7 +873,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
#* Output: ---
#*
#************************************************************************/
-IMPL_LINK( EditBox, ChangedHdl, EditBox*, EMPTYARG )
+IMPL_LINK_NOARG(EditBox, ChangedHdl)
{
if(pMEdit!=NULL)
{
@@ -999,7 +999,7 @@ void RefEdit::LoseFocus()
pAnyRefDlg->HideReference();
}
-IMPL_LINK( RefEdit, UpdateHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(RefEdit, UpdateHdl)
{
if( pAnyRefDlg )
pAnyRefDlg->ShowReference( GetText() );
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 7eeaf21c8597..f3a0a2343437 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -555,7 +555,7 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
}
-IMPL_LINK( ParaWin, ScrollHdl, ScrollBar*, EMPTYARG )
+IMPL_LINK_NOARG(ParaWin, ScrollHdl)
{
SliderMoved();
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index e8c031857c20..968de863c9a6 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -102,7 +102,7 @@ private:
::std::vector<String>
aParaArray;
- DECL_LINK( ScrollHdl, ScrollBar* );
+ DECL_LINK(ScrollHdl, void *);
DECL_LINK( ModifyHdl, ArgInput* );
DECL_LINK( GetEdFocusHdl, ArgInput* );
DECL_LINK( GetFxFocusHdl, ArgInput* );