Fix uses of SAL_DLLPRIVATE DECL_LINK etc.

Change-Id: Ibab84ce977e34bbae04e703a87a3211d20813558

10 files changed, 34 insertions, 34 deletions

diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 747199b89d53..b51abc687de1 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -127,9 +127,9 @@ protected:
     virtual Size                GetOptimalSize() const SAL_OVERRIDE;
 
 private:
-    SAL_DLLPRIVATE              DECL_LINK( CsvCmdHdl, ScCsvControl* );
-    SAL_DLLPRIVATE              DECL_LINK( ScrollHdl, ScrollBar* );
-    SAL_DLLPRIVATE              DECL_LINK( ScrollEndHdl, ScrollBar* );
+    DECL_DLLPRIVATE_LINK( CsvCmdHdl, ScCsvControl* );
+    DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar* );
+    DECL_DLLPRIVATE_LINK( ScrollEndHdl, ScrollBar* );
 
     // accessibility ----------------------------------------------------------
 public:
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index dfcd231b712d..47defa8e0c44 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -203,7 +203,7 @@ friend class SwConnectionDisposedListener_Impl;
     SAL_DLLPRIVATE SwDSParam*          FindDSData(const SwDBData& rData, bool bCreate);
     SAL_DLLPRIVATE SwDSParam*          FindDSConnection(const OUString& rSource, bool bCreate);
 
-    SAL_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
+    DECL_DLLPRIVATE_LINK( PrtCancelHdl, Button * );
 
     /// Insert data record as text into document.
     SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 137e6cf002b1..af0aed66a454 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwDocShell
     SAL_DLLPRIVATE void                  CalcLayoutForOLEObjects();
 
     SAL_DLLPRIVATE void                  Init_Impl();
-    SAL_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
+    DECL_DLLPRIVATE_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
 
     using SfxObjectShell::GetVisArea;
 
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 1e99dc3c9b20..7dc3061adc1d 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -178,11 +178,11 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
     sal_Int32               m_nSendCount;
     sal_Int32               m_nErrorCount;
 
-    SAL_DLLPRIVATE DECL_LINK( StopHdl_Impl, PushButton* );
-    SAL_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* );
-    SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
-    SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
-    SAL_DLLPRIVATE DECL_LINK_TYPED( RemoveThis, Idle*, void );
+    DECL_DLLPRIVATE_LINK( StopHdl_Impl, PushButton* );
+    DECL_DLLPRIVATE_LINK( CloseHdl_Impl, void* );
+    DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
+    DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
+    DECL_DLLPRIVATE_LINK_TYPED( RemoveThis, Idle*, void );
 
     SAL_DLLPRIVATE void        IterateMails();
     SAL_DLLPRIVATE void        SendMails();
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 94179d40e062..dfb793042402 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
 
     SwDBTreeList_Impl* pImpl;
 
-    SAL_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
+    DECL_DLLPRIVATE_LINK( DBCompare, SvSortData* );
 
     SAL_DLLPRIVATE void          InitTreeList();
     SAL_DLLPRIVATE virtual void  RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index ede07317deb4..8d285bea9a86 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
                                               //to be shown in the number format dialog
     bool                bUseAutomaticLanguage;//determine whether language is automatically assigned
 
-    SAL_DLLPRIVATE DECL_LINK( SelectHdl, ListBox * );
+    DECL_DLLPRIVATE_LINK( SelectHdl, ListBox * );
 
     SAL_DLLPRIVATE double          GetDefValue(const short nFormatType) const;
     SAL_DLLPRIVATE void            Init(short nFormatType, bool bUsrFmts);
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index e11c6970ed2d..26b8be1fc607 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -184,9 +184,9 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
     SAL_DLLPRIVATE Point           AlignToPixel(const Point& rPt) const;
 
     SAL_DLLPRIVATE int             _CreateScrollbar( bool bHori );
