diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-04 09:27:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-04 15:26:14 +0100 |
| commit | a04d60ca5af1b794c190fa9d5a0fb7506755f27d (patch) | |
| tree | a5d141f79a11eaaca5ff76d6def636278c54357e | |
| parent | f90159697506e28ebbfb436047e52db1b65bd9a7 (diff) | |
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>
80 files changed, 305 insertions, 305 deletions
diff --git a/include/cui/cuicharmap.hxx b/include/cui/cuicharmap.hxx index 11e464912a8d..04a19c1c3d55 100644 --- a/include/cui/cuicharmap.hxx +++ b/include/cui/cuicharmap.hxx @@ -121,28 +121,28 @@ private: hexadecimal = 16 }; - DECL_LINK(FontSelectHdl, weld::ComboBox&, void); - DECL_LINK(SubsetSelectHdl, weld::ComboBox&, void); - DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*, void); - DECL_LINK(CharSelectHdl, SvxShowCharSet*, void); - DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void); - DECL_LINK(FavClickHdl, SvxShowCharSet*, void); - DECL_LINK(SearchCharDoubleClickHdl, SvxShowCharSet*, void); - DECL_LINK(SearchCharSelectHdl, SvxShowCharSet*, void); - DECL_LINK(SearchCharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK(SearchCharPreSelectHdl, SvxShowCharSet*, void); - DECL_LINK(DecimalCodeChangeHdl, weld::Entry&, void); - DECL_LINK(HexCodeChangeHdl, weld::Entry&, void); - DECL_LINK(CharClickHdl, SvxCharView*, void); - DECL_LINK(RecentClearClickHdl, SvxCharView*, void); - DECL_LINK(FavClearClickHdl, SvxCharView*, void); - DECL_LINK(RecentClearAllClickHdl, SvxCharView*, void); - DECL_LINK(FavClearAllClickHdl, SvxCharView*, void); - DECL_LINK(InsertClickHdl, weld::Button&, void); - DECL_LINK(FavSelectHdl, weld::Button&, void); - DECL_LINK(SearchUpdateHdl, weld::Entry&, void); - DECL_LINK(SearchFieldGetFocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(FontSelectHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(SubsetSelectHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(CharDoubleClickHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(CharSelectHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(CharHighlightHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(CharPreSelectHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(FavClickHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(SearchCharDoubleClickHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(SearchCharSelectHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(SearchCharHighlightHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(SearchCharPreSelectHdl, SvxShowCharSet*, void); + DECL_DLLPRIVATE_LINK(DecimalCodeChangeHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(HexCodeChangeHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(CharClickHdl, SvxCharView*, void); + DECL_DLLPRIVATE_LINK(RecentClearClickHdl, SvxCharView*, void); + DECL_DLLPRIVATE_LINK(FavClearClickHdl, SvxCharView*, void); + DECL_DLLPRIVATE_LINK(RecentClearAllClickHdl, SvxCharView*, void); + DECL_DLLPRIVATE_LINK(FavClearAllClickHdl, SvxCharView*, void); + DECL_DLLPRIVATE_LINK(InsertClickHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(FavSelectHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(SearchFieldGetFocusHdl, weld::Widget&, void); static void fillAllSubsets(weld::ComboBox& rListBox); void selectCharByCode(Radix radix); diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index b38e51aea5ff..24847b953c7d 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -375,8 +375,8 @@ namespace dbaui void ImplBroadcastFeatureState(const OUString& _rFeature, const css::uno::Reference< css::frame::XStatusListener > & xListener, bool _bIgnoreCache); // link methods - DECL_LINK(OnAsyncInvalidateAll, void*, void); - DECL_LINK(OnAsyncCloseTask, void*, void); + DECL_DLLPRIVATE_LINK(OnAsyncInvalidateAll, void*, void); + DECL_DLLPRIVATE_LINK(OnAsyncCloseTask, void*, void); public: const css::uno::Reference< css::uno::XComponentContext >& getORB() const { return m_xContext; } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 5a2d561ae8d3..f34028496941 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -599,12 +599,12 @@ private: bool bStrippingPortions; bool bPasting; - DECL_LINK( ParaVisibleStateChangedHdl, Paragraph&, void ); - DECL_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); - DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); - DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos&, void ); - DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos&, void ); - DECL_LINK( EditEngineNotifyHdl, EENotify&, void ); + DECL_DLLPRIVATE_LINK( ParaVisibleStateChangedHdl, Paragraph&, void ); + DECL_DLLPRIVATE_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); + DECL_DLLPRIVATE_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); + DECL_DLLPRIVATE_LINK( BeginPasteOrDropHdl, PasteOrDropInfos&, void ); + DECL_DLLPRIVATE_LINK( EndPasteOrDropHdl, PasteOrDropInfos&, void ); + DECL_DLLPRIVATE_LINK( EditEngineNotifyHdl, EENotify&, void ); void ImplCheckParagraphs( sal_Int32 nStart, sal_Int32 nEnd ); bool ImplHasNumberFormat( sal_Int32 nPara ) const; Size ImplGetBulletSize( sal_Int32 nPara ); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index f8375d4ef362..a41f9c09a60a 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -50,14 +50,14 @@ private: Link<RefEdit&,void> maModifyHdl; Link<weld::Widget&,bool> maActivateHdl; - DECL_LINK( UpdateHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( UpdateHdl, Timer*, void ); - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(GetFocusHdl, weld::Widget&, void); - DECL_LINK(LoseFocusHdl, weld::Widget&, void); - DECL_LINK(AsyncFocusInHdl, void*, void); - DECL_LINK(AsyncFocusOutHdl, void*, void); - DECL_LINK(Modify, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(GetFocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(LoseFocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(AsyncFocusInHdl, void*, void); + DECL_DLLPRIVATE_LINK(AsyncFocusOutHdl, void*, void); + DECL_DLLPRIVATE_LINK(Modify, weld::Entry&, void); void GetFocus(); void LoseFocus(); @@ -154,9 +154,9 @@ private: Link<RefButton&,void> maClickHdl; DECL_LINK(Click, weld::Button&, void); - DECL_LINK(KeyInput, const KeyEvent&, bool); - DECL_LINK(GetFocus, weld::Widget&, void); - DECL_LINK(LoseFocus, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(KeyInput, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(GetFocus, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(LoseFocus, weld::Widget&, void); public: RefButton(std::unique_ptr<weld::Button> xControl); diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx index 97df40d8f63b..4da9fccd965c 100644 --- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx +++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx @@ -47,8 +47,8 @@ private: // Handler for the object inspector tree ObjectInspectorTreeHandler maObjectInspectorTreeHandler; - DECL_LINK(DocumentModelTreeViewSelectionHandler, weld::TreeView&, void); - DECL_LINK(DomToolbarButtonClicked, const OString&, void); + DECL_DLLPRIVATE_LINK(DocumentModelTreeViewSelectionHandler, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(DomToolbarButtonClicked, const OString&, void); void updateSelection(); diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index ab75ddd187b7..7c41071243f0 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -53,7 +53,7 @@ private: std::shared_ptr<SfxItemSet> m_xItemSet; std::vector<OUString> m_pURLList; - DECL_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); + DECL_DLLPRIVATE_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); public: enum class Mode { diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 6a996db64873..21fe9d6e1e84 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -103,7 +103,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); const Size& GetMinOutputSizePixel() const; virtual bool EventNotify( NotifyEvent& rNEvt ) override; - DECL_LINK(TimerHdl, Timer *, void); + DECL_DLLPRIVATE_LINK(TimerHdl, Timer *, void); SAL_DLLPRIVATE void Initialize_Impl(); SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize ); diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 8587820b1813..dfde3c7b43c9 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -277,7 +277,7 @@ public: */ void SetContext( Context _eNewContext ); - DECL_LINK( ExecuteSystemFilePicker, void*, void ); + DECL_DLLPRIVATE_LINK( ExecuteSystemFilePicker, void*, void ); ErrCode Execute( std::vector<OUString>& rpURLList, std::optional<SfxAllItemSet>& rpSet, diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 2b89052110b7..f5b948014e9c 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -72,7 +72,7 @@ private: std::unique_ptr<weld::Toolbar> m_xCloseBtn; std::vector<std::unique_ptr<ExtraButton>> m_aActionBtns; - DECL_LINK(SizeAllocHdl, const Size&, void); + DECL_DLLPRIVATE_LINK(SizeAllocHdl, const Size&, void); void SetForeAndBackgroundColors(InfobarType eType); void SetCloseButtonImage(); @@ -104,7 +104,7 @@ public: void SetCommandHandler(weld::Button& rBtn, const OUString& aCommand); private: - DECL_LINK(CloseHandler, const OString&, void); + DECL_DLLPRIVATE_LINK(CloseHandler, const OString&, void); }; class SfxInfoBarContainerWindow final : public vcl::Window diff --git a/include/sfx2/inputdlg.hxx b/include/sfx2/inputdlg.hxx index adf9c2a2e850..840844d1827a 100644 --- a/include/sfx2/inputdlg.hxx +++ b/include/sfx2/inputdlg.hxx @@ -21,7 +21,7 @@ private: std::unique_ptr<weld::Button> m_xHelp; std::unique_ptr<weld::Button> m_xOk; std::function<bool(OUString)> mCheckEntry; - DECL_LINK(EntryChangedHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(EntryChangedHdl, weld::Entry&, void); public: InputDialog(weld::Widget* pParent, const OUString& rLabelText); diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 38b1ef57dfe2..cf108319758f 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -89,7 +89,7 @@ private: bool bWasLastEditOK : 1; bool m_bIsConnect : 1; - DECL_LINK( EndEditHdl, const OUString&, void ); + DECL_DLLPRIVATE_LINK( EndEditHdl, const OUString&, void ); bool ExecuteEdit( const OUString& _rNewName ); diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index 9be8586c710e..8cb2bd9b4ea4 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -81,12 +81,12 @@ private: std::unique_ptr<weld::CustomWeld> m_xPreviewWin; std::unique_ptr<weld::Label> m_xAltTitleFt; - DECL_LINK( Update, Timer *, void ); + DECL_DLLPRIVATE_LINK( Update, Timer *, void ); - DECL_LINK(RegionSelect, weld::TreeView&, void); - DECL_LINK(TemplateSelect, weld::TreeView&, void); - DECL_LINK(DoubleClick, weld::TreeView&, bool); - DECL_LINK(Expand, weld::Expander&, void); + DECL_DLLPRIVATE_LINK(RegionSelect, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(TemplateSelect, weld::TreeView&, void); + DECL_DLLPRIVATE_LINK(DoubleClick, weld::TreeView&, bool); + DECL_DLLPRIVATE_LINK(Expand, weld::Expander&, void); sal_uInt16 GetSelectedTemplatePos() const; public: diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 725f72b1c9f6..cbdf256c6c67 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -364,7 +364,7 @@ public: const OUString& aComment); SignatureState GetScriptingSignatureState(); void SignScriptingContent(weld::Window* pDialogParent); - DECL_LINK(SignDocumentHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(SignDocumentHandler, weld::Button&, void); virtual std::shared_ptr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(weld::Window* pParent, const SfxItemSet& rItemSet); diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index 2adae2ec6cdc..ac4950e5a45a 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -207,7 +207,7 @@ private: SAL_DLLPRIVATE SfxViewFrame& GetViewFrame_Impl() const; SAL_DLLPRIVATE void ShowInfoBars( ); - DECL_LINK( CheckOutHandler, weld::Button&, void ); + DECL_DLLPRIVATE_LINK( CheckOutHandler, weld::Button&, void ); std::unique_ptr<IMPL_SfxBaseController_DataContainer> m_pData ; diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index 7ea94a49960a..1c0af8ad249c 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -113,7 +113,7 @@ private: std::unique_ptr<weld::Box> mxContents; css::uno::Reference<css::awt::XWindow> mxXWindow; - DECL_LINK(DumpAsPropertyTreeHdl, tools::JsonWriter&, void); + DECL_DLLPRIVATE_LINK(DumpAsPropertyTreeHdl, tools::JsonWriter&, void); }; typedef std::vector<std::shared_ptr<Panel>> SharedPanelContainer; diff --git a/include/sfx2/sidebar/PanelLayout.hxx b/include/sfx2/sidebar/PanelLayout.hxx index e5630180f99e..301159362437 100644 --- a/include/sfx2/sidebar/PanelLayout.hxx +++ b/include/sfx2/sidebar/PanelLayout.hxx @@ -31,8 +31,8 @@ protected: virtual weld::Window* GetFrameWeld() const; private: - DECL_LINK(DataChangedEventListener, VclSimpleEvent&, void); - DECL_LINK(DumpAsPropertyTreeHdl, tools::JsonWriter&, void); + DECL_DLLPRIVATE_LINK(DataChangedEventListener, VclSimpleEvent&, void); + DECL_DLLPRIVATE_LINK(DumpAsPropertyTreeHdl, tools::JsonWriter&, void); public: PanelLayout(weld::Widget* pParent, const OString& rID, const OUString& rUIXMLDescription); diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index f65d260402ea..0a09f993dbad 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -228,7 +228,7 @@ private: */ VclPtr<vcl::Window> mpCloseIndicator; - DECL_LINK(WindowEventHandler, VclWindowEvent&, void); + DECL_DLLPRIVATE_LINK(WindowEventHandler, VclWindowEvent&, void); /** Make maRequestedContext the current context. */ void UpdateConfigurations(); @@ -261,8 +261,8 @@ private: weld::Menu& rMainButton, weld::Menu& rSubMenu, const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; - DECL_LINK(OnMenuItemSelected, const OString&, void); - DECL_LINK(OnSubMenuItemSelected, const OString&, void); + DECL_DLLPRIVATE_LINK(OnMenuItemSelected, const OString&, void); + DECL_DLLPRIVATE_LINK(OnSubMenuItemSelected, const OString&, void); void BroadcastPropertyChange(); /** The close of the deck changes the width of the child window. diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 22130c2a22fb..2f9b1c669ef3 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -60,10 +60,10 @@ protected: std::unique_ptr<weld::Notebook> m_xTabCtrl; DECL_LINK(OkHdl, weld::Button&, void); - DECL_LINK(ResetHdl, weld::Button&, void); - DECL_LINK(BaseFmtHdl, weld::Button&, void); - DECL_LINK(UserHdl, weld::Button&, void); - DECL_LINK(CancelHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(ResetHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(BaseFmtHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(UserHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(CancelHdl, weld::Button&, void); private: std::unique_ptr<weld::Button> m_xOKBtn; std::unique_ptr<weld::Button> m_xApplyBtn; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 940973f84f05..10d3107fc3e1 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -56,38 +56,38 @@ protected: void fillFolderComboBox(); - DECL_LINK(SelectApplicationHdl, weld::ComboBox&, void); - DECL_LINK(SelectRegionHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(SelectApplicationHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(SelectRegionHdl, weld::ComboBox&, void); - DECL_LINK(OkClickHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(OkClickHdl, weld::Button&, void); void ImportActionHdl(); static void ExtensionsActionHdl(); - DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*, void); + DECL_DLLPRIVATE_LINK(TVItemStateHdl, const ThumbnailViewItem*, void); - DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_DLLPRIVATE_LINK(MenuSelectHdl, const OString&, void); void DefaultTemplateMenuSelectHdl(std::string_view rIdent); - DECL_LINK(OpenRegionHdl, void*, void); - DECL_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); - DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK(EditTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK(DeleteTemplateHdl, void*, void); - DECL_LINK(DefaultTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK(MoveTemplateHdl, void*, void); - DECL_LINK(ExportTemplateHdl, void*, void); + DECL_DLLPRIVATE_LINK(OpenRegionHdl, void*, void); + DECL_DLLPRIVATE_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); + DECL_DLLPRIVATE_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_DLLPRIVATE_LINK(EditTemplateHdl, ThumbnailViewItem*, void); + DECL_DLLPRIVATE_LINK(DeleteTemplateHdl, void*, void); + DECL_DLLPRIVATE_LINK(DefaultTemplateHdl, ThumbnailViewItem*, void); + DECL_DLLPRIVATE_LINK(MoveTemplateHdl, void*, void); + DECL_DLLPRIVATE_LINK(ExportTemplateHdl, void*, void); void SearchUpdate(); - DECL_LINK(SearchUpdateHdl, weld::Entry&, void); - DECL_LINK(GetFocusHdl, weld::Widget&, void); - DECL_LINK(LoseFocusHdl, weld::Widget&, void); - DECL_LINK(ImplUpdateDataHdl, Timer*, void); - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(SearchUpdateHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(GetFocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(LoseFocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(ImplUpdateDataHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(ListViewHdl, weld::Toggleable&, void); - DECL_LINK(ThumbnailViewHdl, weld::Toggleable&, void); - DECL_LINK(FocusRectLocalHdl, weld::Widget&, tools::Rectangle); + DECL_DLLPRIVATE_LINK(ListViewHdl, weld::Toggleable&, void); + DECL_DLLPRIVATE_LINK(ThumbnailViewHdl, weld::Toggleable&, void); + DECL_DLLPRIVATE_LINK(FocusRectLocalHdl, weld::Widget&, tools::Rectangle); void OnTemplateImportCategory(std::u16string_view sCategory); // static void OnTemplateLink (); @@ -180,9 +180,9 @@ public: bool IsStartWithTemplate() const { return mxCBXHideDlg->get_active(); }; private: - DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK(OkClickHdl, weld::Button&, void); - DECL_LINK(TimeOut, Timer*, void); + DECL_DLLPRIVATE_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_DLLPRIVATE_LINK(OkClickHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(TimeOut, Timer*, void); OUString msTemplatePath; Idle maIdle; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 392d93cf5fba..1922270f413f 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -286,7 +286,7 @@ protected: ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos); void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); bool ImplHasAccessibleListeners() const; - DECL_LINK( ImplScrollHdl, weld::ScrolledWindow&, void ); + DECL_DLLPRIVATE_LINK( ImplScrollHdl, weld::ScrolledWindow&, void ); protected: diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index cb2d73542bac..fe87e81cf9c4 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -70,7 +70,7 @@ namespace sfx2 void impl_resetToolBox(); private: - DECL_LINK( OnToolboxItemSelected, ToolBox*, void ); + DECL_DLLPRIVATE_LINK( OnToolboxItemSelected, ToolBox*, void ); void impl_layout(); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 1e3bc1b19796..e52a1ec437a4 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -61,13 +61,13 @@ class SFX2_DLLPUBLIC SfxViewFrame final : public SfxShell, public SfxListener SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK(GetInvolvedHandler, weld::Button&, void); - DECL_LINK(DonationHandler, weld::Button&, void); - DECL_LINK(WhatsNewHandler, weld::Button&, void); - DECL_LINK(SwitchReadOnlyHandler, weld::Button&, void); - DECL_LINK(SignDocumentHandler, weld::Button&, void); - DECL_LINK(HiddenTrackChangesHandler, weld::Button&, void); - DECL_LINK(HyphenationMissingHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(GetInvolvedHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(DonationHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(WhatsNewHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(SwitchReadOnlyHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(SignDocumentHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(HiddenTrackChangesHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(HyphenationMissingHandler, weld::Button&, void); SAL_DLLPRIVATE void KillDispatcher_Impl(); virtual ~SfxViewFrame() override; diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx index 5807fc88b1cc..81c4cb85dcab 100644 --- a/include/sfx2/weldutils.hxx +++ b/include/sfx2/weldutils.hxx @@ -36,9 +36,9 @@ private: weld::Builder* m_pBuilder; bool m_bSideBar; - DECL_LINK(SelectHdl, const OString&, void); - DECL_LINK(ToggleMenuHdl, const OString&, void); - DECL_LINK(ChangedIconSizeHandler, LinkParamNone*, void); + DECL_DLLPRIVATE_LINK(SelectHdl, const OString&, void); + DECL_DLLPRIVATE_LINK(ToggleMenuHdl, const OString&, void); + DECL_DLLPRIVATE_LINK(ChangedIconSizeHandler, LinkParamNone*, void); void CreateController(const OUString& rCommand); static vcl::ImageType GetIconSize(); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 9bb68e804e0e..931aad16f811 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -87,14 +87,14 @@ public: private: void InitDetails(); - DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(DelHdl, weld::Button&, void); - DECL_LINK(EditHdl, DetailsContainer*, void); - DECL_LINK(ModifyHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(OKHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(DelHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(EditHdl, DetailsContainer*, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void); void SelectType(bool bSkipSeparator); - DECL_LINK(SelectTypeHdl, weld::ComboBox&, void); - DECL_LINK(EditLabelHdl, weld::Entry&, void); - DECL_LINK(EditUsernameHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(SelectTypeHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(EditLabelHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(EditUsernameHdl, weld::Entry&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 48fe7a59f060..6fc723ab63b3 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -92,14 +92,14 @@ namespace svt // initialize the dialog from the configuration data void loadConfiguration(); - DECL_LINK(OnFieldScroll, weld::ScrolledWindow&, void); - DECL_LINK(OnFieldSelect, weld::ComboBox&, void); - DECL_LINK(OnAdministrateDatasources, weld::Button&, void); + DECL_DLLPRIVATE_LINK(OnFieldScroll, weld::ScrolledWindow&, void); + DECL_DLLPRIVATE_LINK(OnFieldSelect, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(OnAdministrateDatasources, weld::Button&, void); DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, weld::Widget&, void); - DECL_LINK(OnComboLoseFocus, weld::Widget&, void); - DECL_LINK(OnComboSelect, weld::ComboBox&, void); - DECL_LINK(OnOkClicked, weld::Button&, void); - DECL_LINK(OnDelayedInitialize, void*, void); + DECL_DLLPRIVATE_LINK(OnComboLoseFocus, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(OnComboSelect, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(OnOkClicked, weld::Button&, void); + DECL_DLLPRIVATE_LINK(OnDelayedInitialize, void*, void); // string to display for "no selection" const OUString m_sNoFieldSelection; diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index fabdbcd1177e..a8785ad8a510 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -55,7 +55,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog > mxDialog; std::function<void(sal_Int32)> m_aResultFunc; - DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_DLLPRIVATE_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index ea49f0a4fbc5..28730d16e85a 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -251,10 +251,10 @@ private: SvxBorderLineStyle nStyle, BitmapEx& rBmp ); void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed - DECL_LINK(ValueSelectHdl, ValueSet*, void); - DECL_LINK(FocusHdl, weld::Widget&, void); - DECL_LINK(ToggleHdl, weld::Toggleable&, void); - DECL_LINK(NoneHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(ValueSelectHdl, ValueSet*, void); + DECL_DLLPRIVATE_LINK(FocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(ToggleHdl, weld::Toggleable&, void); + DECL_DLLPRIVATE_LINK(NoneHdl, weld::Button&, void); void UpdateEntries(); sal_Int32 GetStylePos(sal_Int32 nListPos) const; @@ -314,8 +314,8 @@ public: void connect_focus_in(const Link<weld::Widget&, void>& rLink) { m_xControl->connect_focus_in(rLink); } void connect_focus_out(const Link<weld::Widget&, void>& rLink) { m_xControl->connect_focus_out(rLink); } private: - DECL_LINK(SelectHdl, weld::Calendar&, void); - DECL_LINK(ActivateHdl, weld::Calendar&, void); + DECL_DLLPRIVATE_LINK(SelectHdl, weld::Calendar&, void); + DECL_DLLPRIVATE_LINK(ActivateHdl, weld::Calendar&, void); bool m_bUseLabel; @@ -342,10 +342,10 @@ private: SVT_DLLPRIVATE void ImplDestroyFontList(); - DECL_LINK(CustomRenderHdl, weld::ComboBox::render_args, void); - DECL_LINK(CustomGetSizeHdl, OutputDevice&, Size); - DECL_LINK(SettingsChangedHdl, VclSimpleEvent&, void); - DECL_LINK(UpdateHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(CustomRenderHdl, weld::ComboBox::render_args, void); + DECL_DLLPRIVATE_LINK(CustomGetSizeHdl, OutputDevice&, Size); + DECL_DLLPRIVATE_LINK(SettingsChangedHdl, VclSimpleEvent&, void); + DECL_DLLPRIVATE_LINK(UpdateHdl, Timer*, void); void LoadMRUEntries( const OUString& aFontMRUEntriesFile ); void SaveMRUEntries( const OUString& aFontMRUEntriesFile ) const; @@ -453,8 +453,8 @@ class SVT_DLLPUBLIC FontSizeBox OUString format_number(int nValue) const; - DECL_LINK(ModifyHdl, weld::ComboBox&, void); - DECL_LINK(ReformatHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(ReformatHdl, weld::Widget&, void); public: FontSizeBox(std::unique_ptr<weld::ComboBox> p); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 99a14fa980a9..6d253cb2245a 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -204,12 +204,12 @@ namespace svt } protected: - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(FocusInHdl, weld::Widget&, void); - DECL_LINK(FocusOutHdl, weld::Widget&, void); - DECL_LINK(MousePressHdl, const MouseEvent&, bool); - DECL_LINK(MouseReleaseHdl, const MouseEvent&, bool); - DECL_LINK(MouseMoveHdl, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(FocusInHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(FocusOutHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(MousePressHdl, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(MouseReleaseHdl, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(MouseMoveHdl, const MouseEvent&, bool); private: Link<LinkParamNone*,void> m_aFocusInHdl; Link<LinkParamNone*,void> m_aFocusOutHdl; @@ -595,7 +595,7 @@ namespace svt void Clicked(); private: - DECL_LINK(OnToggle, weld::Toggleable&, void); + DECL_DLLPRIVATE_LINK(OnToggle, weld::Toggleable&, void); void CallModifyHdls() { @@ -617,7 +617,7 @@ namespace svt private: virtual void ActivatingMouseEvent(const BrowserMouseEvent& rEvt, bool bUp) override; - DECL_LINK(ModifyHdl, LinkParamNone*, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, LinkParamNone*, void); }; //= ComboBoxControl @@ -663,7 +663,7 @@ namespace svt virtual void dispose() override; private: - DECL_LINK(SelectHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(SelectHdl, weld::ComboBox&, void); void CallModifyHdls() { @@ -685,7 +685,7 @@ namespace svt private: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; - DECL_LINK(ModifyHdl, LinkParamNone*, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, LinkParamNone*, void); }; //= ListBoxControl @@ -725,7 +725,7 @@ namespace svt virtual void dispose() override; private: - DECL_LINK(SelectHdl, weld::ComboBox&, void); + DECL_DLLPRIVATE_LINK(SelectHdl, weld::ComboBox&, void); void CallModifyHdls() { @@ -748,7 +748,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK(ListBoxSelectHdl, LinkParamNone*, void); + DECL_DLLPRIVATE_LINK(ListBoxSelectHdl, LinkParamNone*, void); }; class SVT_DLLPUBLIC FormattedControlBase : public EditControlBase @@ -813,9 +813,9 @@ namespace svt std::unique_ptr<weld::Button> m_xTodayBtn; std::unique_ptr<weld::Button> m_xNoneBtn; - DECL_LINK(ToggleHdl, weld::Toggleable&, void); - DECL_LINK(ActivateHdl, weld::Calendar&, void); - DECL_LINK(ImplClickHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(ToggleHdl, weld::Toggleable&, void); + DECL_DLLPRIVATE_LINK(ActivateHdl, weld::Calendar&, void); + DECL_DLLPRIVATE_LINK(ImplClickHdl, weld::Button&, void); }; class SVT_DLLPUBLIC PatternControl final : public EditControl diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index 23ea1c66323d..a6f86eab8f92 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -34,7 +34,7 @@ private: ::std::function<void ()> mpCallback; bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const; - DECL_LINK(TimerHandler, Timer *, void); + DECL_DLLPRIVATE_LINK(TimerHandler, Timer *, void); public: void resetTimer(); diff --git a/include/svtools/recorditemwindow.hxx b/include/svtools/recorditemwindow.hxx index 98f2e2db579a..a238148dd41f 100644 --- a/include/svtools/recorditemwindow.hxx +++ b/include/svtools/recorditemwindow.hxx @@ -30,11 +30,11 @@ protected: private: virtual void PositionFired(sal_Int64 nRecord); - DECL_LINK(KeyInputHdl, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(ActivatedHdl, weld::Entry&, bool); + DECL_DLLPRIVATE_LINK(ActivatedHdl, weld::Entry&, bool); // for invalidating our content when losing the focus - DECL_LINK(FocusOutHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(FocusOutHdl, weld::Widget&, void); void FirePosition(bool bForce); }; diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 3233cf8000a7..b0ba450a7285 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -43,7 +43,7 @@ enum class SvParserState template<typename T> class SVT_DLLPUBLIC SvParser : public SvRefBase { - DECL_LINK( NewDataRead, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( NewDataRead, LinkParamNone*, void ); protected: SvStream& rInput; diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 9f1e36ddaca8..f82d87f0d81b 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -34,7 +34,7 @@ namespace svt { class FrameStatusListener; } class SVT_DLLPUBLIC WeldToolbarPopup { private: - DECL_LINK(FocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(FocusHdl, weld::Widget&, void); protected: std::unique_ptr<weld::Builder> m_xBuilder; @@ -65,7 +65,7 @@ public: class SVT_DLLPUBLIC ToolbarPopupContainer final { private: - DECL_LINK(FocusHdl, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(FocusHdl, weld::Widget&, void); std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xTopLevel; 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; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index bacaa941e96a..b1735f3f27d8 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -55,8 +55,8 @@ private: rtl::Reference<VCLXWindow> m_xVCLXWindow; VclPtr<vcl::Window> m_xEventSource; - DECL_LINK( WindowEventListener, VclWindowEvent&, void ); - DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); + DECL_DLLPRIVATE_LINK( WindowEventListener, VclWindowEvent&, void ); + DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclWindowEvent&, void ); void DisconnectEvents(); protected: diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 73e8e3acb451..b77c4d65124e 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -68,7 +68,7 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } - DECL_LINK( MenuEventListener, VclMenuEvent&, void ); + DECL_DLLPRIVATE_LINK( MenuEventListener, VclMenuEvent&, void ); void ImplCreateMenu( bool bPopup ); void ImplAddListener(); diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 12783b5512ef..9acc4a636a7a 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -77,7 +77,7 @@ private: protected: Size ImplCalcWindowSize( const Size& rOutSz ) const; - DECL_LINK(WindowEventListener, VclWindowEvent&, void ); + DECL_DLLPRIVATE_LINK(WindowEventListener, VclWindowEvent&, void ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual css::uno::Reference< css::accessibility::XAccessibleContext > diff --git a/include/vcl/InterimItemWindow.hxx b/include/vcl/InterimItemWindow.hxx index 61c001fd8caa..3fc0903b110f 100644 --- a/include/vcl/InterimItemWindow.hxx +++ b/include/vcl/InterimItemWindow.hxx @@ -61,7 +61,7 @@ private: void StartIdleLayout(); - DECL_LINK(DoLayout, Timer*, void); + DECL_DLLPRIVATE_LINK(DoLayout, Timer*, void); virtual void ImplPaintToDevice(::OutputDevice* pTargetOutDev, const Point& rPos) override; }; diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx index 2780548e15c5..a96d8c5522fe 100644 --- a/include/vcl/customweld.hxx +++ b/include/vcl/customweld.hxx @@ -144,20 +144,20 @@ private: weld::CustomWidgetController& m_rWidgetController; std::unique_ptr<weld::DrawingArea> m_xDrawingArea; - DECL_LINK(DoResize, const Size& rSize, void); - DECL_LINK(DoPaint, weld::DrawingArea::draw_args, void); - DECL_LINK(DoMouseButtonDown, const MouseEvent&, bool); - DECL_LINK(DoMouseMove, const MouseEvent&, bool); - DECL_LINK(DoMouseButtonUp, const MouseEvent&, bool); - DECL_LINK(DoGetFocus, weld::Widget&, void); - DECL_LINK(DoLoseFocus, weld::Widget&, void); - DECL_LINK(DoKeyPress, const KeyEvent&, bool); - DECL_LINK(DoFocusRect, weld::Widget&, tools::Rectangle); - DECL_LINK(DoCommand, const CommandEvent&, bool); - DECL_LINK(DoStyleUpdated, weld::Widget&, void); - DECL_LINK(DoRequestHelp, tools::Rectangle&, OUString); - DECL_LINK(DoGetSurrounding, OUString&, int); - DECL_LINK(DoDeleteSurrounding, const Selection&, bool); + DECL_DLLPRIVATE_LINK(DoResize, const Size& rSize, void); + DECL_DLLPRIVATE_LINK(DoPaint, weld::DrawingArea::draw_args, void); + DECL_DLLPRIVATE_LINK(DoMouseButtonDown, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(DoMouseMove, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(DoMouseButtonUp, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(DoGetFocus, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(DoLoseFocus, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(DoKeyPress, const KeyEvent&, bool); + DECL_DLLPRIVATE_LINK(DoFocusRect, weld::Widget&, tools::Rectangle); + DECL_DLLPRIVATE_LINK(DoCommand, const CommandEvent&, bool); + DECL_DLLPRIVATE_LINK(DoStyleUpdated, weld::Widget&, void); + DECL_DLLPRIVATE_LINK(DoRequestHelp, tools::Rectangle&, OUString); + DECL_DLLPRIVATE_LINK(DoGetSurrounding, OUString&, int); + DECL_DLLPRIVATE_LINK(DoDeleteSurrounding, const Selection&, bool); public: CustomWeld(weld::Builder& rBuilder, const OString& rDrawingId, diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 17e1b9e3a07f..824c6ae33c3e 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -383,7 +383,7 @@ private: ErrCode ImplSetError( ErrCode nError, const SvStream* pStm = nullptr ); ErrCode ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ); - DECL_LINK( FilterCallback, ConvertData&, bool ); + DECL_DLLPRIVATE_LINK( FilterCallback, ConvertData&, bool ); /** Information about errors during the GraphicFilter operation. */ std::optional<ErrCode> mxErrorEx; diff --git a/include/vcl/menubarupdateicon.hxx b/include/vcl/menubarupdateicon.hxx index b8e2b717a3dd..9cb3b397dfa1 100644 --- a/include/vcl/menubarupdateicon.hxx +++ b/include/vcl/menubarupdateicon.hxx @@ -52,13 +52,13 @@ private: bool mbShowBubble; bool mbBubbleChanged; - DECL_LINK(UserEventHdl, void*, void); - DECL_LINK(TimeOutHdl, Timer*, void); - DECL_LINK(WindowEventHdl, VclWindowEvent&, void); - DECL_LINK(ApplicationEventHdl, VclSimpleEvent&, void); - DECL_LINK(WaitTimeOutHdl, Timer*, void); - DECL_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_DLLPRIVATE_LINK(UserEventHdl, void*, void); + DECL_DLLPRIVATE_LINK(TimeOutHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(WindowEventHdl, VclWindowEvent&, void); + DECL_DLLPRIVATE_LINK(ApplicationEventHdl, VclSimpleEvent&, void); + DECL_DLLPRIVATE_LINK(WaitTimeOutHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_DLLPRIVATE_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); VclPtr<BubbleWindow> GetBubbleWindow(); void SetBubbleChanged(); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 38a26e0680a4..b749130fb6ff 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -221,7 +221,7 @@ private: static sal_uInt16 m_nHeaderHeight; VclPtr<ToolBox> m_pShortcuts; VclPtr<PushButton> m_pOpenMenu; - DECL_LINK(OpenMenu, Button*, void); + DECL_DLLPRIVATE_LINK(OpenMenu, Button*, void); }; #endif // INCLUDED_VCL_TABCTRL_HXX diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 888072cba2ff..e06c4c1a7750 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -35,7 +35,7 @@ private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); void lcl_Scroll( tools::Long nX, tools::Long nY ); - DECL_LINK( ScrollBarHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollBarHdl, ScrollBar*, void ); VclPtr<ScrollBar> m_pVScroll; VclPtr<ScrollBar> m_pHScroll; diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 0a532afb2891..1dbbd5ba1f4d 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -153,7 +153,7 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster void ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars ); void ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars ); - DECL_LINK( IdleFormatHdl, Timer *, void ); + DECL_DLLPRIVATE_LINK( IdleFormatHdl, Timer *, void ); void CheckIdleFormatter(); void IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 ); diff --git a/include/vcl/toolkit/fixedhyper.hxx b/include/vcl/toolkit/fixedhyper.hxx index ebfbd558644f..6abfa0ac3a2a 100644 --- a/include/vcl/toolkit/fixedhyper.hxx +++ b/include/vcl/toolkit/fixedhyper.hxx @@ -44,7 +44,7 @@ private: /** is position X position hitting text */ SAL_DLLPRIVATE bool ImplIsOverText(Point rPosition) const; - DECL_LINK(HandleClick, FixedHyperlink&, void); + DECL_DLLPRIVATE_LINK(HandleClick, FixedHyperlink&, void); /** overwrites Window::MouseMove(). diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx index 2568c682fa90..ef1cec25011d 100644 --- a/include/vcl/toolkit/roadmap.hxx +++ b/include/vcl/toolkit/roadmap.hxx @@ -87,7 +87,7 @@ private: /// called when an item has been selected by any means void Select(); - DECL_LINK(ImplClickHdl, HyperLabel*, void); + DECL_DLLPRIVATE_LINK(ImplClickHdl, HyperLabel*, void); RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; diff --git a/include/vcl/toolkit/throbber.hxx b/include/vcl/toolkit/throbber.hxx index 287e1e58d949..ff1240074b05 100644 --- a/include/vcl/toolkit/throbber.hxx +++ b/include/vcl/toolkit/throbber.hxx @@ -79,7 +79,7 @@ private: sal_Int32 mnCurStep; AutoTimer maWaitTimer; - DECL_LINK( TimeOutHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( TimeOutHdl, Timer*, void ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index 478cf2f05145..999f3a52c6b6 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -652,7 +652,7 @@ public: sal_Int32 DefaultCompare(const SvLBoxString* pLeftText, const SvLBoxString* pRightText); - DECL_LINK( DefaultCompare, const SvSortData&, sal_Int32 ); + DECL_DLLPRIVATE_LINK( DefaultCompare, const SvSortData&, sal_Int32 ); virtual void ModelNotification( SvListAction nActionId, SvTreeListEntry* pEntry1, SvTreeListEntry* pEntry2, sal_uInt32 nPos ) override; diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx index 34b4383a89cc..5cb8e5c972aa 100644 --- a/include/vcl/weldutils.hxx +++ b/include/vcl/weldutils.hxx @@ -279,8 +279,8 @@ public: virtual ~LongCurrencyFormatter() override; private: - DECL_LINK(FormatOutputHdl, LinkParamNone*, bool); - DECL_LINK(ParseInputHdl, sal_Int64*, TriState); + DECL_DLLPRIVATE_LINK(FormatOutputHdl, LinkParamNone*, bool); + DECL_DLLPRIVATE_LINK(ParseInputHdl, sal_Int64*, TriState); void Init(); @@ -307,9 +307,9 @@ public: virtual ~TimeFormatter() override; private: - DECL_LINK(FormatOutputHdl, LinkParamNone*, bool); - DECL_LINK(ParseInputHdl, sal_Int64*, TriState); - DECL_LINK(CursorChangedHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(FormatOutputHdl, LinkParamNone*, bool); + DECL_DLLPRIVATE_LINK(ParseInputHdl, sal_Int64*, TriState); + DECL_DLLPRIVATE_LINK(CursorChangedHdl, weld::Entry&, void); void Init(); @@ -340,9 +340,9 @@ public: virtual ~DateFormatter() override; private: - DECL_LINK(FormatOutputHdl, LinkParamNone*, bool); - DECL_LINK(ParseInputHdl, sal_Int64*, TriState); - DECL_LINK(CursorChangedHdl, weld::Entry&, void); + DECL_DLLPRIVATE_LINK(FormatOutputHdl, LinkParamNone*, bool); + DECL_DLLPRIVATE_LINK(ParseInputHdl, sal_Int64*, TriState); + DECL_DLLPRIVATE_LINK(CursorChangedHdl, weld::Entry&, void); void Init(); CalendarWrapper& GetCalendarWrapper() const; @@ -407,9 +407,9 @@ private: const Link<const CommandEvent&, void> m_aContextLink; bool m_bModKey; - DECL_LINK(MousePressHdl, const MouseEvent&, bool); - DECL_LINK(MouseReleaseHdl, const MouseEvent&, bool); - DECL_LINK(RepeatTimerHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(MousePressHdl, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(MouseReleaseHdl, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(RepeatTimerHdl, Timer*, void); public: ButtonPressRepeater(weld::Button& rButton, const Link<Button&, void>& rLink, |