Remove _TYPED suffix from tools/link.hxx macros

...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.

Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c

26 files changed, 57 insertions, 57 deletions

diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index ad5b9b4c7ed3..c223cc6dc305 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -471,14 +471,14 @@ namespace pcr
     }
 
 
-    IMPL_LINK_TYPED( OBrowserLine, OnButtonClicked, Button*, _pButton, void )
+    IMPL_LINK( OBrowserLine, OnButtonClicked, Button*, _pButton, void )
     {
         if ( m_pClickListener )
             m_pClickListener->buttonClicked( this, _pButton == m_pBrowseButton );
     }
 
 
-    IMPL_LINK_NOARG_TYPED( OBrowserLine, OnButtonFocus, Control&, void )
+    IMPL_LINK_NOARG( OBrowserLine, OnButtonFocus, Control&, void )
     {
         if ( m_xControl.is() )
         {
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 7b61eca74a6f..5442c193a883 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -113,8 +113,8 @@ namespace pcr
         void                IndentTitle( bool _bIndent );
 
     private:
-        DECL_LINK_TYPED( OnButtonClicked, Button*, void );
-        DECL_LINK_TYPED( OnButtonFocus, Control&, void );
+        DECL_LINK( OnButtonClicked, Button*, void );
+        DECL_LINK( OnButtonFocus, Control&, void );
 
         void    implHideBrowseButton( bool _bPrimary, bool _bReLayout );
         void    implUpdateEnabledDisabled();
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 86bd00caec55..bd9758a3fcf5 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -839,7 +839,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_TYPED(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar, void )
+    IMPL_LINK(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar, void )
     {
         DBG_ASSERT(_pScrollBar == m_aVScroll.get(), "OBrowserListBox::ScrollHdl: where does this come from?");
         (void)_pScrollBar;
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 325afbe8fe76..9ef2c6fe2c54 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -155,7 +155,7 @@ namespace pcr
 
         using Window::SetHelpText;
     private:
-        DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+        DECL_LINK( ScrollHdl, ScrollBar*, void );
 
         /** retrieves the index of a given control in our line list
             @param _rxControl
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 276c5248c65e..d31417c85cf6 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -40,7 +40,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void)
+    IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void)
     {
         m_nActivePage = m_pPropBox->GetCurPage();
         m_aPageActivationHandler.Call(nullptr);
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 2589a833a6bb..9057f754b48c 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -60,7 +60,7 @@ namespace pcr
         css::awt::Size getMinimumSize();
 
     protected:
-        DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void);
+        DECL_LINK(OnPageActivation, LinkParamNone*, void);
     };
 
 
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index 4d37c7077500..745880465b52 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -94,17 +94,17 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, EditModifiedHdl, Edit&, void )
+    IMPL_LINK_NOARG( CommonBehaviourControlHelper, EditModifiedHdl, Edit&, void )
     {
         setModified();
     }
 
-    IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, ModifiedHdl, ListBox&, void )
+    IMPL_LINK_NOARG( CommonBehaviourControlHelper, ModifiedHdl, ListBox&, void )
     {
         setModified();
     }
 
-    IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, GetFocusHdl, Control&, void )
+    IMPL_LINK_NOARG( CommonBehaviourControlHelper, GetFocusHdl, Control&, void )
     {
         try
         {
@@ -118,7 +118,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, LoseFocusHdl, Control&, void )
+    IMPL_LINK_NOARG( CommonBehaviourControlHelper, LoseFocusHdl, Control&, void )
     {
         // TODO/UNOize: should this be outside the default control's implementations? If somebody
         // has an own control implementation, which does *not* do this - would this be allowed?
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index f8c18336177d..da0fe76d8307 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -89,10 +89,10 @@ namespace pcr
         virtual vcl::Window* getVclWindow() = 0;
 
         /// may be used by derived classes, they forward the event to the PropCtrListener
-        DECL_LINK_TYPED( ModifiedHdl, ListBox&, void );
-        DECL_LINK_TYPED( EditModifiedHdl, Edit&, void );
-        DECL_LINK_TYPED( GetFocusHdl, Control&, void );
-        DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
+        DECL_LINK( ModifiedHdl, ListBox&, void );
+        DECL_LINK( EditModifiedHdl, Edit&, void );
+        DECL_LINK( GetFocusHdl, Control&, void );
+        DECL_LINK( LoseFocusHdl, Control&, void );
     };
 
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 0078123cd0e4..e6b40c64e8da 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -3224,7 +3224,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( FormComponentPropertyHandler, OnDesignerClosed, SQLCommandDesigner&, void )
+    IMPL_LINK_NOARG( FormComponentPropertyHandler, OnDesignerClosed, SQLCommandDesigner&, void )
     {
         OSL_ENSURE( m_xBrowserUI.is() && m_xCommandDesigner.is(), "FormComponentPropertyHandler::OnDesignerClosed: too many NULLs!" );
         if ( m_xBrowserUI.is() && m_xCommandDesigner.is() )
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index 71c83c57dcd0..0041b124068e 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -430,7 +430,7 @@ namespace pcr
         OUString impl_getDocumentURL_nothrow() const;
 
     private:
-        DECL_LINK_TYPED( OnDesignerClosed, SQLCommandDesigner&, void );
+        DECL_LINK( OnDesignerClosed, SQLCommandDesigner&, void );
 
     private:
         FormComponentPropertyHandler( const FormComponentPropertyHandler& ) = delete;
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 22e9dc321382..500bbc982053 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -92,7 +92,7 @@ namespace pcr
         void    fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames );
 
     private:
-        DECL_LINK_TYPED( OnFieldNameChanged, Edit&, void );
+        DECL_LINK( OnFieldNameChanged, Edit&, void );
     };
 
 
@@ -147,7 +147,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( FieldLinkRow, OnFieldNameChanged, Edit&, void )
+    IMPL_LINK_NOARG( FieldLinkRow, OnFieldNameChanged, Edit&, void )
     {
         m_aLinkChangeHandler.Call( *this );
     }
@@ -658,19 +658,19 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnSuggest, Button*, void )
+    IMPL_LINK_NOARG( FormLinkDialog, OnSuggest, Button*, void )
     {
         initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns );
     }
 
 
-    IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void )
+    IMPL_LINK_NOARG( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void )
     {
         updateOkButton();
     }
 
 
-    IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnInitialize, void*, void )
+    IMPL_LINK_NOARG( FormLinkDialog, OnInitialize, void*, void )
     {
         initializeColumnLabels();
         initializeFieldLists();
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 215f02e7c9a3..867c16ab9fdb 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -84,9 +84,9 @@ namespace pcr
         virtual short   Execute() override;
 
     private:
-        DECL_LINK_TYPED( OnSuggest,    Button*, void );
-        DECL_LINK_TYPED( OnFieldChanged, FieldLinkRow&, void );
-        DECL_LINK_TYPED( OnInitialize, void*, void);
+        DECL_LINK( OnSuggest,    Button*, void );
+        DECL_LINK( OnFieldChanged, FieldLinkRow&, void );
+        DECL_LINK( OnInitialize, void*, void);
 
         void        updateOkButton();
         void        initializeFieldLists();
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index f2905002eea7..0fae03df4f7d 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -77,7 +77,7 @@ namespace pcr
         ModalDialog::dispose();
     }
 
-    IMPL_LINK_NOARG_TYPED( NewDataTypeDialog, OnNameModified, Edit&, void )
+    IMPL_LINK_NOARG( NewDataTypeDialog, OnNameModified, Edit&, void )
     {
         OUString sCurrentName = GetName();
         bool bNameIsOK = ( !sCurrentName.isEmpty() )
diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx
index 94fd4e8b396b..e45a8a4a1e1b 100644
--- a/extensions/source/propctrlr/newdatatype.hxx
+++ b/extensions/source/propctrlr/newdatatype.hxx
@@ -49,7 +49,7 @@ namespace pcr
         OUString GetName() const { return m_pName->GetText(); }
 
     private:
-        DECL_LINK_TYPED( OnNameModified, Edit&, void );
+        DECL_LINK( OnNameModified, Edit&, void );
     };
 
 
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index eda77ceda855..23cf9720d5d5 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -637,7 +637,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED(OPropertyBrowserController, OnPageActivation, LinkParamNone*, void)
+    IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation, LinkParamNone*, void)
     {
         updateViewDataFromActivePage();
     }
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index e7e289a59941..b771e67471f7 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -384,7 +384,7 @@ namespace pcr
         void    impl_startOrStopModelListening_nothrow( bool _bDoListen ) const;
 
     private:
-        DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void);
+        DECL_LINK(OnPageActivation, LinkParamNone*, void);
 
     private:
         // constructors
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 128ffa20fabb..76013a7771e1 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -505,13 +505,13 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageActivate, TabControl*, void)
+    IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate, TabControl*, void)
     {
         m_aPageActivationHandler.Call(nullptr);
     }
 
 
-    IMPL_LINK_NOARG_TYPED(OPropertyEditor, OnPageDeactivate, TabControl *, bool)
+    IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate, TabControl *, bool)
     {
         // commit the data on the current (to-be-deactivated) tab page
         // (79404)
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index e5cba4ecb2f8..03be07a963b7 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -135,8 +135,8 @@ namespace pcr
         void    setHelpLineLimits( OBrowserPage& _rPage, const void* );
 
     protected:
-        DECL_LINK_TYPED(OnPageDeactivate, TabControl*, bool);
-        DECL_LINK_TYPED(OnPageActivate, TabControl*, void);
+        DECL_LINK(OnPageDeactivate, TabControl*, bool);
+        DECL_LINK(OnPageActivate, TabControl*, void);
     };
 
 
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 35eac6e12d1a..2310a7d13f2b 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -240,7 +240,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_TYPED(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void)
+    IMPL_LINK(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void)
     {
         DBG_ASSERT(pLB == m_pControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?");
         (void)pLB;
@@ -256,7 +256,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_TYPED(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void)
+    IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void)
     {
         DBG_ASSERT(pButton == m_pNoAssignment, "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?");
         (void)pButton;
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 3cdfee4927f8..b16c19bf4509 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -64,8 +64,8 @@ namespace pcr
     protected:
         sal_Int32 InsertEntries(const css::uno::Reference< css::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry);
 
-        DECL_LINK_TYPED(OnEntrySelected, SvTreeListBox*, void);
-        DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void);
+        DECL_LINK(OnEntrySelected, SvTreeListBox*, void);
+        DECL_LINK(OnNoAssignmentClicked, Button*, void);
     };
 
 
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index ce0f6ecdc850..ca2412f9dbad 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -459,7 +459,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( OHyperlinkControl, OnHyperlinkClicked, void*, void )
+    IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked, void*, void )
     {
         ActionEvent aEvent( *this, OUString( "clicked" ) );
         m_aActionListeners.forEach< XActionListener >(
@@ -941,7 +941,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( OComboboxControl, OnEntrySelected, ComboBox&, void )
+    IMPL_LINK_NOARG( OComboboxControl, OnEntrySelected, ComboBox&, void )
     {
         if ( !getTypedControlWindow()->IsTravelSelect() )
             // fire a commit
@@ -1299,7 +1299,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( DropDownEditControl, ReturnHdl, FloatingWindow*, void)
+    IMPL_LINK_NOARG( DropDownEditControl, ReturnHdl, FloatingWindow*, void)
     {
         OUString aStr = m_pFloatingEdit->getEdit().GetText();
         OUString aStr2 = GetText();
@@ -1313,7 +1313,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( DropDownEditControl, DropDownHdl, Button*, void )
+    IMPL_LINK_NOARG( DropDownEditControl, DropDownHdl, Button*, void )
     {
         ShowDropDown(!m_bDropdown);
     }
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index 5da40afbb358..ab026d6e2ec4 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -62,7 +62,7 @@ namespace pcr
 
         void SetModifyHdl( const Link<ListBox&,void>& _rLink ) { aModifyHdl = _rLink;; }
     private:
-        DECL_LINK_TYPED(OnSelect, ListBox&, void);
+        DECL_LINK(OnSelect, ListBox&, void);
         Link<ListBox&,void> aModifyHdl;
     };
 
@@ -196,7 +196,7 @@ namespace pcr
         virtual void SAL_CALL disposing() override;
 
     protected:
-        DECL_LINK_TYPED( OnHyperlinkClicked, void*, void );
+        DECL_LINK( OnHyperlinkClicked, void*, void );
     };
 
 
@@ -335,7 +335,7 @@ namespace pcr
         virtual css::uno::Sequence< OUString > SAL_CALL getListEntries(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     protected:
-        DECL_LINK_TYPED( OnEntrySelected, ComboBox&, void );
+        DECL_LINK( OnEntrySelected, ComboBox&, void );
     };
 
 
@@ -387,8 +387,8 @@ namespace pcr
         long            FindPos(long nSinglePos);
 
     private:
-        DECL_LINK_TYPED( ReturnHdl, FloatingWindow*, void );
-        DECL_LINK_TYPED( DropDownHdl, Button*, void );
+        DECL_LINK( ReturnHdl, FloatingWindow*, void );
+        DECL_LINK( DropDownHdl, Button*, void );
 
         void ShowDropDown( bool bShow );
     };
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 0880464a2616..225c74629556 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -224,19 +224,19 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveUpClickHdl, Button*, void )
+    IMPL_LINK_NOARG( TabOrderDialog, MoveUpClickHdl, Button*, void )
     {
         m_pLB_Controls->MoveSelection( -1 );
     }
 
 
-    IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveDownClickHdl, Button*, void )
+    IMPL_LINK_NOARG( TabOrderDialog, MoveDownClickHdl, Button*, void )
     {
         m_pLB_Controls->MoveSelection( 1 );
     }
 
 
-    IMPL_LINK_NOARG_TYPED( TabOrderDialog, AutoOrderClickHdl, Button*, void )
+    IMPL_LINK_NOARG( TabOrderDialog, AutoOrderClickHdl, Button*, void )
     {
         try
         {
@@ -258,7 +258,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( TabOrderDialog, OKClickHdl, Button*, void )
+    IMPL_LINK_NOARG( TabOrderDialog, OKClickHdl, Button*, void )
     {
         sal_uLong nEntryCount = m_pLB_Controls->GetEntryCount();
         Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount );
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index cd6963a609c2..4e351568b4eb 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -81,10 +81,10 @@ namespace pcr
 
         ImageList*                  pImageList;
 
-        DECL_LINK_TYPED( MoveUpClickHdl, Button*, void );
-        DECL_LINK_TYPED( MoveDownClickHdl, Button*, void );
-        DECL_LINK_TYPED( AutoOrderClickHdl, Button*, void );
-        DECL_LINK_TYPED( OKClickHdl, Button*, void );
+        DECL_LINK( MoveUpClickHdl, Button*, void );
+        DECL_LINK( MoveDownClickHdl, Button*, void );
+        DECL_LINK( AutoOrderClickHdl, Button*, void );
+        DECL_LINK( OKClickHdl, Button*, void );
 
         void FillList();
         Image GetImage(
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index e18281d78768..7c9e2f277f78 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -330,7 +330,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG_TYPED( OTimeDurationControl, OnCustomConvert, MetricFormatter&, void )
+    IMPL_LINK_NOARG( OTimeDurationControl, OnCustomConvert, MetricFormatter&, void )
     {
         long nMultiplier = 1;
         if ( getTypedControlWindow()->GetCurUnitText().equalsIgnoreAsciiCase( "ms" ) )
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index 973e99e926c7..d45876434c68 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -152,7 +152,7 @@ namespace pcr
         ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) override;
 
     private:
-        DECL_LINK_TYPED( OnCustomConvert, MetricFormatter&, void );
+        DECL_LINK( OnCustomConvert, MetricFormatter&, void );
     };