diff options
37 files changed, 86 insertions, 86 deletions
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 06e70562fc8d..0baa56b61948 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -42,7 +42,7 @@ public: field is changed. The Link result determines whether the OK Button is enabled (> 0) or disabled (== 0). - @param rLink a Callback declared with DECL_LINK and implemented with + @param rLink a Callback declared with DECL_DLLPRIVATE_LINK and implemented with IMPL_LINK, that is executed on modification. @param bCheckImmediately If true, the Link is called directly after diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index a2b3a5d73b2e..80e165bb89e3 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -71,7 +71,7 @@ public: const OUString& GetSource() const { return aSourceArea; } const ScRange& GetDestArea() const { return aDestArea; } - DECL_LINK( RefreshHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( RefreshHdl, Timer*, void ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 1d104fa27ed8..a0d5b3e8971c 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -193,7 +193,7 @@ private: bool bGotDataChangedHint; XModifyListenerArr_Impl aValueListeners; - DECL_LINK( ValueListenerHdl, const SfxHint&, void ); + DECL_DLLPRIVATE_LINK( ValueListenerHdl, const SfxHint&, void ); private: void PaintGridRanges_Impl(); diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index dd8b397c8dcb..3273a61a1da2 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -140,7 +140,7 @@ private: Idle aIdle; ScDocument& rDoc; - DECL_LINK(TimerHdl, Timer *, void); + DECL_DLLPRIVATE_LINK(TimerHdl, Timer *, void); ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index bb724bff82d6..0317e89a4538 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -857,7 +857,7 @@ private: bool mbDocTimerEnabled:1; AutoTimer maSrcDocTimer; - DECL_LINK(TimeOutHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(TimeOutHdl, Timer*, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 9b6d42724528..4a89fd3424cd 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -128,8 +128,8 @@ public: // moved by the application - DECL_LINK( IdleHandler, Timer*, void ); // Timer instead of idle - DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); + DECL_DLLPRIVATE_LINK( IdleHandler, Timer*, void ); // Timer instead of idle + DECL_DLLPRIVATE_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 635db201ac97..20f326a9c4f7 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -342,8 +342,8 @@ public: void LockDocument(); void UnlockDocument(); - DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); - DECL_LINK( ReloadAllLinksHdl, weld::Button&, void ); + DECL_DLLPRIVATE_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_DLLPRIVATE_LINK( ReloadAllLinksHdl, weld::Button&, void ); virtual SfxStyleSheetBasePool* GetStyleSheetPool() override; @@ -405,7 +405,7 @@ public: static bool HasAutomaticTableName( std::u16string_view rFilter ); static void LOKCommentNotify(LOKCommentNotificationType nType, const ScDocument* pDocument, const ScAddress& rPos, const ScPostIt* pNote); - DECL_LINK( RefreshDBDataHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( RefreshDBDataHdl, Timer*, void ); void BeforeXMLLoading(); void AfterXMLLoading(bool bRet); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 3af70e4f6448..0bf9fb7ce006 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -214,8 +214,8 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, public DropTargetHel bool bListValButton:1; bool bInitialPageBreaks:1; - DECL_LINK( PopupModeEndHdl, weld::Popover&, void ); - DECL_LINK( PopupSpellingHdl, SpellCallbackInfo&, void ); + DECL_DLLPRIVATE_LINK( PopupModeEndHdl, weld::Popover&, void ); + DECL_DLLPRIVATE_LINK( PopupSpellingHdl, SpellCallbackInfo&, void ); bool TestMouse( const MouseEvent& rMEvt, bool bAction ); @@ -313,7 +313,7 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, public DropTargetHel const Fraction aScaleX, const Fraction aScaleY); void SetupInitialPageBreaks(const ScDocument& rDoc, SCTAB nTab); - DECL_LINK(InitiatePageBreaksTimer, Timer*, void); + DECL_DLLPRIVATE_LINK(InitiatePageBreaksTimer, Timer*, void); protected: virtual void PrePaint(vcl::RenderContext& rRenderContext) override; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index 684d7f2839de..da5b93dfb679 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -50,8 +50,8 @@ private: void Init(); const ScRangeData* findRangeData(const ScRangeNameLine& rLine); - DECL_LINK(SizeAllocHdl, const Size&, void); - DECL_LINK(VisRowsScrolledHdl, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(SizeAllocHdl, const Size&, void); + DECL_DLLPRIVATE_LINK(VisRowsScrolledHdl, weld::TreeView&, void); public: ScRangeManagerTable(std::unique_ptr<weld::TreeView>, diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 14d8dc789274..5f306cb1ce77 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -54,8 +54,8 @@ class SC_DLLPUBLIC ScPreviewShell final : public SfxViewShell bool GetPageSize( Size& aPageSize ); private: void Construct( vcl::Window* pParent ); - DECL_LINK( ScrollHandler, ScrollBar*, void ); - DECL_LINK( CloseHdl, SystemWindow&, void); + DECL_DLLPRIVATE_LINK( ScrollHandler, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( CloseHdl, SystemWindow&, void); void DoScroll( sal_uInt16 nMode ); void ExitPreview(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 77afb12cd71f..af9161b3689d 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -172,12 +172,12 @@ private: bool IsSignatureLineSigned(); bool IsQRCodeSelected(); - DECL_LINK( SimpleRefClose, const OUString*, void ); - DECL_LINK( SimpleRefDone, const OUString&, void ); - DECL_LINK( SimpleRefAborted, const OUString&, void ); - DECL_LINK( SimpleRefChange, const OUString&, void ); - DECL_LINK( FormControlActivated, LinkParamNone*, void ); - DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_DLLPRIVATE_LINK( SimpleRefClose, const OUString*, void ); + DECL_DLLPRIVATE_LINK( SimpleRefDone, const OUString&, void ); + DECL_DLLPRIVATE_LINK( SimpleRefAborted, const OUString&, void ); + DECL_DLLPRIVATE_LINK( SimpleRefChange, const OUString&, void ); + DECL_DLLPRIVATE_LINK( FormControlActivated, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); protected: virtual void Activate(bool bMDI) override; diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 67445cf0d854..e117783c90ea 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -413,7 +413,7 @@ private: void lockRebuilds(); void unlockRebuilds(); - DECL_LINK(onTimerHdl, Timer *, void); + DECL_DLLPRIVATE_LINK(onTimerHdl, Timer *, void); virtual void implRebuild() override; diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index b7c1b3ebac60..1fa0bb08d251 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -74,7 +74,7 @@ class SAL_DLLPUBLIC_RTTI SdModule final : public SfxModule, public SfxListener { public: SFX_DECL_INTERFACE(SD_IF_SDAPP) - DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); + DECL_DLLPRIVATE_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); private: /// SfxInterface initializer. diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 90c9fba80d62..850d4f448a03 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -194,10 +194,10 @@ public: */ virtual OutputDevice* GetDocumentRefDev() override; - DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool ); + DECL_DLLPRIVATE_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool ); // ExecuteSpellPopup now handled by DrawDocShell - DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_DLLPRIVATE_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); void ClearUndoBuffer(); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index d98164505a93..27b46a008fcb 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -394,10 +394,10 @@ protected: bool mbReadOnly; static bool mbPipette; - DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK( TabSplitHdl, TabBar *, void ); - DECL_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); - DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool ); + DECL_DLLPRIVATE_LINK( ClipboardChanged, TransferableDataHelper*, void ); + DECL_DLLPRIVATE_LINK( TabSplitHdl, TabBar *, void ); + DECL_DLLPRIVATE_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); + DECL_DLLPRIVATE_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool ); void DeleteActualPage(); void DeleteActualLayer(); diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index b0ad4ca2ff87..8d211d0c3533 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -250,8 +250,8 @@ public: SearchContext& getSearchContext() { return maSearchContext; } protected: - DECL_LINK( OnParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, void ); - DECL_LINK( OnParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, void ); + DECL_DLLPRIVATE_LINK( OnParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, void ); + DECL_DLLPRIVATE_LINK( OnParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, void ); virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override; virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override; @@ -271,9 +271,9 @@ protected: sal_uInt16 mnLockRedrawSmph; bool mbIsDropAllowed; - DECL_LINK( DropErrorHdl, Timer*, void ); - DECL_LINK( DropInsertFileHdl, Timer*, void ); - DECL_LINK( ExecuteNavigatorDrop, void*, void ); + DECL_DLLPRIVATE_LINK( DropErrorHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( DropInsertFileHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ExecuteNavigatorDrop, void*, void ); void ImplClearDrawDropMarker(); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index c034483a9bdb..4c84ebc13c6c 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -489,8 +489,8 @@ protected: void ImpSidUndo(SfxRequest& rReq); void ImpSidRedo(SfxRequest& rReq); - DECL_LINK( HScrollHdl, ScrollBar *, void ); - DECL_LINK( VScrollHdl, ScrollBar *, void ); + DECL_DLLPRIVATE_LINK( HScrollHdl, ScrollBar *, void ); + DECL_DLLPRIVATE_LINK( VScrollHdl, ScrollBar *, void ); // virtual scroll handler, here, derivative classes can add themselves here virtual void VirtHScrollHdl(ScrollBar* pHScroll); diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index 97e06539d6f8..b4a02c3d5419 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -70,7 +70,7 @@ public: when IsUICaptured() returns <TRUE/>. */ void Release(bool bForce = false); - DECL_LINK(TimeoutCallback, Timer*, void); + DECL_DLLPRIVATE_LINK(TimeoutCallback, Timer*, void); private: ::std::unique_ptr<ToolBarManager::UpdateLock, diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index e6032f8b846d..0e500eb0f5c9 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -151,13 +151,13 @@ private: static OUString GetDragTypeSdBmpId(NavigatorDragType eDT); NavDocInfo* GetDocInfo(); - DECL_LINK( SelectToolboxHdl, const OString&, void ); - DECL_LINK( DropdownClickToolBoxHdl, const OString&, void ); - DECL_LINK( ClickObjectHdl, weld::TreeView&, bool ); - DECL_LINK( SelectDocumentHdl, weld::ComboBox&, void ); - DECL_LINK( MenuSelectHdl, const OString&, void ); - DECL_LINK( ShapeFilterCallback, const OString&, void ); - DECL_LINK( KeyInputHdl, const KeyEvent&, bool ); + DECL_DLLPRIVATE_LINK( SelectToolboxHdl, const OString&, void ); + DECL_DLLPRIVATE_LINK( DropdownClickToolBoxHdl, const OString&, void ); + DECL_DLLPRIVATE_LINK( ClickObjectHdl, weld::TreeView&, bool ); + DECL_DLLPRIVATE_LINK( SelectDocumentHdl, weld::ComboBox&, void ); + DECL_DLLPRIVATE_LINK( MenuSelectHdl, const OString&, void ); + DECL_DLLPRIVATE_LINK( ShapeFilterCallback, const OString&, void ); + DECL_DLLPRIVATE_LINK( KeyInputHdl, const KeyEvent&, bool ); void SetDragImage(); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 1d5af3bc942a..1c7892a2fbbb 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -125,13 +125,13 @@ private: void CloseBookmarkDoc(); - DECL_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool); - DECL_LINK(SelectHdl, weld::TreeView&, void); - DECL_LINK(AsyncSelectHdl, void*, void); - DECL_LINK(RowActivatedHdl, weld::TreeView&, bool); - DECL_LINK(AsyncRowActivatedHdl, void*, void); - DECL_LINK(DragBeginHdl, bool&, bool); - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool); + DECL_DLLPRIVATE_LINK(SelectHdl, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(AsyncSelectHdl, void*, void); + DECL_DLLPRIVATE_LINK(RowActivatedHdl, weld::TreeView&, bool); + DECL_DLLPRIVATE_LINK(AsyncRowActivatedHdl, void*, void); + DECL_DLLPRIVATE_LINK(DragBeginHdl, bool&, bool); + DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); /** Determine whether the specified page belongs to the current show which is either the standard show or a custom show. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 9f5bb82be9d0..6ced17486efe 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -200,7 +200,7 @@ private: /** Asynchronous part of DragFinished. The argument is the sal_Int8 nDropAction, disguised as void*. */ - DECL_LINK(ProcessDragFinished, void*, void); + DECL_DLLPRIVATE_LINK(ProcessDragFinished, void*, void); }; } // end of namespace ::sd::slidesorter::controller diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx index 868f86c58e68..eb1b0f595bb9 100644 --- a/svx/source/dialog/crashreportdlg.hxx +++ b/svx/source/dialog/crashreportdlg.hxx @@ -31,7 +31,7 @@ private: OUString maSuccessMsg; - DECL_LINK(BtnHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(BtnHdl, weld::Button&, void); }; #endif 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); diff --git a/vcl/inc/qt5/QtInstance.hxx b/vcl/inc/qt5/QtInstance.hxx index 6891b32f2f3c..009b9ae8c312 100644 --- a/vcl/inc/qt5/QtInstance.hxx +++ b/vcl/inc/qt5/QtInstance.hxx @@ -67,7 +67,7 @@ class VCLPLUG_QT_PUBLIC QtInstance : public QObject, Timer m_aUpdateStyleTimer; bool m_bUpdateFonts; - DECL_LINK(updateStyleHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(updateStyleHdl, Timer*, void); void AfterAppInit() override; private Q_SLOTS: diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index c77528a3635b..57f6149ff7bc 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -141,7 +141,7 @@ private: bool m_bTakeOwnership; sal_uInt16 m_nLastId; - DECL_LINK(SelectMenuHdl, ::Menu*, bool); + DECL_DLLPRIVATE_LINK(SelectMenuHdl, ::Menu*, bool); public: SalInstanceMenu(PopupMenu* pMenu, bool bTakeOwnership); diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index a4676a5a585c..d16eb30fb185 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -203,7 +203,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager std::vector<OUString> m_aCurrentRequests; Timer m_aFontInstallerTimer; - DECL_LINK( autoInstallFontLangSupport, Timer*, void ); + DECL_DLLPRIVATE_LINK( autoInstallFontLangSupport, Timer*, void ); PrintFontManager(); public: ~PrintFontManager(); diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx index b13ae214e49b..31df95826b90 100644 --- a/writerperfect/inc/WPFTEncodingDialog.hxx +++ b/writerperfect/inc/WPFTEncodingDialog.hxx @@ -35,7 +35,7 @@ private: std::unique_ptr<weld::Button> m_xBtnCancel; private: - DECL_LINK(CancelHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(CancelHdl, weld::Button&, void); WPFTEncodingDialog(WPFTEncodingDialog const&) = delete; WPFTEncodingDialog& operator=(WPFTEncodingDialog const&) = delete; |