diff options
-rw-r--r-- | cui/source/options/optgdlg.hxx | 2 | ||||
-rw-r--r-- | include/framework/generictoolbarcontroller.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/docfile.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/notebookbar/SfxNotebookBar.hxx | 2 | ||||
-rw-r--r-- | include/svtools/addresstemplate.hxx | 2 | ||||
-rw-r--r-- | include/svtools/popupmenucontrollerbase.hxx | 2 | ||||
-rw-r--r-- | include/svtools/toolboxcontroller.hxx | 2 | ||||
-rw-r--r-- | include/svx/ClassificationDialog.hxx | 4 | ||||
-rw-r--r-- | include/svx/fmobjfac.hxx | 2 | ||||
-rw-r--r-- | include/svx/hexcolorcontrol.hxx | 2 | ||||
-rw-r--r-- | include/svx/objfac3d.hxx | 2 | ||||
-rw-r--r-- | include/test/bootstrapfixture.hxx | 2 | ||||
-rw-r--r-- | include/vcl/svapp.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolkit/button.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/preview.hxx | 2 | ||||
-rw-r--r-- | sd/inc/sdmod.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/textsh.hxx | 2 |
17 files changed, 18 insertions, 18 deletions
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 198ecb50e0e8..75f29c6c5a34 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -55,7 +55,7 @@ private: DECL_LINK(TwoFigureHdl, weld::SpinButton&, void); #if defined(_WIN32) - DECL_STATIC_LINK(OfaMiscTabPage, FileAssocClick, weld::Button&, void); + DECL_DLLPRIVATE_STATIC_LINK(OfaMiscTabPage, FileAssocClick, weld::Button&, void); #endif protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; diff --git a/include/framework/generictoolbarcontroller.hxx b/include/framework/generictoolbarcontroller.hxx index 8184de97e92f..e177ea5f00a9 100644 --- a/include/framework/generictoolbarcontroller.hxx +++ b/include/framework/generictoolbarcontroller.hxx @@ -51,7 +51,7 @@ class FWK_DLLPUBLIC GenericToolbarController final : public svt::ToolboxControll // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; - DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, void ); + DECL_DLLPRIVATE_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, void ); struct ExecuteInfo { diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 55b31202bcab..5e542fe4648e 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -95,7 +95,7 @@ public: virtual ~SfxMedium() override; - DECL_STATIC_LINK(SfxMedium, ShowReloadEditableDialog, void*, void); + DECL_DLLPRIVATE_STATIC_LINK(SfxMedium, ShowReloadEditableDialog, void*, void); bool CheckCanGetLockfile() const; void SetOriginallyReadOnly(bool val); void AddToCheckEditableWorkerList(); diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index 2fe195f06901..cbf7f92d3b9b 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -76,7 +76,7 @@ private: static std::map<const SfxViewShell*, std::shared_ptr<WeldedTabbedNotebookbar>> m_pNotebookBarWeldedWrapper; - DECL_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const SfxViewShell*, void); + DECL_DLLPRIVATE_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const SfxViewShell*, void); }; } // namespace sfx2 diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 6fc723ab63b3..04ce8d9be68d 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -95,7 +95,7 @@ namespace svt 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_DLLPRIVATE_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, weld::Widget&, void); DECL_DLLPRIVATE_LINK(OnComboLoseFocus, weld::Widget&, void); DECL_DLLPRIVATE_LINK(OnComboSelect, weld::ComboBox&, void); DECL_DLLPRIVATE_LINK(OnOkClicked, weld::Button&, void); diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 31fc398b513d..6ce19444aa51 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -107,7 +107,7 @@ namespace svt virtual void impl_setPopupMenu(); static OUString determineBaseURL( const OUString& aURL ); - DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); + DECL_DLLPRIVATE_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); bool m_bInitialized; diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index f2068306438e..8490f69e185f 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -157,7 +157,7 @@ class SVT_DLLPUBLIC ToolboxController : {} }; - DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, void*, void ); + DECL_DLLPRIVATE_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, void*, void ); typedef std::unordered_map< OUString, css::uno::Reference< css::frame::XDispatch > > URLToDispatchMap; diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 27fb7cb07a43..d7c838200835 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -68,8 +68,8 @@ private: 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_DLLPRIVATE_STATIC_LINK(ClassificationDialog, ExpandedHdl, weld::Expander&, void); + DECL_DLLPRIVATE_STATIC_LINK(ClassificationDialog, KeyInput, const KeyEvent&, bool); DECL_DLLPRIVATE_LINK(OnAsyncExpandHdl, void*, void); void insertField(ClassificationType eType, OUString const& rString, OUString const& rFullString, diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx index 8109e87ceae5..188ff895d8f7 100644 --- a/include/svx/fmobjfac.hxx +++ b/include/svx/fmobjfac.hxx @@ -32,7 +32,7 @@ public: FmFormObjFactory(); ~FmFormObjFactory(); - DECL_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); + DECL_DLLPRIVATE_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); }; #endif // _FM_FMOBJFAC_HXX diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx index 656554c67286..e1470c982a00 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/svx/hexcolorcontrol.hxx @@ -37,7 +37,7 @@ private: Link<weld::Entry&, void> m_aModifyHdl; ImplSVEvent* m_nAsyncModifyEvent; - DECL_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, bool); + DECL_DLLPRIVATE_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, bool); DECL_DLLPRIVATE_LINK(ImplProcessModifyHdl, weld::Entry&, void); DECL_DLLPRIVATE_LINK(OnAsyncModifyHdl, void*, void); public: diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx index c06c2af4434d..75201a554573 100644 --- a/include/svx/objfac3d.hxx +++ b/include/svx/objfac3d.hxx @@ -38,7 +38,7 @@ public: E3dObjFactory(); ~E3dObjFactory(); - DECL_STATIC_LINK(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); + DECL_DLLPRIVATE_STATIC_LINK(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); }; #endif // INCLUDED_SVX_OBJFAC3D_HXX diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index b039f0e6e3bf..b3463ae223d5 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -55,7 +55,7 @@ protected: static bool IsDefaultDPI(); public: - DECL_STATIC_LINK(BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool); + DECL_DLLPRIVATE_STATIC_LINK(BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool); BootstrapFixture(bool bAssertOnDialog = true, bool bNeedUCB = true); virtual ~BootstrapFixture() override; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index c2c5779911c8..b1db15915815 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1341,7 +1341,7 @@ public: virtual void libreOfficeKitViewCallback(int nType, const char* pPayload) const override; private: - DECL_STATIC_LINK( Application, PostEventHandler, void*, void ); + DECL_DLLPRIVATE_STATIC_LINK( Application, PostEventHandler, void*, void ); }; class SolarMutexGuard diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index e68818ab62de..28024d8c7d0b 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -110,7 +110,7 @@ public: protected: /// Handler for click, in case we want the button to handle uno commands (.uno:Something). - DECL_STATIC_LINK(Button, dispatchCommandHandler, Button*, void); + DECL_DLLPRIVATE_STATIC_LINK(Button, dispatchCommandHandler, Button*, void); }; enum class PushButtonDropdownStyle diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index bf93b7069d73..606454d992ba 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -151,7 +151,7 @@ public: void CalcAll() { CalcPages(); } void SetInGetState(bool bSet) { bInGetState = bSet; } - DECL_STATIC_LINK( ScPreview, InvalidateHdl, void*, void ); + DECL_DLLPRIVATE_STATIC_LINK( ScPreview, InvalidateHdl, void*, void ); static void StaticInvalidate(); FmFormView* GetDrawView() { return pDrawView.get(); } diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 1fa0bb08d251..18440f688230 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -164,7 +164,7 @@ private: @VclSimpleEvent * a pointer to a VCLSimpleEvent (see vcl/vclevent.hxx ) */ - DECL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, void ); + DECL_DLLPRIVATE_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, void ); std::unique_ptr<svtools::ColorConfig> mpColorConfig; }; diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx index 2d6abbff4b88..f965370e08c6 100644 --- a/sw/source/uibase/inc/textsh.hxx +++ b/sw/source/uibase/inc/textsh.hxx @@ -48,7 +48,7 @@ private: public: DECL_DLLPRIVATE_LINK( RedlineNextHdl, AbstractSvxPostItDialog&, void ); DECL_DLLPRIVATE_LINK( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); - DECL_STATIC_LINK( SwTextShell, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_DLLPRIVATE_STATIC_LINK( SwTextShell, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); void Execute(SfxRequest &); void GetState(SfxItemSet &); |