diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/AnnotationWin.hxx | 14 | ||||
-rw-r--r-- | sw/inc/PostItMgr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 4 | ||||
-rw-r--r-- | sw/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/view.hxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/inc/basesh.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/chldwrap.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/edtwin.hxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/inc/mailmergehelper.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/textsh.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/wrtsh.hxx | 2 |
11 files changed, 27 insertions, 27 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 24c3c5792976..5fde0c3b76fd 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -212,13 +212,13 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin final : public InterimItemWindow void SetSizePixel( const Size& rNewSize ) override; SfxItemSet DefaultItem(); - DECL_LINK(ModifyHdl, LinkParamNone*, void); - DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void); - DECL_LINK(DeleteHdl, void*, void); - DECL_LINK(ToggleHdl, weld::Toggleable&, void); - DECL_LINK(SelectHdl, const OString&, void); - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(MouseMoveHdl, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(ModifyHdl, LinkParamNone*, void); + DECL_DLLPRIVATE_LINK(ScrollHdl, weld::ScrolledWindow&, void); + DECL_DLLPRIVATE_LINK(DeleteHdl, void*, void); + DECL_DLLPRIVATE_LINK(ToggleHdl, weld::Toggleable&, void); + DECL_DLLPRIVATE_LINK(SelectHdl, const OString&, void); + DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(MouseMoveHdl, const MouseEvent&, bool); sal_uInt32 CountFollowing(); diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index c94eac984edf..68292b452ab3 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -165,7 +165,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public SfxListener sal_Int32 GetScrollSize() const; sal_Int32 GetSpaceBetween() const; void SetReadOnlyState(); - DECL_LINK( CalcHdl, void*, void); + DECL_DLLPRIVATE_LINK( CalcHdl, void*, void); sw::annotation::SwAnnotationWin* GetSidebarWin(const SfxBroadcaster* pBroadcaster) const; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 20edaec0d1ed..85559454389d 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -374,7 +374,7 @@ private: // CharTimer calls this method. void DoUpdateAllCharts(); - DECL_LINK( DoUpdateModifiedOLE, Timer *, void ); + DECL_DLLPRIVATE_LINK( DoUpdateModifiedOLE, Timer *, void ); public: SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool ); @@ -556,7 +556,7 @@ public: const OUString& getDocAccTitle() const { return msDocAccTitle; } // INextInterface here - DECL_LINK(CalcFieldValueHdl, EditFieldInfo*, void); + DECL_DLLPRIVATE_LINK(CalcFieldValueHdl, EditFieldInfo*, void); // OLE ??? bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; } diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 018c46349c1a..8794c79948e9 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -182,7 +182,7 @@ public: virtual ~SwDocShell() override; /// OLE 2.0-notification. - DECL_LINK( Ole2ModifiedHdl, bool, void ); + DECL_DLLPRIVATE_LINK( Ole2ModifiedHdl, bool, void ); /// OLE-stuff. virtual void SetVisArea( const tools::Rectangle &rRect ) override; diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 2f6381469d34..edcf028d9f5d 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -437,7 +437,7 @@ public: bool ExecSpellPopup( const Point& rPt ); void ExecSmartTagPopup( const Point& rPt ); - DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_DLLPRIVATE_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); bool ExecDrwTextSpellPopup(const Point& rPt); void SetTabColFromDocPos( const Point &rPt ) { m_aTabColFromDocPos = rPt; } @@ -460,7 +460,7 @@ public: static sal_uInt16 GetMoveType(); static void SetMoveType(sal_uInt16 nSet); - DECL_LINK( MoveNavigationHdl, void*, void ); + DECL_DLLPRIVATE_LINK( MoveNavigationHdl, void*, void ); static void SetActMark(sal_Int32 nSet); bool HandleWheelCommands( const CommandEvent& ); @@ -507,7 +507,7 @@ public: void ExecDraw(const SfxRequest&); void ExecTabWin(SfxRequest const &); void ExecuteStatusLine(SfxRequest&); - DECL_LINK( ExecRulerClick, Ruler *, void ); + DECL_DLLPRIVATE_LINK( ExecRulerClick, Ruler *, void ); void ExecSearch(SfxRequest&); void ExecViewOptions(SfxRequest &); @@ -553,7 +553,7 @@ public: DECL_LINK( AttrChangedNotify, LinkParamNone*, void ); // form control has been activated - DECL_LINK( FormControlActivated, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( FormControlActivated, LinkParamNone*, void ); // edit links void EditLinkDlg(); @@ -596,7 +596,7 @@ public: void ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ); tools::Long InsertMedium( sal_uInt16 nSlotId, std::unique_ptr<SfxMedium> pMedium, sal_Int16 nVersion ); - DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper *, void ); + DECL_DLLPRIVATE_LINK( DialogClosedHdl, sfx2::FileDialogHelper *, void ); // status methods for clipboard. // Status changes now notified from the clipboard. 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<sal_uInt16> 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<weld::ScrolledWindow> 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); |