loplugin:dllprivate

Change-Id: I1fe70a39c50aba8b84c117653185fc37dbbfeab0

3 files changed, 21 insertions, 21 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index b97a70fae2e8..7c14fb3170d9 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -128,11 +128,11 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
     MENU_COMMAND    ShowPopupMenu( const Point &rPos, const long nPos );
 
 
-    DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
 
-    DECL_DLLPRIVATE_LINK_TYPED( HandleOptionsBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleEnableBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleRemoveBtn, Button*, void );
+    DECL_LINK_TYPED( HandleOptionsBtn, Button*, void );
+    DECL_LINK_TYPED( HandleEnableBtn, Button*, void );
+    DECL_LINK_TYPED( HandleRemoveBtn, Button*, void );
 
 public:
     explicit ExtBoxWithBtns_Impl(vcl::Window* pParent);
@@ -1140,7 +1140,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
         return true;
 }
 
-IMPL_LINK_NOARG_TYPED(ExtMgrDialog, Restart, void*, void)
+IMPL_STATIC_LINK_NOARG_TYPED(ExtMgrDialog, Restart, void*, void)
 {
     SolarMutexGuard aGuard;
     ::svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 703803025750..801cdd264abe 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -132,15 +132,15 @@ class ExtMgrDialog : public ModelessDialog,
 
     bool removeExtensionWarn( const OUString &rExtensionTitle ) const;
 
-    DECL_DLLPRIVATE_LINK_TYPED( HandleAddBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleUpdateBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleExtTypeCbx, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void );
-    DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void);
-    DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void );
-    DECL_DLLPRIVATE_LINK_TYPED( Restart, void *, void );
+    DECL_LINK_TYPED( HandleAddBtn, Button*, void );
+    DECL_LINK_TYPED( HandleUpdateBtn, Button*, void );
+    DECL_LINK_TYPED( HandleCancelBtn, Button*, void );
+    DECL_LINK_TYPED( HandleCloseBtn, Button*, void );
+    DECL_LINK_TYPED( HandleExtTypeCbx, Button*, void );
+    DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void );
+    DECL_LINK_TYPED(TimeOutHdl, Idle *, void);
+    DECL_LINK_TYPED( startProgress, void *, void );
+    DECL_STATIC_LINK_TYPED( ExtMgrDialog, Restart, void *, void );
 
 public:
                     ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
@@ -199,12 +199,12 @@ class UpdateRequiredDialog : public ModalDialog,
 
     css::uno::Reference< css::task::XAbortChannel > m_xAbortChannel;
 
-    DECL_DLLPRIVATE_LINK_TYPED( HandleUpdateBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void );
-    DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void);
-    DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void );
-    DECL_DLLPRIVATE_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void );
+    DECL_LINK_TYPED( HandleUpdateBtn, Button*, void );
+    DECL_LINK_TYPED( HandleCloseBtn, Button*, void );
+    DECL_LINK_TYPED( HandleCancelBtn, Button*, void );
+    DECL_LINK_TYPED(TimeOutHdl, Idle *, void);
+    DECL_LINK_TYPED( startProgress, void *, void );
+    DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void );
 
     static bool     isEnabled( const css::uno::Reference< css::deployment::XPackage > &xPackage );
     static bool     checkDependencies( const css::uno::Reference< css::deployment::XPackage > &xPackage );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 6c70e41d8623..f20153eae304 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -163,7 +163,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     void DeleteRemoved();
 
 
-    DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
 
     void Init();
 public: