summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-20 13:12:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-12-20 13:12:34 +0000
commitd0572a171ef8841fd1af9e67d82e5ca3e603bf19 (patch)
treedc1eca6c9822ea077e4f5faa4de9f3cefd5c78fd /cui
parent4645a24805fb69c75c69547babd498ec913e61a0 (diff)
SelectHdl_Impl doesn't need to be an [IMPL|DECL]Link now
Diffstat (limited to 'cui')
-rw-r--r--cui/source/inc/treeopt.hxx2
-rw-r--r--cui/source/options/treeopt.cxx18
2 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 91a207115e12..a107750bbc30 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -208,7 +208,7 @@ protected:
DECL_LINK(BackHdl_Impl, PushButton* );
DECL_LINK( OKHdl_Impl, Button * );
DECL_LINK( HintHdl_Impl, Timer * );
- DECL_LINK( SelectHdl_Impl, Timer * );
+ void SelectHdl_Impl();
virtual long Notify( NotifyEvent& rNEvt );
virtual short Execute();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b790ffaeccaa..6e71ed025318 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -637,7 +637,7 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName,
IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG)
{
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl();
return 0;
}
@@ -932,14 +932,14 @@ long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
// --------------------------------------------------------------------
-IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
+void OfaTreeOptionsDialog::SelectHdl_Impl()
{
SvTreeListBox* pBox = &aTreeLB;
if(pCurrentPageEntry == pBox->GetCurEntry())
{
pBox->EndSelection();
- return 0;
+ return;
}
SvLBoxEntry* pEntry = pBox->GetCurEntry();
@@ -954,7 +954,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
if(!pGroupInfo)
- return 0;
+ return;
switch(pGroupInfo->m_nDialogId)
{
@@ -999,7 +999,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
break;
}
- return 0;
+ return;
}
pBox->EndSelection();
@@ -1021,7 +1021,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
{
// we cannot leave this page
pBox->Select( pCurrentPageEntry );
- return 0;
+ return;
}
else
pOptPageInfo->m_pPage->Hide();
@@ -1046,7 +1046,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
if(!pPageInfo->m_pPage && pPageInfo->m_nPageId > 0)
{
if(pGroupInfo->m_bLoadError)
- return 0;
+ return;
if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId )
{
if(!pColorPageItemSet)
@@ -1072,7 +1072,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
{
pGroupInfo->m_bLoadError = sal_True;
InfoBox(pBox, sNotLoadedError).Execute();
- return 0;
+ return;
}
if(bIdentical)
pGroupInfo->m_pShell = pGroupInfo->m_pModule;
@@ -1214,7 +1214,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
// then set the focus to the new page or if we are on a group set the focus to the options treebox
pNewPage ? pNewPage->GrabFocus() : pBox->GrabFocus();
- return 0;
+ return;
}
OfaPageResource::OfaPageResource() :