summaryrefslogtreecommitdiff
path: root/sfx2/inc/sfx2
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/inc/sfx2
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/inc/sfx2')
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx6
-rw-r--r--sfx2/inc/sfx2/dinfdlg.hxx18
-rw-r--r--sfx2/inc/sfx2/docinsert.hxx2
-rw-r--r--sfx2/inc/sfx2/dockwin.hxx2
-rw-r--r--sfx2/inc/sfx2/passwd.hxx2
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx10
6 files changed, 20 insertions, 20 deletions
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index c668c4e39780..503b2098c5f8 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -122,7 +122,7 @@ public:
SfxBindings& GetBindings()
{ return *pBindings; }
- DECL_LINK( TimerHdl, Timer* );
+ DECL_LINK(TimerHdl, void *);
};
@@ -160,7 +160,7 @@ public:
virtual void FillInfo(SfxChildWinInfo&) const;
void Initialize (SfxChildWinInfo* pInfo);
- DECL_LINK( TimerHdl, Timer* );
+ DECL_LINK(TimerHdl, void *);
};
@@ -204,7 +204,7 @@ private:
SingleTabDlgImpl* pImpl;
- DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
+ DECL_DLLPRIVATE_LINK(OKHdl_Impl, void *);
};
#endif
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 115a6dfe34c9..8e1dbee971d0 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -212,9 +212,9 @@ private:
sal_Bool bEnableUseUserData : 1,
bHandleDelete : 1;
- DECL_LINK( DeleteHdl, PushButton * );
- DECL_LINK( SignatureHdl, PushButton * );
- DECL_LINK( ChangePassHdl, PushButton * );
+ DECL_LINK(DeleteHdl, void *);
+ DECL_LINK(SignatureHdl, void *);
+ DECL_LINK(ChangePassHdl, void *);
void ImplUpdateSignatures();
void ImplCheckPasswordState();
@@ -300,8 +300,8 @@ private:
DECL_LINK( ClickHdlNoUpdate, Control* );
DECL_LINK( ClickHdlReload, Control* );
DECL_LINK( ClickHdlForward, Control* );
- DECL_LINK( ClickHdlBrowseURL, PushButton* );
- DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
+ DECL_LINK(ClickHdlBrowseURL, void *);
+ DECL_LINK(DialogClosedHdl, void *);
using TabPage::DeactivatePage;
@@ -404,7 +404,7 @@ public:
CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine );
~CustomPropertiesEditButton();
- DECL_LINK(ClickHdl, PushButton*);
+ DECL_LINK(ClickHdl, void *);
};
class CustomPropertiesRemoveButton : public ImageButton
@@ -494,8 +494,8 @@ private:
DECL_LINK( BoxLoseFocusHdl, CustomPropertiesTypeBox* );
//add lose focus handlers of Date/TimeField?
- DECL_LINK( EditTimeoutHdl, Timer* );
- DECL_LINK( BoxTimeoutHdl, Timer* );
+ DECL_LINK(EditTimeoutHdl, void *);
+ DECL_LINK(BoxTimeoutHdl, void *);
bool IsLineValid( CustomPropertyLine* pLine ) const;
void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox );
@@ -553,7 +553,7 @@ private:
PushButton m_aAddBtn;
FixedText m_aPropertiesFT; // Sym2_5121----, Moved by Steve Yin
- DECL_LINK( AddHdl, PushButton* );
+ DECL_LINK(AddHdl, void *);
using TabPage::DeactivatePage;
diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx
index 6ec962764a73..28e4de832ab6 100644
--- a/sfx2/inc/sfx2/docinsert.hxx
+++ b/sfx2/inc/sfx2/docinsert.hxx
@@ -58,7 +58,7 @@ private:
SfxItemSet* m_pItemSet;
std::vector<rtl::OUString> m_pURLList;
- DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
+ DECL_LINK(DialogClosedHdl, void *);
public:
DocumentInserter(const String& rFactory,
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index e1436ab7f346..b4313c7348ba 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -110,7 +110,7 @@ public:
virtual long Notify( NotifyEvent& rNEvt );
virtual void FadeIn( sal_Bool );
void AutoShow( sal_Bool bShow = sal_True );
- DECL_LINK( TimerHdl, Timer* );
+ DECL_LINK(TimerHdl, void *);
SAL_DLLPRIVATE void Initialize_Impl();
SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const;
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 5a014c14ace7..2e07153973c1 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -77,7 +77,7 @@ private:
bool mbAsciiOnly;
DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* );
- DECL_DLLPRIVATE_LINK( OKHdl, OKButton* );
+ DECL_DLLPRIVATE_LINK(OKHdl, void *);
void SetPasswdText();
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 7db8f7a39b4b..36d78911a649 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -93,11 +93,11 @@ friend class SfxTabDialogController;
DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
- DECL_DLLPRIVATE_LINK( OkHdl, Button * );
- DECL_DLLPRIVATE_LINK( ResetHdl, Button * );
- DECL_DLLPRIVATE_LINK( BaseFmtHdl, Button * );
- DECL_DLLPRIVATE_LINK( UserHdl, Button * );
- DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
+ DECL_DLLPRIVATE_LINK(OkHdl, void *);
+ DECL_DLLPRIVATE_LINK(ResetHdl, void *);
+ DECL_DLLPRIVATE_LINK(BaseFmtHdl, void *);
+ DECL_DLLPRIVATE_LINK(UserHdl, void *);
+ DECL_DLLPRIVATE_LINK(CancelHdl, void *);
SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *);
protected: