diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
| commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
| tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /sw/source/ui/dbui/mmoutputpage.hxx | |
| parent | given that we can build with java7 now, allow it for windows too (diff) | |
| download | core-bd205223ec029a875c662474bb6d423d3cdd1994.tar.gz core-bd205223ec029a875c662474bb6d423d3cdd1994.zip | |
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 'sw/source/ui/dbui/mmoutputpage.hxx')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 36c30428b024..0aace255a628 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -128,13 +128,13 @@ class SwMailMergeOutputPage : public svt::OWizardPage DECL_LINK(SaveStartHdl_Impl, PushButton* ); DECL_LINK(SaveOutputHdl_Impl, PushButton* ); DECL_LINK(PrinterChangeHdl_Impl, ListBox* ); - DECL_LINK(PrintHdl_Impl, PushButton* ); + DECL_LINK(PrintHdl_Impl, void *); DECL_LINK(PrinterSetupHdl_Impl, PushButton* ); DECL_LINK(SendTypeHdl_Impl, ListBox*); DECL_LINK(SendAsHdl_Impl, PushButton*); DECL_LINK(SendDocumentsHdl_Impl, PushButton*); DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*); - DECL_LINK(SaveCancelHdl_Impl, Button*); + DECL_LINK(SaveCancelHdl_Impl, void *); protected: virtual bool canAdvance() const; virtual void ActivatePage(); @@ -203,9 +203,9 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog sal_Int32 m_nSendCount; sal_Int32 m_nErrorCount; - SW_DLLPRIVATE DECL_LINK( DetailsHdl_Impl, PushButton* ); + SW_DLLPRIVATE DECL_LINK( DetailsHdl_Impl, void* ); SW_DLLPRIVATE DECL_LINK( StopHdl_Impl, PushButton* ); - SW_DLLPRIVATE DECL_LINK( CloseHdl_Impl, PushButton* ); + SW_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* ); SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* ); SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* ); SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer* ); |