use more DECL_DLLPRIVATE_LINK

to avoid unnecessarily exporting symbols

Change-Id: I4c9c7c86f288ba9655a8b919387e30f3096ccfb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124667
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

33 files changed, 109 insertions, 109 deletions

diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx
index d018662b5366..27fb7cb07a43 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -59,18 +59,18 @@ private:
     std::unique_ptr<ClassificationEditView> m_xEditWindow;
     std::unique_ptr<weld::CustomWeld> m_xEditWindowWeld;
 
-    DECL_LINK(ButtonClicked, weld::Button&, void);
-    DECL_LINK(OkHdl, weld::Button&, void);
-    DECL_LINK(SelectToolboxHdl, weld::Toggleable&, void);
-    DECL_LINK(SelectClassificationHdl, weld::ComboBox&, void);
-    DECL_LINK(SelectMarkingHdl, weld::TreeView&, bool);
-    DECL_LINK(SelectIPPartNumbersHdl, weld::TreeView&, bool);
-    DECL_LINK(SelectRecentlyUsedHdl, weld::ComboBox&, void);
-    DECL_LINK(SelectIPPartHdl, weld::TreeView&, bool);
-    DECL_LINK(EditWindowModifiedHdl, LinkParamNone*, void);
+    DECL_DLLPRIVATE_LINK(ButtonClicked, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(OkHdl, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(SelectToolboxHdl, weld::Toggleable&, void);
+    DECL_DLLPRIVATE_LINK(SelectClassificationHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(SelectMarkingHdl, weld::TreeView&, bool);
+    DECL_DLLPRIVATE_LINK(SelectIPPartNumbersHdl, weld::TreeView&, bool);
+    DECL_DLLPRIVATE_LINK(SelectRecentlyUsedHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(SelectIPPartHdl, weld::TreeView&, bool);
+    DECL_DLLPRIVATE_LINK(EditWindowModifiedHdl, LinkParamNone*, void);
     DECL_STATIC_LINK(ClassificationDialog, ExpandedHdl, weld::Expander&, void);
     DECL_STATIC_LINK(ClassificationDialog, KeyInput, const KeyEvent&, bool);
-    DECL_LINK(OnAsyncExpandHdl, void*, void);
+    DECL_DLLPRIVATE_LINK(OnAsyncExpandHdl, void*, void);
 
     void insertField(ClassificationType eType, OUString const& rString, OUString const& rFullString,
                      OUString const& rIdentifier = OUString());
diff --git a/include/svx/FileExportedDialog.hxx b/include/svx/FileExportedDialog.hxx
index 748c0f377e45..3ad5ab559a25 100644
--- a/include/svx/FileExportedDialog.hxx
+++ b/include/svx/FileExportedDialog.hxx
@@ -16,7 +16,7 @@ private:
     std::unique_ptr<weld::Label> m_xFileLabel;
     std::unique_ptr<weld::Button> m_xButton;
 
-    DECL_LINK(OpenHdl, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(OpenHdl, weld::Button&, void);
 
 public:
     explicit FileExportedDialog(weld::Window* pParent, OUString atitle);
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 10f8850544bd..512b561ee997 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -151,7 +151,7 @@ protected:
     void            InitSettings(vcl::RenderContext& rRenderContext);
     // abstraction layers are: Unicode<->MapIndex<->Pixel
     Point           MapIndexToPixel( int) const;
-    DECL_LINK(VscrollHdl, weld::ScrolledWindow&, void);
+    DECL_DLLPRIVATE_LINK(VscrollHdl, weld::ScrolledWindow&, void);
     void ContextMenuSelect(std::string_view rIdent);
 
     void            init();
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index ff01b2941b78..23b92be6b38b 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -48,7 +48,7 @@ private:
     void LockWidthRequest();
     ColorWindow* getColorWindow() const;
 
-    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
+    DECL_DLLPRIVATE_LINK(ToggleHdl, weld::Toggleable&, void);
 
 public:
     // rTopLevelParentFunction will be used to get parent for any color picker dialog created
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 95f7c5c13d86..5345c241730a 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -101,10 +101,10 @@ private:
     weld::Button* mpDefaultButton;
 
     Link<const NamedColor&, void> maSelectedLink;
-    DECL_LINK(SelectHdl, ValueSet*, void);
-    DECL_LINK(SelectPaletteHdl, weld::ComboBox&, void);
-    DECL_LINK(AutoColorClickHdl, weld::Button&, void);
-    DECL_LINK(OpenPickerClickHdl, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(SelectHdl, ValueSet*, void);
+    DECL_DLLPRIVATE_LINK(SelectPaletteHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(AutoColorClickHdl, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(OpenPickerClickHdl, weld::Button&, void);
 
     static bool SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor);
     static NamedColor GetSelectEntryColor(ValueSet const * pColorSet);
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index 2ee351075562..1ef8d387bf62 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -63,17 +63,17 @@ private:
 
     void Initialize();
 
-    DECL_LINK( SlideHdl, weld::Scale&, void );
-    DECL_LINK( NewInterpolationModifiedHdl, weld::ComboBox&, void );
-    DECL_LINK( NewQualityModifiedHdl, weld::Entry&, void );
-    DECL_LINK( NewCompressionModifiedHdl, weld::Entry&, void );
-    DECL_LINK( NewWidthModifiedHdl, weld::Entry&, void );
-    DECL_LINK( NewHeightModifiedHdl, weld::Entry&, void );
-    DECL_LINK( ResolutionModifiedHdl, weld::ComboBox&, void );
-    DECL_LINK( ToggleCompressionRB, weld::Toggleable&, void );
-    DECL_LINK( ToggleReduceResolutionRB, weld::Toggleable&, void );
-
-    DECL_LINK( CalculateClickHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( SlideHdl, weld::Scale&, void );
+    DECL_DLLPRIVATE_LINK( NewInterpolationModifiedHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK( NewQualityModifiedHdl, weld::Entry&, void );
+    DECL_DLLPRIVATE_LINK( NewCompressionModifiedHdl, weld::Entry&, void );
+    DECL_DLLPRIVATE_LINK( NewWidthModifiedHdl, weld::Entry&, void );
+    DECL_DLLPRIVATE_LINK( NewHeightModifiedHdl, weld::Entry&, void );
+    DECL_DLLPRIVATE_LINK( ResolutionModifiedHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK( ToggleCompressionRB, weld::Toggleable&, void );
+    DECL_DLLPRIVATE_LINK( ToggleReduceResolutionRB, weld::Toggleable&, void );
+
+    DECL_DLLPRIVATE_LINK( CalculateClickHdl, weld::Button&, void );
 
     void Update();
     void UpdateNewWidthMF();
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 0b046f415f60..57059f8e249a 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -181,14 +181,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPFilter final : public SvxTPage
     std::unique_ptr<weld::CheckButton> m_xCbComment;
     std::unique_ptr<weld::Entry> m_xEdComment;
 
-    DECL_LINK( SelDateHdl, weld::ComboBox&, void );
-    DECL_LINK( RowEnableHdl, weld::Toggleable&, void );
-    DECL_LINK( TimeHdl, weld::Button&, void );
-    DECL_LINK( ModifyHdl, weld::Entry&, void );
-    DECL_LINK( ModifyListBoxHdl, weld::ComboBox&, void );
-    DECL_LINK( ModifyDate, SvtCalendarBox&, void );
-    DECL_LINK( ModifyTime, weld::FormattedSpinButton&, void );
-    DECL_LINK( RefHandle, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( SelDateHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK( RowEnableHdl, weld::Toggleable&, void );
+    DECL_DLLPRIVATE_LINK( TimeHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( ModifyHdl, weld::Entry&, void );
+    DECL_DLLPRIVATE_LINK( ModifyListBoxHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK( ModifyDate, SvtCalendarBox&, void );
+    DECL_DLLPRIVATE_LINK( ModifyTime, weld::FormattedSpinButton&, void );
+    DECL_DLLPRIVATE_LINK( RefHandle, weld::Button&, void );
 
     void            EnableDateLine1(bool bFlag);
     void            EnableDateLine2(bool bFlag);
@@ -282,7 +282,7 @@ private:
     std::unique_ptr<weld::Button> m_xUndo;
     std::unique_ptr<SvxRedlinTable> m_xViewData;
 
-    DECL_LINK( PbClickHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( PbClickHdl, weld::Button&, void );
 
     void            EnableClearFormatButton(weld::Button&, bool bFlag);
 public:
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index e100b91574a1..8fafb3fc03aa 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -160,7 +160,7 @@ private:
 
     void                InvalidateControl();
 
-    DECL_LINK(LinkedFieldModifyHdl, weld::MetricSpinButton&, void);
+    DECL_DLLPRIVATE_LINK(LinkedFieldModifyHdl, weld::MetricSpinButton&, void);
 };
 
 }
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 39790142b3e2..d5d75e72dc62 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -165,12 +165,12 @@ public:
 
 private:
 
-    DECL_LINK(InternalInteractiveChange, Svx3DLightControl*, void);
-    DECL_LINK(InternalSelectionChange, Svx3DLightControl*, void);
-    DECL_LINK(ScrollBarMove, weld::Scale&, void);
-    DECL_LINK(ButtonPress, weld::Button&, void);
-    DECL_LINK(KeyInput, const KeyEvent&, bool);
-    DECL_LINK(FocusIn, weld::Widget&, void);
+    DECL_DLLPRIVATE_LINK(InternalInteractiveChange, Svx3DLightControl*, void);
+    DECL_DLLPRIVATE_LINK(InternalSelectionChange, Svx3DLightControl*, void);
+    DECL_DLLPRIVATE_LINK(ScrollBarMove, weld::Scale&, void);
+    DECL_DLLPRIVATE_LINK(ButtonPress, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(KeyInput, const KeyEvent&, bool);
+    DECL_DLLPRIVATE_LINK(FocusIn, weld::Widget&, void);
 
     // initialize local parameters
     void Init();
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index aedc5e6c173a..0e5f73923f9b 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -60,8 +60,8 @@ private:
     sal_Int32           mnLastPosBitmap;
     sal_Int32           mnLastPosPattern;
 
-    DECL_LINK(SelectFillTypeHdl, weld::ComboBox&, void);
-    DECL_LINK(SelectFillAttrHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(SelectFillTypeHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(SelectFillAttrHdl, weld::ComboBox&, void);
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 32baca985c66..bf68917be285 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -211,18 +211,18 @@ private:
     // ItemSet used to remember set 2d attributes
     std::unique_ptr<SfxItemSet> mpRemember2DAttributes;
 
-    DECL_LINK( ClickViewTypeHdl, weld::Button&, void );
-    DECL_LINK( ClickUpdateHdl, weld::Toggleable&, void );
-    DECL_LINK( ClickAssignHdl, weld::Button&, void );
-    DECL_LINK( ClickHdl, weld::Button&, void );
-    DECL_LINK( ClickColorHdl, weld::Button&, void );
-    DECL_LINK( SelectHdl, weld::ComboBox&, void );
-    DECL_LINK( SelectColorHdl, ColorListBox&, void );
-    DECL_LINK( ModifyMetricHdl, weld::MetricSpinButton&, void );
-    DECL_LINK( ModifySpinHdl, weld::SpinButton&, void );
+    DECL_DLLPRIVATE_LINK( ClickViewTypeHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( ClickUpdateHdl, weld::Toggleable&, void );
+    DECL_DLLPRIVATE_LINK( ClickAssignHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( ClickHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( ClickColorHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( SelectHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK( SelectColorHdl, ColorListBox&, void );
+    DECL_DLLPRIVATE_LINK( ModifyMetricHdl, weld::MetricSpinButton&, void );
+    DECL_DLLPRIVATE_LINK( ModifySpinHdl, weld::SpinButton&, void );
     void ClickLight(const LightButton& rBtn);
 
-    DECL_LINK( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void );
+    DECL_DLLPRIVATE_LINK( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void );
 
     SVX_DLLPRIVATE void         Construct();
     SVX_DLLPRIVATE void         Reset();
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 6be83c19459f..8f3db081e143 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -82,7 +82,7 @@ protected:
     */
     void notifyColumnSelect(sal_uInt16 nColumnId);
 private:
-    DECL_LINK( OnAsyncExecuteDrop, void*, void );
+    DECL_DLLPRIVATE_LINK( OnAsyncExecuteDrop, void*, void );
 };
 
 
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 3e0808dd9160..6d4793ce9366 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -523,8 +523,8 @@ protected:
     void selectionChanged();
     void columnChanged();
 
-    DECL_LINK(OnQueryGridSlotState, DbGridControlNavigationBarState, int);
-    DECL_LINK(OnExecuteGridSlot, DbGridControlNavigationBarState, bool);
+    DECL_DLLPRIVATE_LINK(OnQueryGridSlotState, DbGridControlNavigationBarState, int);
+    DECL_DLLPRIVATE_LINK(OnExecuteGridSlot, DbGridControlNavigationBarState, bool);
 };
 
 
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 2f21abfc729a..b9ff77a1c813 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -342,7 +342,7 @@ private:
 
     void OnSearchTerminated();
     // is used by SearchThread, after the return from this handler the thread removes itself
-    DECL_LINK(OnNewRecordCount, sal_Int32, void);
+    DECL_DLLPRIVATE_LINK(OnNewRecordCount, sal_Int32, void);
 };
 
 #endif // INCLUDED_SVX_FMSRCIMP_HXX
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index beb540e8f1c1..7d9dd4ef9338 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -61,8 +61,8 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontWorkGalleryDialog final : public wel
     void            insertSelectedFontwork();
     void            fillFavorites(sal_uInt16 nThemeId);
 
-    DECL_LINK(DoubleClickFavoriteHdl, weld::IconView&, bool);
-    DECL_LINK(ClickOKHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK(DoubleClickFavoriteHdl, weld::IconView&, bool);
+    DECL_DLLPRIVATE_LINK(ClickOKHdl, weld::Button&, void );
 
 public:
     FontWorkGalleryDialog(weld::Window* pParent, SdrView& rView);
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index 461ce46e7b00..300483595443 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -43,7 +43,7 @@ public:
     virtual void    StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) override;
 private:
-    DECL_LINK( WaitDoubleClickHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( WaitDoubleClickHdl, Timer*, void );
     void impl_executePaintBrush();
 
 private:
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 517addf8f843..10f5b26fecac 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -65,7 +65,7 @@ class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController
     bool                mbInIdleUpdate;
     weld::Dialog*       mpDialog;
 
-                        DECL_LINK( UpdateHdl, Timer*, void );
+                        DECL_DLLPRIVATE_LINK( UpdateHdl, Timer*, void );
 
     rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;
 
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index f23d4455734c..9551afcbb8da 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -587,9 +587,9 @@ protected:
 
 protected:
     void ImplInitWindow( const InitWindowFacet _eInitWhat );
-    DECL_LINK(OnDelete, void*, void);
+    DECL_DLLPRIVATE_LINK(OnDelete, void*, void);
 
-    DECL_LINK(OnAsyncAdjust, void*, void);
+    DECL_DLLPRIVATE_LINK(OnAsyncAdjust, void*, void);
         // if the param is != NULL, AdjustRows will be called, else AdjustDataSource
 
 private:
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 8590516c1544..8eadfa366e66 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -83,8 +83,8 @@ protected:
     void            InitHandler();
     void TurnOn(const weld::Toggleable* pButton);
     DECL_LINK(TurnOnHdl, weld::Toggleable&, void);
-    DECL_LINK(BackgroundHdl, weld::Button&, void);
-    DECL_LINK(ValueChangeHdl, weld::MetricSpinButton&, void);
+    DECL_DLLPRIVATE_LINK(BackgroundHdl, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(ValueChangeHdl, weld::MetricSpinButton&, void);
     void RangeHdl();
     void            UpdateExample();
 
diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx
index 3eaaae9ac8af..656554c67286 100644
--- a/include/svx/hexcolorcontrol.hxx
+++ b/include/svx/hexcolorcontrol.hxx
@@ -38,8 +38,8 @@ private:
     ImplSVEvent* m_nAsyncModifyEvent;
 
     DECL_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, bool);
-    DECL_LINK(ImplProcessModifyHdl, weld::Entry&, void);
-    DECL_LINK(OnAsyncModifyHdl, void*, void);
+    DECL_DLLPRIVATE_LINK(ImplProcessModifyHdl, weld::Entry&, void);
+    DECL_DLLPRIVATE_LINK(OnAsyncModifyHdl, void*, void);
 public:
     HexColorControl(std::unique_ptr<weld::Entry> pEdit);
     ~HexColorControl();
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 3c6ea8f62010..e3586e290d7a 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -104,16 +104,16 @@ class SVX_DLLPUBLIC SvxIMapDlg final : public SfxModelessDialogController
     std::unique_ptr<weld::Label> m_xStbStatus3;
     std::unique_ptr<weld::CustomWeld> m_xIMapWndWeld;
 
-    DECL_LINK( TbxClickHdl, const OString&, void );
-    DECL_LINK( InfoHdl, IMapWindow&, void );
-    DECL_LINK( MousePosHdl, GraphCtrl*, void );
-    DECL_LINK( GraphSizeHdl, GraphCtrl*, void );
-    DECL_LINK( URLModifyHdl, weld::ComboBox&, void );
-    DECL_LINK( EntryModifyHdl, weld::Entry&, void );
-    DECL_LINK( URLLoseFocusHdl, weld::Widget&, void );
-    DECL_LINK( UpdateHdl, Timer *, void );
-    DECL_LINK( StateHdl, GraphCtrl*, void );
-    DECL_LINK( CancelHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK( TbxClickHdl, const OString&, void );
+    DECL_DLLPRIVATE_LINK( InfoHdl, IMapWindow&, void );
+    DECL_DLLPRIVATE_LINK( MousePosHdl, GraphCtrl*, void );
+    DECL_DLLPRIVATE_LINK( GraphSizeHdl, GraphCtrl*, void );
+    DECL_DLLPRIVATE_LINK( URLModifyHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK( EntryModifyHdl, weld::Entry&, void );
+    DECL_DLLPRIVATE_LINK( URLLoseFocusHdl, weld::Widget&, void );
+    DECL_DLLPRIVATE_LINK( UpdateHdl, Timer *, void );
+    DECL_DLLPRIVATE_LINK( StateHdl, GraphCtrl*, void );
+    DECL_DLLPRIVATE_LINK( CancelHdl, weld::Button&, void );
 
     void                URLModify();
     void                DoOpen();
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 0fc4c59c91cb..ea94f1d78014 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -72,7 +72,7 @@ private:
     SVX_DLLPRIVATE void InsertLanguage(const LanguageType nLangType, sal_Int16 nType);
 
     SVX_DLLPRIVATE int ImplTypeToPos(LanguageType eType) const;
-    DECL_LINK(ChangeHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(ChangeHdl, weld::ComboBox&, void);
 public:
     SvxLanguageBox(std::unique_ptr<weld::ComboBox> pControl);
     void            SetLanguageList( SvxLanguageListFlags nLangList,
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index f5b66c980f92..d0b02ec98191 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -40,7 +40,7 @@ public:
     SvxModifyControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb);
 
 private: // Links
-    DECL_LINK(OnTimer, Timer*, void);
+    DECL_DLLPRIVATE_LINK(OnTimer, Timer*, void);
 
 private: // Functions
     void _repaint();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 7cbf6d8dc761..059d6b7bc558 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -92,7 +92,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet final : public SvxNumValueSet
     Idle        aFormatIdle;
     bool        bGrfNotFound;
 
-    DECL_LINK(FormatHdl_Impl, Timer *, void);
+    DECL_DLLPRIVATE_LINK(FormatHdl_Impl, Timer *, void);
 
 public:
     SvxBmpNumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow);
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 2154844f1b50..1b86834ee8c8 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -126,9 +126,9 @@ protected:
 
     DECL_LINK(ClickRotateHdl_Impl, weld::Toggleable&, void);
 private:
-    DECL_LINK(ChangeDrawHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(ChangeGridsnapHdl_Impl, weld::Toggleable&, void);
-    DECL_LINK(ChangeDivisionHdl_Impl, weld::SpinButton&, void);
+    DECL_DLLPRIVATE_LINK(ChangeDrawHdl_Impl, weld::MetricSpinButton&, void);
+    DECL_DLLPRIVATE_LINK(ChangeGridsnapHdl_Impl, weld::Toggleable&, void);
+    DECL_DLLPRIVATE_LINK(ChangeDivisionHdl_Impl, weld::SpinButton&, void);
 };
 
 #endif
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index acfbd82c1647..c6342df0d3c8 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -37,8 +37,8 @@ private:
     std::unique_ptr<weld::Entry> m_xRepeatPasswdED;
     std::unique_ptr<weld::Button> m_xOKBtn;
 
-    DECL_LINK(ButtonHdl, weld::Button&, void);
-    DECL_LINK(EditModifyHdl, weld::Entry&, void);
+    DECL_DLLPRIVATE_LINK(ButtonHdl, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(EditModifyHdl, weld::Entry&, void);
 
 public:
     SvxPasswordDialog(weld::Window* pParent, bool bDisableOldPassword);
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 4b78a1383517..8bc4c05580ec 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -35,7 +35,7 @@ private:
     bool                bRelative;
     bool                bNegativeEnabled;
 
-    DECL_LINK(ModifyHdl, weld::Entry&, void);
+    DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void);
 
 public:
     SvxRelativeField(std::unique_ptr<weld::MetricSpinButton> pControl);
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 0c4e701f1f4a..997cea48b69a 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -171,7 +171,7 @@ private:
 
     SVX_DLLPRIVATE void findMergeOrigin( CellPos& rPos );
 
-    DECL_LINK( UpdateHdl, void *, void );
+    DECL_DLLPRIVATE_LINK( UpdateHdl, void *, void );
 
     //TableModelRef mxTable;
     rtl::Reference< TableModel > mxTable;
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 28640a87161e..12fcebe16581 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -147,15 +147,15 @@ protected:
     std::unique_ptr< XFillFloatTransparenceItem >   mpFloatTransparenceItem;
     std::unique_ptr< SfxUInt16Item >                mpTransparenceItem;
 
-    DECL_LINK(SelectFillTypeHdl, weld::ComboBox&, void );
-    DECL_LINK(SelectFillAttrHdl, weld::ComboBox&, void );
-    DECL_LINK(SelectFillColorHdl, ColorListBox&, void);
-    DECL_LINK(ChangeGradientAngle, weld::MetricSpinButton&, void);
-    DECL_LINK(ChangeTrgrTypeHdl_Impl, weld::ComboBox&, void);
-    DECL_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(ModifyTransSliderHdl, weld::Scale&, void);
-    DECL_LINK(ClickImportBitmapHdl, weld::Button&, void);
-    DECL_LINK(ToolbarHdl_Impl, const OString&, void);
+    DECL_DLLPRIVATE_LINK(SelectFillTypeHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK(SelectFillAttrHdl, weld::ComboBox&, void );
+    DECL_DLLPRIVATE_LINK(SelectFillColorHdl, ColorListBox&, void);
+    DECL_DLLPRIVATE_LINK(ChangeGradientAngle, weld::MetricSpinButton&, void);
+    DECL_DLLPRIVATE_LINK(ChangeTrgrTypeHdl_Impl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void);
+    DECL_DLLPRIVATE_LINK(ModifyTransSliderHdl, weld::Scale&, void);
+    DECL_DLLPRIVATE_LINK(ClickImportBitmapHdl, weld::Button&, void);
+    DECL_DLLPRIVATE_LINK(ToolbarHdl_Impl, const OString&, void);
 
     void Update();
     void ImpUpdateTransparencies();
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 34668f486061..e94612ff221e 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -127,10 +127,10 @@ private:
 
     void Initialize();
 
-    DECL_LINK(ToolboxWidthSelectHdl, const OString&, void);
-    DECL_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void);
-    DECL_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void);
-    DECL_LINK(ChangeCapStyleHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(ToolboxWidthSelectHdl, const OString&, void);
+    DECL_DLLPRIVATE_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void);
+    DECL_DLLPRIVATE_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void);
+    DECL_DLLPRIVATE_LINK(ChangeCapStyleHdl, weld::ComboBox&, void);
 };
 
 } // end of namespace svx::sidebar
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index a05a61c36c8d..ef2936c944eb 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -128,7 +128,7 @@ protected:
 
     // Chaining
     void ImpChainingEventHdl();
-    DECL_LINK(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void);
+    DECL_DLLPRIVATE_LINK(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void);
 
 
     // Check if the whole text is selected.
@@ -137,11 +137,11 @@ protected:
     void ImpMakeTextCursorAreaVisible();
 
     // handler for AutoGrowing text with active Outliner
-    DECL_LINK(ImpOutlinerStatusEventHdl, EditStatus&, void);
-    DECL_LINK(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void);
+    DECL_DLLPRIVATE_LINK(ImpOutlinerStatusEventHdl, EditStatus&, void);
+    DECL_DLLPRIVATE_LINK(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void);
 
     // link for EndTextEditHdl
-    DECL_LINK(EndTextEditHdl, SdrUndoManager*, void);
+    DECL_DLLPRIVATE_LINK(EndTextEditHdl, SdrUndoManager*, void);
 
     void ImpMacroUp(const Point& rUpPos);
     void ImpMacroDown(const Point& rDownPos);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index b8212b1fcae4..557846fe01d8 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -222,7 +222,7 @@ public:
     OutputDevice* GetFirstOutputDevice() const;
 
 private:
-    DECL_LINK(ImpComeBackHdl, Timer*, void);
+    DECL_DLLPRIVATE_LINK(ImpComeBackHdl, Timer*, void);
 
 protected:
     sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index aa1f421a4b1b..8347e3b9df1e 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -211,7 +211,7 @@ class SVXCORE_DLLPUBLIC SvxColorToolBoxControl final : public cppu::ImplInherita
     bool m_bSplitButton;
     sal_uInt16 m_nSlotId;
     ColorSelectFunction m_aColorSelectFunction;
-    DECL_LINK(SelectedHdl, const NamedColor&, void);
+    DECL_DLLPRIVATE_LINK(SelectedHdl, const NamedColor&, void);
 
     weld::Window* GetParentFrame() const;