summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
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 /sd/source/ui/inc
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 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx2
-rw-r--r--sd/source/ui/inc/DialogListBox.hxx2
-rw-r--r--sd/source/ui/inc/FormShellManager.hxx2
-rw-r--r--sd/source/ui/inc/OutlineView.hxx4
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/inc/ViewShellImplementation.hxx2
-rw-r--r--sd/source/ui/inc/custsdlg.hxx4
-rw-r--r--sd/source/ui/inc/dlgass.hxx2
-rw-r--r--sd/source/ui/inc/fupoor.hxx6
-rw-r--r--sd/source/ui/inc/headerfooterdlg.hxx2
-rw-r--r--sd/source/ui/inc/navigatr.hxx2
-rw-r--r--sd/source/ui/inc/prntopts.hxx2
-rw-r--r--sd/source/ui/inc/pubdlg.hxx18
-rw-r--r--sd/source/ui/inc/taskpane/ScrollPanel.hxx2
-rw-r--r--sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx2
-rw-r--r--sd/source/ui/inc/tpoption.hxx2
-rw-r--r--sd/source/ui/inc/vectdlg.hxx4
17 files changed, 31 insertions, 31 deletions
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index dd43694aa436..5e7f415bb0b1 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -87,7 +87,7 @@ private:
DECL_LINK( CancelButtonHdl, void* );
DECL_LINK( UpDate, void* );
- DECL_LINK( InitialUpdate, Timer* );
+ DECL_LINK( InitialUpdate, void* );
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/DialogListBox.hxx b/sd/source/ui/inc/DialogListBox.hxx
index 4b1e0cea8178..5d62b14350b5 100644
--- a/sd/source/ui/inc/DialogListBox.hxx
+++ b/sd/source/ui/inc/DialogListBox.hxx
@@ -57,7 +57,7 @@ protected:
void ImplInitScrollBars();
void ImplResizeChild();
- DECL_LINK( ScrollBarHdl, ScrollBar* );
+ DECL_LINK(ScrollBarHdl, void *);
public:
DialogListBox( ::Window* pParent, WinBits nWinStyle );
diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx
index 54b20ddfcfea..5dcb1f50e0d6 100644
--- a/sd/source/ui/inc/FormShellManager.hxx
+++ b/sd/source/ui/inc/FormShellManager.hxx
@@ -129,7 +129,7 @@ private:
/** This call back is called by the form shell when it gets the focus.
In this case the form shell is moved to the top of the shell stack.
*/
- DECL_LINK(FormControlActivated, FmFormShell*);
+ DECL_LINK(FormControlActivated, void *);
/** This method is called by the form shell when that is destroyed. It
acts as a last resort against referencing a dead form shell. With
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 82eba378fb72..71439b7fe35d 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -113,10 +113,10 @@ public:
DECL_LINK( ParagraphInsertedHdl, Outliner * );
DECL_LINK( ParagraphRemovingHdl, Outliner * );
DECL_LINK( DepthChangedHdl, Outliner * );
- DECL_LINK( StatusEventHdl, EditStatus * );
+ DECL_LINK( StatusEventHdl, void * );
DECL_LINK( BeginMovingHdl, Outliner * );
DECL_LINK( EndMovingHdl, Outliner * );
- DECL_LINK( RemovingPagesHdl, OutlinerView * );
+ DECL_LINK(RemovingPagesHdl, void *);
DECL_LINK( IndentingPagesHdl, OutlinerView * );
DECL_LINK( BeginDropHdl, void * );
DECL_LINK( EndDropHdl, void * );
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index bbad2c5e901a..92ba1d1ee71a 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -230,8 +230,8 @@ protected:
boost::ptr_vector<SdViewRedrawRec> maLockedRedraws;
bool mbIsDropAllowed;
- DECL_LINK( DropErrorHdl, Timer* );
- DECL_LINK( DropInsertFileHdl, Timer* );
+ DECL_LINK( DropErrorHdl, void* );
+ DECL_LINK( DropInsertFileHdl, void* );
DECL_LINK( ExecuteNavigatorDrop, SdNavigatorDropEvent* pSdNavigatorDropEvent );
void ImplClearDrawDropMarker();
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index aad225fba1d0..0efa987180f8 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -86,7 +86,7 @@ public:
when IsUICaptured() returns <TRUE/>.
*/
void Release (bool bForce = false);
- DECL_LINK(TimeoutCallback,Timer*);
+ DECL_LINK(TimeoutCallback, void *);
private:
::std::auto_ptr<ToolBarManager::UpdateLock> mpLock;
/** The timer is used both as a safe guard to unlock the update lock
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index 18cb8d44cf10..cb077e06fd21 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -63,7 +63,7 @@ private:
void CheckState();
DECL_LINK( ClickButtonHdl, void * );
- DECL_LINK( StartShowHdl, Button* );
+ DECL_LINK( StartShowHdl, void* );
public:
SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc );
@@ -100,7 +100,7 @@ private:
void CheckCustomShow();
DECL_LINK( ClickButtonHdl, void * );
- DECL_LINK( OKHdl, Button* );
+ DECL_LINK( OKHdl, void * );
public:
diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx
index 4f05ce775518..27a006409241 100644
--- a/sd/source/ui/inc/dlgass.hxx
+++ b/sd/source/ui/inc/dlgass.hxx
@@ -53,7 +53,7 @@ public:
AssistentDlg(Window* pParent, sal_Bool bAutoPilot);
~AssistentDlg();
- DECL_LINK( FinishHdl, OKButton * );
+ DECL_LINK( FinishHdl, void * );
SfxObjectShellLock GetDocument();
OutputType GetOutputMedium() const;
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index 598ca1c7e3b7..b77ec9ca239a 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -139,7 +139,7 @@ protected:
SfxRequest& rReq);
virtual ~FuPoor (void);
- DECL_LINK( DelayHdl, Timer * );
+ DECL_LINK( DelayHdl, void * );
void ImpForceQuadratic(Rectangle& rRect);
@@ -173,11 +173,11 @@ protected:
Dialog* pDialog;
Timer aScrollTimer; // fuer Autoscrolling
- DECL_LINK( ScrollHdl, Timer * );
+ DECL_LINK( ScrollHdl, void * );
void ForceScroll(const Point& aPixPos);
Timer aDragTimer; // fuer Drag&Drop
- DECL_LINK( DragHdl, Timer * );
+ DECL_LINK(DragHdl, void *);
sal_Bool bIsInDragMode;
Point aMDPos; // Position von MouseButtonDown
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index b3f188e130d3..9439160bad61 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -49,7 +49,7 @@ class HeaderFooterDialog : public TabDialog
{
private:
DECL_LINK( ActivatePageHdl, TabControl * );
- DECL_LINK( DeactivatePageHdl, TabControl * );
+ DECL_LINK( DeactivatePageHdl, void * );
TabControl maTabCtrl;
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 97ee713edf1f..7ddee515c86e 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -145,7 +145,7 @@ private:
DECL_LINK( GetFocusObjectsHdl, void * );
DECL_LINK( SelectToolboxHdl, void * );
- DECL_LINK( ClickToolboxHdl, ToolBox * );
+ DECL_LINK(ClickToolboxHdl, void *);
DECL_LINK( DropdownClickToolBoxHdl, ToolBox * );
DECL_LINK( ClickPageHdl, void * );
DECL_LINK( ClickObjectHdl, void * );
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index a3ed535d61cb..6526d4bd961e 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -83,7 +83,7 @@ private:
const SfxItemSet& rOutAttrs;
DECL_LINK( ClickCheckboxHdl, CheckBox * );
- DECL_LINK( ClickBookletHdl, CheckBox * );
+ DECL_LINK( ClickBookletHdl, void * );
void updateControls();
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index be8436207a2c..c8e80384ae1f 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -196,21 +196,21 @@ private:
void LoadPreviewButtons();
- DECL_LINK( FinishHdl, OKButton * );
- DECL_LINK( NextPageHdl, PushButton * );
- DECL_LINK( LastPageHdl, PushButton * );
+ DECL_LINK( FinishHdl, void * );
+ DECL_LINK( NextPageHdl, void * );
+ DECL_LINK( LastPageHdl, void * );
DECL_LINK( DesignHdl, RadioButton * );
- DECL_LINK( DesignSelectHdl, ListBox * );
- DECL_LINK( DesignDeleteHdl, PushButton * );
- DECL_LINK( BaseHdl, RadioButton * );
- DECL_LINK( ContentHdl, RadioButton * );
+ DECL_LINK( DesignSelectHdl, void * );
+ DECL_LINK( DesignDeleteHdl, void * );
+ DECL_LINK( BaseHdl, void * );
+ DECL_LINK( ContentHdl, void * );
DECL_LINK( GfxFormatHdl, RadioButton * );
DECL_LINK( ResolutionHdl, RadioButton * );
- DECL_LINK( ButtonsHdl, ValueSet* );
+ DECL_LINK( ButtonsHdl, void * );
DECL_LINK( ColorHdl, PushButton * );
DECL_LINK( WebServerHdl, RadioButton * );
- DECL_LINK( SlideChgHdl, RadioButton* );
+ DECL_LINK( SlideChgHdl, void * );
public:
diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
index 0667eb0f58fc..64be5bee862f 100644
--- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
@@ -175,7 +175,7 @@ private:
sal_Int32 SetupVerticalScrollBar (bool bShow, sal_Int32 nRange);
sal_Int32 SetupHorizontalScrollBar (bool bShow, sal_Int32 nRange);
- DECL_LINK(ScrollBarHandler, ScrollBar*);
+ DECL_LINK(ScrollBarHandler, void *);
DECL_LINK(WindowEventListener, VclSimpleEvent*);
using Window::GetWindow;
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index d37aa44d4550..b5beb9501a58 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -92,7 +92,7 @@ private:
class Deleter;
friend class Deleter;
- DECL_LINK(TimerCallback,Timer*);
+ DECL_LINK(TimerCallback, void *);
};
} } // end of namespace ::sd::tools
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index bc080604b069..776714c45ba7 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -144,7 +144,7 @@ private:
String GetScale( sal_Int32 nX, sal_Int32 nY );
sal_Bool SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY );
- DECL_LINK( SelectMetricHdl_Impl, ListBox * );
+ DECL_LINK( SelectMetricHdl_Impl, void * );
/** Enable or disable the controls in the compatibility section of the
'general' tab page depending on whether there is at least one
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index de71a72fe257..0806a39ce276 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -91,8 +91,8 @@ class SdVectorizeDlg : public ModalDialog
long nPosX, long nPosY, long nWidth, long nHeight );
DECL_LINK( ProgressHdl, void* );
- DECL_LINK( ClickPreviewHdl, PushButton* );
- DECL_LINK( ClickOKHdl, OKButton* );
+ DECL_LINK( ClickPreviewHdl, void* );
+ DECL_LINK( ClickOKHdl, void* );
DECL_LINK( ToggleHdl, CheckBox* );
DECL_LINK( ModifyHdl, void* );