From 54435d56051e19a408a1fcce16a3e4add185c018 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 4 Nov 2021 10:10:19 +0200 Subject: use more DECL_DLLPRIVATE_LINK to avoid unnecessarily exporting symbols Change-Id: I6855894d0166c300ced169e36861f38811baa48d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124730 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/uibase/inc/basesh.hxx | 4 ++-- sw/source/uibase/inc/chldwrap.hxx | 2 +- sw/source/uibase/inc/edtwin.hxx | 8 ++++---- sw/source/uibase/inc/mailmergehelper.hxx | 2 +- sw/source/uibase/inc/textsh.hxx | 4 ++-- sw/source/uibase/inc/wrtsh.hxx | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sw/source/uibase/inc') diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index 90ca9502468b..2f7402f27870 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwBaseShell: public SfxShell // Update-Timer for graphic std::set m_aGrfUpdateSlots; - DECL_LINK( GraphicArrivedHdl, SwCursorShell&, void ); + DECL_DLLPRIVATE_LINK( GraphicArrivedHdl, SwCursorShell&, void ); protected: SwWrtShell& GetShell(); @@ -60,7 +60,7 @@ protected: void SetGetStateSet( SfxItemSet* p ) { m_pGetStateSet = p; } bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return m_aGrfUpdateSlots.insert( nSlot ).second; } - DECL_LINK( InsertDBTextHdl, void*, void ); + DECL_DLLPRIVATE_LINK( InsertDBTextHdl, void*, void ); void InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rText ); void InsertTable( SfxRequest& _rRequest ); diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index b6f5b41ab3b1..7253d7702f83 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -29,7 +29,7 @@ class SAL_DLLPUBLIC_RTTI SwChildWinWrapper : public SfxChildWindow Timer m_aUpdateTimer; SwDocShell* m_pDocSh; - DECL_LINK( UpdateHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( UpdateHdl, Timer*, void ); // Implementation in fldtdlg.cxx protected: diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 44985f903c86..06fbee57f0e3 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -155,16 +155,16 @@ class SW_DLLPUBLIC SwEditWin final : public vcl::Window, * The selection is regularly increased towards the mouse * position. */ - DECL_LINK( TimerHandler, Timer *, void ); + DECL_DLLPRIVATE_LINK( TimerHandler, Timer *, void ); void StartDDTimer(); void StopDDTimer(SwWrtShell *, const Point &); - DECL_LINK( DDHandler, Timer *, void ); + DECL_DLLPRIVATE_LINK( DDHandler, Timer *, void ); // timer for ANY-KeyInut question without a following KeyInputEvent - DECL_LINK( KeyInputFlushHandler, Timer *, void ); + DECL_DLLPRIVATE_LINK( KeyInputFlushHandler, Timer *, void ); // timer for ApplyTemplates via mouse (in disguise Drag&Drop) - DECL_LINK( TemplateTimerHdl, Timer *, void ); + DECL_DLLPRIVATE_LINK( TemplateTimerHdl, Timer *, void ); void MoveCursor( SwWrtShell &rSh, const Point& rDocPos, const bool bOnlyText, bool bLockView ); diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 664786d5b64c..7e8b0d48c45e 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -70,7 +70,7 @@ class SW_DLLPUBLIC SwAddressPreview final : public weld::CustomWidgetController virtual bool KeyInput( const KeyEvent& rKEvt ) override; void UpdateScrollBar(); - DECL_LINK(ScrollHdl, weld::ScrolledWindow&,void); + DECL_DLLPRIVATE_LINK(ScrollHdl, weld::ScrolledWindow&,void); public: SwAddressPreview(std::unique_ptr xParent); diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx index 849bffcf4f2b..2d6abbff4b88 100644 --- a/sw/source/uibase/inc/textsh.hxx +++ b/sw/source/uibase/inc/textsh.hxx @@ -46,8 +46,8 @@ private: static void InitInterface_Impl(); public: - DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog&, void ); - DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); + DECL_DLLPRIVATE_LINK( RedlineNextHdl, AbstractSvxPostItDialog&, void ); + DECL_DLLPRIVATE_LINK( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); DECL_STATIC_LINK( SwTextShell, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); void Execute(SfxRequest &); diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index a47e68cd2045..45b3451cf560 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -259,7 +259,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)(); bool GotoPage( sal_uInt16 nPage, bool bRecord ); // setting the cursor; remember the old position for turning back - DECL_LINK( ExecFlyMac, const SwFlyFrameFormat*, void ); + DECL_DLLPRIVATE_LINK( ExecFlyMac, const SwFlyFrameFormat*, void ); bool PageCursor(SwTwips lOffset, bool bSelect); -- cgit