summaryrefslogtreecommitdiff
path: root/forms/source/component
diff options
context:
space:
mode:
Diffstat (limited to 'forms/source/component')
-rw-r--r--forms/source/component/Button.cxx2
-rw-r--r--forms/source/component/Button.hxx2
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/component/DatabaseForm.hxx2
-rw-r--r--forms/source/component/Edit.cxx2
-rw-r--r--forms/source/component/Edit.hxx2
-rw-r--r--forms/source/component/FormattedField.cxx2
-rw-r--r--forms/source/component/FormattedField.hxx2
-rw-r--r--forms/source/component/ImageControl.cxx2
-rw-r--r--forms/source/component/ImageControl.hxx2
-rw-r--r--forms/source/component/ListBox.cxx2
-rw-r--r--forms/source/component/ListBox.hxx2
-rw-r--r--forms/source/component/clickableimage.cxx4
-rw-r--r--forms/source/component/clickableimage.hxx4
14 files changed, 16 insertions, 16 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 603bf3aaf740..45f22e9c0244 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -424,7 +424,7 @@ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( css:
}
-IMPL_LINK_NOARG_TYPED(OButtonControl, OnClick, void*, void)
+IMPL_LINK_NOARG(OButtonControl, OnClick, void*, void)
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
m_nClickEvent = nullptr;
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index c3d088f17939..bea42b75c2f7 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -181,7 +181,7 @@ protected:
virtual void actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& _rEvt ) override;
private:
- DECL_LINK_TYPED( OnClick, void*, void );
+ DECL_LINK( OnClick, void*, void );
/// to be called whenever the feature URL represented by our model has potentially changed
void modelFeatureUrlPotentiallyChanged( );
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 6954b5fe1954..bd078be729c1 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2619,7 +2619,7 @@ void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( Runt
}
-IMPL_LINK_NOARG_TYPED(ODatabaseForm, OnTimeout, Timer *, void)
+IMPL_LINK_NOARG(ODatabaseForm, OnTimeout, Timer *, void)
{
reload_impl(true);
}
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index e76fc51352a5..85cfe2147b63 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -529,7 +529,7 @@ private:
void impl_construct();
- DECL_LINK_TYPED( OnTimeout, Timer*, void );
+ DECL_LINK( OnTimeout, Timer*, void );
protected:
using OPropertySetHelper::getPropertyValues;
};
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 42e9f38ae2f1..e3dffb1ff966 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -247,7 +247,7 @@ void OEditControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno
}
-IMPL_LINK_NOARG_TYPED(OEditControl, OnKeyPressed, void*, void)
+IMPL_LINK_NOARG(OEditControl, OnKeyPressed, void*, void)
{
m_nKeyEvent = nullptr;
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 6fca35367a47..a8286005e25c 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -168,7 +168,7 @@ public:
virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rxToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rxParent ) throw ( css::uno::RuntimeException, std::exception ) override;
private:
- DECL_LINK_TYPED( OnKeyPressed, void*, void );
+ DECL_LINK( OnKeyPressed, void*, void );
};
}
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 2686b7b32784..174964f35d56 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -234,7 +234,7 @@ void OFormattedControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css
{
}
-IMPL_LINK_NOARG_TYPED(OFormattedControl, OnKeyPressed, void*, void)
+IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed, void*, void)
{
m_nKeyEvent = nullptr;
Reference<XFormComponent> xFComp(getModel(), UNO_QUERY);
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 75399df9be49..beb5e702bbfa 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -178,7 +178,7 @@ class OFormattedModel
using OBoundControl::disposing;
private:
- DECL_LINK_TYPED( OnKeyPressed, void*, void );
+ DECL_LINK( OnKeyPressed, void*, void );
};
}
#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 7b6c7158f921..b5022a8548c9 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -657,7 +657,7 @@ void SAL_CALL OImageControlModel::startProduction( ) throw (RuntimeException, s
}
-IMPL_LINK_TYPED( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic, void )
+IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic, void )
{
const Reference< XGraphic > xGraphic( i_pGraphic != nullptr ? Image( i_pGraphic->GetBitmapEx() ).GetXGraphic() : nullptr );
m_bExternalGraphic = false;
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 60a9a3310bc9..e7bc6bbfd987 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -136,7 +136,7 @@ protected:
*/
bool impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator );
- DECL_LINK_TYPED( OnImageImportDone, ::Graphic*, void );
+ DECL_LINK( OnImageImportDone, ::Graphic*, void );
};
typedef ::cppu::ImplHelper2 < css::awt::XMouseListener
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 9d54a9b501c7..21fcc0d9f367 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1976,7 +1976,7 @@ namespace frm
}
- IMPL_LINK_NOARG_TYPED(OListBoxControl, OnTimeout, Idle*, void)
+ IMPL_LINK_NOARG(OListBoxControl, OnTimeout, Idle*, void)
{
m_aChangeListeners.notifyEach( &XChangeListener::changed, EventObject( *this ) );
}
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 2da96b921108..0df57d608356 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -329,7 +329,7 @@ protected:
virtual void processEvent( const ::comphelper::AnyEvent& _rEvent ) override;
private:
- DECL_LINK_TYPED( OnTimeout, Idle*, void );
+ DECL_LINK( OnTimeout, Idle*, void );
};
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index f384978aaebe..b736520e79e3 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -819,7 +819,7 @@ namespace frm
}
- IMPL_LINK_NOARG_TYPED( OClickableImageBaseModel, DownloadDoneLink, void*, void )
+ IMPL_LINK_NOARG( OClickableImageBaseModel, DownloadDoneLink, void*, void )
{
::osl::MutexGuard aGuard( m_aMutex );
DownloadDone();
@@ -848,7 +848,7 @@ namespace frm
}
}
- IMPL_LINK_TYPED( OClickableImageBaseModel, OnImageImportDone, Graphic*, i_pGraphic, void )
+ IMPL_LINK( OClickableImageBaseModel, OnImageImportDone, Graphic*, i_pGraphic, void )
{
const Reference< XGraphic > xGraphic( i_pGraphic != nullptr ? Graphic(i_pGraphic->GetBitmapEx()).GetXGraphic() : nullptr );
if ( !xGraphic.is() )
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 4a9b6880f6ff..ba0d752a8a57 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -77,7 +77,7 @@ namespace frm
css::uno::Reference< css::form::submission::XSubmission >
m_xSubmissionDelegate;
- DECL_LINK_TYPED( DownloadDoneLink, void*, void );
+ DECL_LINK( DownloadDoneLink, void*, void );
inline ImageProducer* GetImageProducer() { return m_pProducer; }
@@ -153,7 +153,7 @@ namespace frm
// to be called from within the cloning-ctor of your derived class
void implInitializeImageURL( );
- DECL_LINK_TYPED( OnImageImportDone, ::Graphic*, void );
+ DECL_LINK( OnImageImportDone, ::Graphic*, void );
};
class ImageModelMethodGuard : public ::osl::MutexGuard