summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx2
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.hxx6
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx3
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx2
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx4
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx2
-rw-r--r--dbaccess/source/ui/inc/marktree.hxx4
7 files changed, 11 insertions, 12 deletions
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 0c871d7edd6c..9d965437b4c5 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -125,7 +125,7 @@ namespace dbaui
};
// MySQLNativeSettings
- MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink )
+ MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink )
:TabPage( &_rParent, "MysqlNativeSettings", "dbaccess/ui/mysqlnativesettings.ui" ),
m_aControlModificationLink(_rControlModificationLink)
{
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index 807ac514fcde..ea7728ba652c 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -47,14 +47,14 @@ namespace dbaui
VclPtr<FixedText> m_pDefaultPort;
VclPtr<Edit> m_pSocket;
VclPtr<Edit> m_pNamedPipe;
- Link<> m_aControlModificationLink;
+ Link<void*,void> m_aControlModificationLink;
::svt::ControlDependencyManager
- m_aControlDependencies;
+ m_aControlDependencies;
DECL_LINK_TYPED(RadioToggleHdl, RadioButton&, void);
DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
public:
- MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink );
+ MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink );
virtual ~MySQLNativeSettings();
virtual void dispose() override;
void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index a9a6949cf021..f5c23bdeb67a 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -102,10 +102,9 @@ namespace dbaui
_rReadonly = !_rValid || (pReadonly && pReadonly->GetValue());
}
- IMPL_LINK(OGenericAdministrationPage, OnControlModified, void*, pCtrl)
+ IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModified, void*, pCtrl, void)
{
callModifiedHdl(pCtrl);
- return 0;
}
IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void)
{
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 7b2585f140b4..5f32265b6489 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -206,7 +206,7 @@ namespace dbaui
/** This link be used for controls where the tabpage does not need to take any special action when the control
is modified. The implementation just calls callModifiedHdl.
*/
- DECL_LINK(OnControlModified, void*);
+ DECL_LINK_TYPED(OnControlModified, void*, void);
DECL_LINK_TYPED(OnControlEditModifyHdl, Edit&, void);
DECL_LINK_TYPED(OnControlModifiedClick, Button*, void);
DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void);
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 1c2ab8c04af0..69a6d7714647 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -402,9 +402,9 @@ namespace dbaui
{
callModifiedHdl();
}
- IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl )
+ IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryChecked, void*, _pControl, void )
{
- return OnControlModified(static_cast<Button*>(_pControl));
+ OnControlModified(_pControl);
}
IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 )
{
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 609967b7ff27..6e1acc955d93 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -65,7 +65,7 @@ namespace dbaui
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override;
DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 );
- DECL_LINK( OnTreeEntryChecked, Control* );
+ DECL_LINK_TYPED( OnTreeEntryChecked, void*, void );
DECL_LINK_TYPED( OnTreeEntryButtonChecked, SvTreeListBox*, void );
private:
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index 08b1886acb8e..17ef28b6199c 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -35,7 +35,7 @@ namespace dbaui
class OMarkableTreeListBox : public DBTreeListBox
{
SvLBoxButtonData* m_pCheckButton;
- Link<> m_aCheckButtonHandler;
+ Link<void*,void> m_aCheckButtonHandler;
public:
OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 );
@@ -47,7 +47,7 @@ public:
void CheckButtons(); // make the button states consistent (bottom-up)
/// the handler given is called whenever the check state of one or more items changed
- void SetCheckHandler(const Link<>& _rHdl) { m_aCheckButtonHandler = _rHdl; }
+ void SetCheckHandler(const Link<void*,void>& _rHdl) { m_aCheckButtonHandler = _rHdl; }
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) override;