-    SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
-    SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
-    SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
+    DECL_DLLPRIVATE_LINK( ScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( EndScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( BtnPage, Button * );
     SAL_DLLPRIVATE bool            ChgPage( int eMvMode, bool bUpdateScrollbar = true );
 
     SAL_DLLPRIVATE virtual SfxPrinter*     GetPrinter( bool bCreate = false ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 6c5aabb1465c..68fa0fd99ba4 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -93,16 +93,16 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     // prevent update dialog data during longer operations (cf #102657#)
     bool                    bInhibitActivate;
 
-    SAL_DLLPRIVATE DECL_LINK( AcceptHdl,     void* );
-    SAL_DLLPRIVATE DECL_LINK( AcceptAllHdl,  void* );
-    SAL_DLLPRIVATE DECL_LINK( RejectHdl,     void* );
-    SAL_DLLPRIVATE DECL_LINK( RejectAllHdl,  void* );
-    SAL_DLLPRIVATE DECL_LINK( UndoHdl,           void* );
-    SAL_DLLPRIVATE DECL_LINK( DeselectHdl,       void* );
-    SAL_DLLPRIVATE DECL_LINK( SelectHdl,     void* );
-    SAL_DLLPRIVATE DECL_LINK_TYPED( SelectTimerHdl, Timer*, void );
-    SAL_DLLPRIVATE DECL_LINK_TYPED( GotoHdl, Timer*, void );
-    SAL_DLLPRIVATE DECL_LINK( CommandHdl,        void* );
+    DECL_DLLPRIVATE_LINK( AcceptHdl,     void* );
+    DECL_DLLPRIVATE_LINK( AcceptAllHdl,  void* );
+    DECL_DLLPRIVATE_LINK( RejectHdl,     void* );
+    DECL_DLLPRIVATE_LINK( RejectAllHdl,  void* );
+    DECL_DLLPRIVATE_LINK( UndoHdl,           void* );
+    DECL_DLLPRIVATE_LINK( DeselectHdl,       void* );
+    DECL_DLLPRIVATE_LINK( SelectHdl,     void* );
+    DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK_TYPED( GotoHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( CommandHdl,        void* );
 
     SAL_DLLPRIVATE sal_uInt16            CalcDiff(sal_uInt16 nStart, bool bChild);
     SAL_DLLPRIVATE void          InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt);
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 64dc616b5546..3dd20868ef67 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -89,8 +89,8 @@ class SW_DLLPUBLIC SwOneExampleFrame
 
     static  bool    bShowServiceNotAvailableMessage;
 
-    SAL_DLLPRIVATE DECL_LINK_TYPED( TimeoutHdl, Idle*, void );
-    SAL_DLLPRIVATE DECL_LINK( PopupHdl, Menu* );
+    DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Idle*, void );
+    DECL_DLLPRIVATE_LINK( PopupHdl, Menu* );
 
     SAL_DLLPRIVATE void  CreateControl();
     SAL_DLLPRIVATE void  DisposeControl();
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index 77f401311817..6f0cec290327 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -279,12 +279,12 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 
     // create control elements
     SAL_DLLPRIVATE void          CreateBtns();
-    SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
+    DECL_DLLPRIVATE_LINK( BtnPage, Button * );
 
-    SAL_DLLPRIVATE DECL_LINK_TYPED( TimeoutHdl, Timer*, void );
-    SAL_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* );
+    DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( UpdatePercentHdl, GraphicFilter* );
 
-    SAL_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, void* );
+    DECL_DLLPRIVATE_LINK( FieldPopupModeEndHdl, void* );
 
     inline long     GetXScroll() const;
     inline long     GetYScroll() const;
@@ -305,10 +305,10 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE long          PhyPageDown();
 
     SAL_DLLPRIVATE int               _CreateScrollbar( bool bHori );
-    SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
-    SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( ScrollHdl, SwScrollbar * );
+    DECL_DLLPRIVATE_LINK( EndScrollHdl, SwScrollbar * );
     SAL_DLLPRIVATE bool          UpdateScrollbars();
-    SAL_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
+    DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclSimpleEvent* );
     SAL_DLLPRIVATE void          CalcVisArea( const Size &rPixelSz );
 
     SAL_DLLPRIVATE void            CreatePageButtons(bool bShow);