7 files changed, 16 insertions, 16 deletions
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index 0ff361966758..7b5aa22a1927 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -112,7 +112,7 @@ bool MacroSnippet::Compile()
 
 bool MacroSnippet::HasError() { return mbError; }
 
-IMPL_LINK_TYPED( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
+IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
     fprintf(stderr,"(%d:%d)\n",
             StarBASIC::GetLine(), StarBASIC::GetCol1());
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index b287e56f18a1..d435489846fb 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -43,7 +43,7 @@ public:
 
     bool Compile();
 
-    DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
+    DECL_LINK( BasicErrorHdl, StarBASIC *, bool );
 
     bool HasError();
 };
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index d4b7e3750b5b..6388ef712ed9 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -456,10 +456,10 @@ public:
         uno::Reference< frame::XDesktop2 > xDeskTop = frame::Desktop::create( comphelper::getProcessComponentContext() );
         xDeskTop->terminate();
     }
-    DECL_STATIC_LINK_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void );
+    DECL_STATIC_LINK( AsyncQuitHandler, OnAsyncQuit, void*, void );
 };
 
-IMPL_STATIC_LINK_NOARG_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void )
+IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit, void*, void )
 {
     QuitApplication();
 }
@@ -1732,11 +1732,11 @@ public:
         // restore error handler
         StarBASIC::SetGlobalErrorHdl(mErrHandler);
     }
-    DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
+    DECL_LINK( BasicErrorHdl, StarBASIC *, bool );
     bool HasError() { return mbError; }
 };
 
-IMPL_LINK_TYPED( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
+IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
     mbError = true;
     return false;
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index fb84c1af06ed..945e610dc1ed 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -67,7 +67,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
     return nDdeErrMap[ 2 * (nErr - DDE_FIRSTERR) + 1 ];
 }
 
-IMPL_LINK_TYPED( SbiDdeControl, Data, const DdeData*, pData, void )
+IMPL_LINK( SbiDdeControl, Data, const DdeData*, pData, void )
 {
     aData = OUString::createFromAscii( static_cast<const char*>(static_cast<const void*>(*pData)) );
 }
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index 0eaac2123b51..a961b19b405f 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -29,7 +29,7 @@ class DdeData;
 class SbiDdeControl
 {
 private:
-    DECL_LINK_TYPED( Data, const DdeData*, void );
+    DECL_LINK( Data, const DdeData*, void );
     static SbError GetLastErr( DdeConnection* );
     size_t GetFreeChannel();
     std::vector<DdeConnection*> aConvList;
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index b0a4655e8a0e..4b89c6c4cf08 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -40,8 +40,8 @@ class SvRTLInputBox : public ModalDialog
     void InitButtons( const Size& rDlgSize );
     void PositionEdit( const Size& rDlgSize );
     void PositionPrompt( const OUString& rPrompt, const Size& rDlgSize );
-    DECL_LINK_TYPED( OkHdl, Button *, void );
-    DECL_LINK_TYPED( CancelHdl, Button *, void );
+    DECL_LINK( OkHdl, Button *, void );
+    DECL_LINK( CancelHdl, Button *, void );
 
 public:
     SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle,
@@ -129,13 +129,13 @@ void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize)
 }
 
 
-IMPL_LINK_NOARG_TYPED( SvRTLInputBox, OkHdl, Button *, void )
+IMPL_LINK_NOARG( SvRTLInputBox, OkHdl, Button *, void )
 {
     aText = aEdit->GetText();
     EndDialog( 1 );
 }
 
-IMPL_LINK_NOARG_TYPED( SvRTLInputBox, CancelHdl, Button *, void )
+IMPL_LINK_NOARG( SvRTLInputBox, CancelHdl, Button *, void )
 {
     aText.clear();
     EndDialog();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 05020f6082ce..a56d6e33373d 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -66,8 +66,8 @@ class SbiInputDialog : public ModalDialog {
     VclPtr<OKButton> aOk;
     VclPtr<CancelButton> aCancel;
     OUString aText;
-    DECL_LINK_TYPED( Ok, Button *, void );
-    DECL_LINK_TYPED( Cancel, Button *, void );
+    DECL_LINK( Ok, Button *, void );
+    DECL_LINK( Cancel, Button *, void );
 public:
     SbiInputDialog( vcl::Window*, const OUString& );
     virtual ~SbiInputDialog() override { disposeOnce(); }
@@ -111,13 +111,13 @@ void SbiInputDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED( SbiInputDialog, Ok, Button *, void )
+IMPL_LINK_NOARG( SbiInputDialog, Ok, Button *, void )
 {
     aText = aInput->GetText();
     EndDialog( 1 );
 }
 
-IMPL_LINK_NOARG_TYPED( SbiInputDialog, Cancel, Button *, void )
+IMPL_LINK_NOARG( SbiInputDialog, Cancel, Button *, void )
 {
     EndDialog();
 }