summaryrefslogtreecommitdiff
path: root/extensions/source/abpilot
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx6
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx4
-rw-r--r--extensions/source/abpilot/abspilot.cxx6
-rw-r--r--extensions/source/abpilot/abspilot.hxx2
-rw-r--r--extensions/source/abpilot/admininvokationpage.cxx4
-rw-r--r--extensions/source/abpilot/admininvokationpage.hxx2
-rw-r--r--extensions/source/abpilot/fieldmappingpage.cxx4
-rw-r--r--extensions/source/abpilot/fieldmappingpage.hxx2
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx5
-rw-r--r--extensions/source/abpilot/typeselectionpage.hxx2
10 files changed, 14 insertions, 23 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 6c85546e8b5d..3226768e847a 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -218,22 +218,20 @@ namespace abp
}
- IMPL_LINK_NOARG(FinalPage, OnRegister)
+ IMPL_LINK_NOARG_TYPED(FinalPage, OnRegister, Button*, void)
{
bool bEnable = m_pRegisterName->IsChecked();
m_pNameLabel->Enable(bEnable);
m_pName->Enable(bEnable);
implCheckName();
- return 0L;
}
- IMPL_LINK_NOARG(FinalPage, OnEmbed)
+ IMPL_LINK_NOARG_TYPED(FinalPage, OnEmbed, Button*, void)
{
bool bEmbed = m_pEmbed->IsChecked();
m_pLocationLabel->Enable(!bEmbed);
m_pLocation->Enable(!bEmbed);
m_pBrowse->Enable(!bEmbed);
- return 0L;
}
} // namespace abp
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index ceb1d0b66353..1a876545a814 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -68,8 +68,8 @@ namespace abp
private:
DECL_LINK( OnNameModified, Edit* );
- DECL_LINK(OnRegister, void *);
- DECL_LINK(OnEmbed, void *);
+ DECL_LINK_TYPED(OnRegister, Button*, void);
+ DECL_LINK_TYPED(OnEmbed, Button*, void);
bool isValidName() const;
void implCheckName();
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 1ef0ebe0331c..7254eb8f8505 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -179,17 +179,15 @@ namespace abp
}
- IMPL_LINK_NOARG( OAddessBookSourcePilot, OnCancelClicked )
+ IMPL_LINK_NOARG_TYPED( OAddessBookSourcePilot, OnCancelClicked, Button*, void )
{
// do cleanups
implCleanup();
// reset the click hdl
- m_pCancel->SetClickHdl( Link<>() );
+ m_pCancel->SetClickHdl( Link<Button*, void>() );
// simulate the click again - this time, the default handling of the button will strike ....
m_pCancel->Click();
-
- return 0L;
}
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 28deb987b8de..93ed19897841 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -74,7 +74,7 @@ namespace abp
virtual bool Close() SAL_OVERRIDE;
private:
- DECL_LINK( OnCancelClicked, void* );
+ DECL_LINK_TYPED( OnCancelClicked, Button*, void );
/** creates a new data source of the type indicated by m_aSettings
<p>If another data source has been created before, this one is deleted.</p>
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index 39c0bde0f6e8..b89c33123574 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -82,7 +82,7 @@ namespace abp
return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected();
}
- IMPL_LINK_NOARG( AdminDialogInvokationPage, OnInvokeAdminDialog )
+ IMPL_LINK_NOARG_TYPED( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void )
{
OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() );
if ( aInvokation.invokeAdministration( AST_LDAP == getSettings().eType ) )
@@ -90,8 +90,6 @@ namespace abp
// try to connect to this data source
implTryConnect();
}
-
- return 0L;
}
} // namespace abp
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 39d255d4ed78..36153d07f94a 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -46,7 +46,7 @@ namespace abp
virtual bool canAdvance() const SAL_OVERRIDE;
private:
- DECL_LINK( OnInvokeAdminDialog, void* );
+ DECL_LINK_TYPED( OnInvokeAdminDialog, Button*, void );
void implTryConnect();
void implUpdateErrorMessage();
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 515c4f4a464d..64180983d3b8 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -78,7 +78,7 @@ namespace abp
}
- IMPL_LINK_NOARG( FieldMappingPage, OnInvokeDialog )
+ IMPL_LINK_NOARG_TYPED( FieldMappingPage, OnInvokeDialog, Button*, void )
{
AddressSettings& rSettings = getSettings();
@@ -90,8 +90,6 @@ namespace abp
else
implUpdateHint();
}
-
- return 0L;
}
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index 9a4c81a2b7dd..5244ddb9d62d 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -46,7 +46,7 @@ namespace abp
virtual void DeactivatePage() SAL_OVERRIDE;
private:
- DECL_LINK( OnInvokeDialog, void* );
+ DECL_LINK_TYPED( OnInvokeDialog, Button*, void );
void implUpdateHint();
};
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 90bdf31a0ce7..bf2e9b2e02ea 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -133,7 +133,7 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( m_pOE, AST_OE, bWithMozilla ) );
m_aAllTypes.push_back( ButtonItem( m_pOther, AST_OTHER, true ) );
- Link<> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+ Link<Button*,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
loop != m_aAllTypes.end(); ++loop )
{
@@ -262,11 +262,10 @@ namespace abp
}
- IMPL_LINK_NOARG( TypeSelectionPage, OnTypeSelected )
+ IMPL_LINK_NOARG_TYPED( TypeSelectionPage, OnTypeSelected, Button*, void )
{
getDialog()->typeSelectionChanged( getSelectedType() );
updateDialogTravelUI();
- return 0L;
}
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index b5d4dad096cb..d5f13a880aed 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -81,7 +81,7 @@ namespace abp
virtual bool canAdvance() const SAL_OVERRIDE;
private:
- DECL_LINK( OnTypeSelected, void* );
+ DECL_LINK_TYPED( OnTypeSelected, Button*, void );
void selectType( AddressSourceType _eType );
};
generated by cgit (git 2.34.1) at 2024-07-11 19:48:58 +0000