ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

convert Link<> to typed

Browse Source 
Change-Id: I85658fa35b9b85106a3b9c8ef303584cad6f39b0
This commit is contained in:
Noel Grandin
2015-09-11 08:48:54 +02:00
parent e8ee847336
commit cf0c04a428
78 changed files with 170 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basctl/source/basicide/macrodlg.cxx
+3 -3
View File
@@ -468,18 +468,18 @@ void MacroChooser::CheckButtons()
IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl)
IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool)
{
StoreMacroDescription();
if (nMode == Recording)
{
SbMethod* pMethod = GetMacro();
if ( pMethod && !QueryReplaceMacro( pMethod->GetName(), this ) )
return 0;
return false;
}
EndDialog(Macro_OkRun);
return 0;
return false;
}
IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
basctl/source/basicide/macrodlg.hxx
+1 -1
View File
@@ -68,7 +68,7 @@ private:
Mode nMode;
DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void );
DECL_LINK(MacroDoubleClickHdl, void *);
DECL_LINK_TYPED( MacroDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void );
DECL_LINK( EditModifyHdl, Edit * );
DECL_LINK_TYPED( ButtonHdl, Button *, void );
cui/source/customize/macropg.cxx
+1 -1
View File
@@ -593,7 +593,7 @@ IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void )
GenericHandler_Impl( this, static_cast<PushButton*>(pBtn) );
}
IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, )
IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool)
{
return GenericHandler_Impl( this, NULL );
}
cui/source/customize/selector.cxx
+2 -3
View File
@@ -949,12 +949,11 @@ IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void
UpdateUI();
}
IMPL_LINK( SvxScriptSelectorDialog, FunctionDoubleClickHdl, Control*, pCtrl )
IMPL_LINK_NOARG_TYPED( SvxScriptSelectorDialog, FunctionDoubleClickHdl, SvTreeListBox*, bool )
{
(void)pCtrl;
if (m_pOKButton->IsEnabled())
ClickHdl(m_pOKButton);
return 0;
return false;
}
// Check if command is selected and enable the OK button accordingly
cui/source/dialogs/hlmarkwn.cxx
+2 -2
View File
@@ -561,10 +561,10 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark)
|*
|************************************************************************/
IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl)
IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, SvTreeListBox*, bool)
{
ClickApplyHdl_Impl(NULL);
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void)
cui/source/dialogs/linkdlg.cxx
+2 -4
View File
@@ -247,12 +247,10 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox,
}
}
IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, LinksDoubleClickHdl, SvTreeListBox *, bool )
{
(void)pSvTabListBox;
ChangeSourceClickHdl( 0 );
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void )
cui/source/dialogs/thesdlg.cxx
+2 -2
View File
@@ -412,7 +412,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *
}
}
IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox )
IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool )
{
SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
if (pEntry)
@@ -433,7 +433,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox
//! workaround to set the selection since calling SelectEntryPos within
//! the double click handler does not work
Application::PostUserEvent( LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox, true );
return 0;
return false;
}
IMPL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void )
cui/source/inc/autocdlg.hxx
+1 -1
View File
@@ -162,7 +162,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(EditHdl, Button*, void);
DECL_LINK(DoubleClickEditHdl, void*);
DECL_LINK_TYPED(DoubleClickEditHdl, SvTreeListBox*, bool);
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
cui/source/inc/dbregister.hxx
+2 -2
View File
@@ -55,9 +55,9 @@ namespace svx
DECL_LINK_TYPED( NewHdl, Button*, void );
DECL_LINK_TYPED( EditHdl, Button*, void );
DECL_LINK_TYPED( DeleteHdl, Button*, void );
DECL_LINK(PathBoxDoubleClickHdl, void *);
DECL_LINK_TYPED( PathBoxDoubleClickHdl, SvTreeListBox*, bool);
DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void);
DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void);
DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void );
DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void );
cui/source/inc/hlmarkwn.hxx
+3 -3
View File
@@ -86,9 +86,9 @@ protected:
virtual void Move () SAL_OVERRIDE;
DECL_LINK_TYPED (ClickApplyHdl_Impl, Button*, void );
DECL_LINK (DoubleClickApplyHdl_Impl, void* );
DECL_LINK_TYPED (ClickCloseHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickApplyHdl_Impl, Button*, void );
DECL_LINK_TYPED( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool );
DECL_LINK_TYPED( ClickCloseHdl_Impl, Button*, void );
public:
SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent);
cui/source/inc/linkdlg.hxx
+2 -2
View File
@@ -65,10 +65,10 @@ class SvBaseLinksDlg : public ModalDialog
Idle aUpdateIdle;
DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void );
DECL_LINK( LinksDoubleClickHdl, SvTabListBox * );
DECL_LINK_TYPED( LinksDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( AutomaticClickHdl, Button *, void );
DECL_LINK_TYPED( ManualClickHdl, Button *, void );
DECL_LINK_TYPED(UpdateNowClickHdl, Button *, void);
DECL_LINK_TYPED( UpdateNowClickHdl, Button *, void);
DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void );
DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void );
DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void );
cui/source/inc/macroass.hxx
+2 -2
View File
@@ -39,9 +39,9 @@ class _SfxMacroTabPage : public SfxTabPage
DECL_DLLPRIVATE_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void );
DECL_DLLPRIVATE_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void );
DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * );
DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteHdl_Impl, SvTreeListBox*, bool );
DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void );
bool AssignDeleteHdl(Control *);
DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void );
protected:
cui/source/inc/macropg.hxx
+1 -1
View File
@@ -61,7 +61,7 @@ class _SvxMacroTabPage : public SfxTabPage
{
DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void );
DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * );
DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool );
static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn );
cui/source/inc/numfmt.hxx
+2 -2
View File
@@ -152,7 +152,7 @@ private:
bool Click_Impl(PushButton* pIB);
// Handler
DECL_LINK( LostFocusHdl_Impl, Edit* );
DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* );
DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool );
DECL_LINK( SelFormatHdl_Impl, void * );
DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void );
@@ -160,7 +160,7 @@ private:
DECL_LINK( EditHdl_Impl, Edit* );
DECL_LINK( OptHdl_Impl, void * );
DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void );
DECL_LINK_TYPED(TimeHdl_Impl, Timer *, void);
DECL_LINK_TYPED( TimeHdl_Impl, Timer *, void);
};
#endif
cui/source/inc/optlingu.hxx
+1 -1
View File
@@ -139,7 +139,7 @@ private:
DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( ClickHdl_Impl, Button *, void );
DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * );
DECL_LINK_TYPED( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool );
DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void);
DECL_LINK( OpenURLHdl_Impl, void *);
cui/source/inc/optpath.hxx
+2 -2
View File
@@ -54,10 +54,10 @@ private:
void ChangeCurrentEntry( const OUString& _rFolder );
DECL_LINK_TYPED( PathHdl_Impl, Button*, void);
DECL_LINK(DoubleClickPathHdl_Impl, void *);
DECL_LINK_TYPED( DoubleClickPathHdl_Impl, SvTreeListBox*, bool);
DECL_LINK_TYPED( StandardHdl_Impl, Button*, void);
DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void);
DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void);
DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void );
DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void );
cui/source/inc/selector.hxx
+1 -1
View File
@@ -186,7 +186,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
DECL_LINK_TYPED( ClickHdl, Button *, void );
DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void );
DECL_LINK( FunctionDoubleClickHdl, Control* );
DECL_LINK_TYPED( FunctionDoubleClickHdl, SvTreeListBox*, bool );
void UpdateUI();
cui/source/inc/thesdlg.hxx
+1 -1
View File
@@ -147,7 +147,7 @@ public:
DECL_LINK( LanguageHdl_Impl, ListBox * );
DECL_LINK( WordSelectHdl_Impl, ComboBox * );
DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void );
DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * );
DECL_LINK_TYPED( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool );
DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void );
cui/source/options/dbregister.cxx
+2 -2
View File
@@ -290,10 +290,10 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void)
openLinkDialog(sNewName,sNewLocation);
}
IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl)
IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, SvTreeListBox*, bool)
{
EditHdl(NULL);
return 0;
return false;
}
cui/source/options/optaboutconfig.cxx
+2 -2
View File
@@ -575,10 +575,10 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void )
Reset();
}
IMPL_LINK_NOARG( CuiAboutConfigTabPage, DoubleClickHdl_Impl )
IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool )
{
StandardHdl_Impl(NULL);
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
cui/source/options/optaboutconfig.hxx
+1 -1
View File
@@ -62,7 +62,7 @@ private:
void InsertEntry( SvTreeListEntry *pEntry);
DECL_LINK_TYPED( StandardHdl_Impl, Button*, void );
DECL_LINK( DoubleClickHdl_Impl, void* );
DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool );
DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void );
DECL_LINK_TYPED( SearchHdl_Impl, Button*, void );
DECL_LINK_TYPED( ExpandingHdl_Impl, SvTreeListBox*, bool );
cui/source/options/optlingu.cxx
+2 -2
View File
@@ -1515,7 +1515,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet )
IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox )
IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool )
{
if (pBox == m_pLinguModulesCLB)
{
@@ -1529,7 +1529,7 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox )
{
ClickHdl_Impl(m_pLinguOptionsEditPB);
}
return 0;
return false;
}
cui/source/options/optpath.cxx
+2 -2
View File
@@ -523,10 +523,10 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl)
IMPL_LINK_NOARG_TYPED(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool)
{
PathHdl_Impl(NULL);
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void)
cui/source/tabpages/autocdlg.cxx
+2 -2
View File
@@ -722,10 +722,10 @@ IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void)
m_pEditPB->Enable(0 != pBox->FirstSelected()->GetUserData());
}
IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl)
IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool)
{
EditHdl(NULL);
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void)
cui/source/tabpages/macroass.cxx
+10 -5
View File
@@ -296,10 +296,15 @@ IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void)
IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void )
{
AssignDeleteHdl_Impl(static_cast<PushButton*>(pBtn));
AssignDeleteHdl(pBtn);
}
IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool )
{
return AssignDeleteHdl(pBtn);
}
bool _SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.FirstSelected();
@@ -308,7 +313,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) )
{
DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" );
return 0;
return false;
}
const bool bAssEnabled = pBtn != mpImpl->pDeletePB && mpImpl->pAssignPB->IsEnabled();
@@ -342,7 +347,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
rListBox.SetUpdateMode( true );
EnableButtons();
return 0;
return false;
}
IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*,, void )
@@ -367,7 +372,7 @@ void _SfxMacroTabPage::InitAndSetHandler()
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
Link<> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
Link<SvTreeListBox*,bool> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
mpImpl->pDeletePB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) );
mpImpl->pAssignPB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) );
cui/source/tabpages/numfmt.cxx
+2 -2
View File
@@ -1156,7 +1156,7 @@ void SvxNumberFormatTabPage::UpdateThousandEngineeringText()
#*
#************************************************************************/
IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pLb, bool )
{
if (pLb == m_pLbFormat)
{
@@ -1174,7 +1174,7 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
pOKButton->Click();
}
}
return 0;
return false;
}
dbaccess/source/ui/app/AppDetailPageHelper.cxx
+7 -3
View File
@@ -756,7 +756,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
_pTreeView->SetDefaultExpandedEntryBmp( _rImage );
_pTreeView->SetDoubleClickHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick));
_pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick));
_pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper, OnEntryEnterKey));
_pTreeView->SetSelChangeHdl(LINK(this, OAppDetailPageHelper, OnEntrySelChange));
_pTreeView->setCutHandler(LINK(this, OAppDetailPageHelper, OnCutEntry));
@@ -904,11 +904,15 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r
}
}
IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree)
IMPL_LINK(OAppDetailPageHelper, OnEntryEnterKey, void*, _pTree)
{
return OnEntryDoubleClick(static_cast<SvTreeListBox*>(_pTree)) ? 0 : 1;
}
IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool)
{
OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid callback!" );
bool bHandled = ( _pTree != NULL ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree );
return bHandled ? 1L : 0L;
return bHandled;
}
IMPL_LINK_NOARG(OAppDetailPageHelper, OnEntrySelChange)
dbaccess/source/ui/app/AppDetailPageHelper.hxx
+2 -1
View File
@@ -151,7 +151,8 @@ namespace dbaui
*/
DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image& _rImage);
DECL_LINK( OnEntryDoubleClick, SvTreeListBox* );
DECL_LINK_TYPED( OnEntryDoubleClick, SvTreeListBox*, bool );
DECL_LINK( OnEntryEnterKey, void* );
DECL_LINK( OnEntrySelChange, void* );
DECL_LINK( OnCutEntry, void* );
dbaccess/source/ui/control/dbtreelistbox.cxx
+1 -2
View File
@@ -400,9 +400,8 @@ bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewTe
bool DBTreeListBox::DoubleClickHdl()
{
long nResult = aDoubleClickHdl.Call( this );
// continue default processing if the DoubleClickHandler didn't handle it
return nResult == 0;
return aDoubleClickHdl.Call( this );
}
void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,bool _bUp)
dbaccess/source/ui/dlg/CollectionView.cxx
+2 -2
View File
@@ -236,7 +236,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void)
}
}
IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView)
IMPL_LINK_NOARG_TYPED(OCollectionView, Dbl_Click_FileView, SvTreeListBox*, bool)
{
try
{
@@ -264,7 +264,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView)
{
DBG_UNHANDLED_EXCEPTION();
}
return 0;
return false;
}
void OCollectionView::initCurrentPath()
dbaccess/source/ui/dlg/adtabdlg.cxx
+3 -3
View File
@@ -422,17 +422,17 @@ IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void )
TableListDoubleClickHdl(NULL);
}
IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl )
IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool )
{
if ( impl_isAddAllowed() )
{
impl_addTable();
if ( !impl_isAddAllowed() )
Close();
return 1L; // handled
return true; // handled
}
return 0L; // not handled
return false; // not handled
}
IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void )
dbaccess/source/ui/inc/CollectionView.hxx
+1 -1
View File
@@ -47,7 +47,7 @@ namespace dbaui
DECL_LINK_TYPED(Up_Click, Button*, void);
DECL_LINK_TYPED(NewFolder_Click, Button*, void);
DECL_LINK_TYPED(Save_Click, Button*, void);
DECL_LINK(Dbl_Click_FileView,void*);
DECL_LINK_TYPED(Dbl_Click_FileView, SvTreeListBox*, bool);
/// sets the fixedtext to the right content
void initCurrentPath();
dbaccess/source/ui/inc/TableWindowListBox.hxx
+1 -1
View File
@@ -47,7 +47,7 @@ namespace dbaui
:public SvTreeListBox
,public IDragTransferableListener
{
DECL_LINK( OnDoubleClick, SvTreeListBox* );
DECL_LINK_TYPED( OnDoubleClick, SvTreeListBox*, bool );
DECL_LINK_TYPED( ScrollUpHdl, Timer*, void );
DECL_LINK_TYPED( ScrollDownHdl, Timer*, void );
DECL_LINK_TYPED( DropHdl, void*, void );
dbaccess/source/ui/inc/adtabdlg.hxx
+1 -1
View File
@@ -72,7 +72,7 @@ namespace dbaui
DECL_LINK_TYPED( AddClickHdl, Button*, void );
DECL_LINK_TYPED( CloseClickHdl, Button*, void);
DECL_LINK( TableListDoubleClickHdl, void* );
DECL_LINK_TYPED( TableListDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( TableListSelectHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( OnTypeSelected, Button*, void );
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+2 -2
View File
@@ -342,7 +342,7 @@ void OTableWindowListBox::GetFocus()
SvTreeListBox::GetFocus();
}
IMPL_LINK( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, /*pBox*/ )
IMPL_LINK_NOARG_TYPED( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool )
{
// tell my parent
vcl::Window* pParent = Window::GetParent();
@@ -350,7 +350,7 @@ IMPL_LINK( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, /*pBox*/ )
static_cast<OTableWindow*>(pParent)->OnEntryDoubleClicked(GetHdlEntry());
return 0;
return false;
}
void OTableWindowListBox::Command(const CommandEvent& rEvt)
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+2 -2
View File
@@ -165,10 +165,10 @@ IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, SvTreeL
updateStates();
}
IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl)
IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, DoubleClickHdl_Impl, SvTreeListBox*, bool)
{
onEdit();
return 0;
return false;
}
short XMLFilterSettingsDialog::Execute()
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+1 -1
View File
@@ -93,7 +93,7 @@ public:
DECL_LINK_TYPED(ClickHdl_Impl, Button *, void );
DECL_LINK_TYPED(SelectionChangedHdl_Impl, SvTreeListBox*, void );
DECL_LINK(DoubleClickHdl_Impl, void * );
DECL_LINK_TYPED(DoubleClickHdl_Impl, SvTreeListBox*, bool );
virtual short Execute() SAL_OVERRIDE;
fpicker/source/office/PlacesListBox.cxx
+2 -2
View File
@@ -187,7 +187,7 @@ IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void )
mpDlg->RemovablePlaceSelected(false);
}
IMPL_LINK_NOARG( PlacesListBox, DoubleClick )
IMPL_LINK_NOARG_TYPED( PlacesListBox, DoubleClick, SvTreeListBox*, bool )
{
sal_uInt16 nSelected = mpImpl->GetCurrRow();
PlacePtr pPlace = maPlaces[nSelected];
@@ -212,7 +212,7 @@ IMPL_LINK_NOARG( PlacesListBox, DoubleClick )
break;
};
}
return 0;
return false;
}
void PlacesListBox::updateView( )
fpicker/source/office/PlacesListBox.hxx
+1 -1
View File
@@ -75,7 +75,7 @@ class PlacesListBox : public Control
Image getEntryIcon( PlacePtr pPlace );
DECL_LINK_TYPED( Selection, SvTreeListBox*, void );
DECL_LINK( DoubleClick, void* );
DECL_LINK_TYPED( DoubleClick, SvTreeListBox*, bool );
};
#endif
fpicker/source/office/RemoteFilesDialog.cxx
+2 -2
View File
@@ -916,7 +916,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton,
EnableControls();
}
IMPL_LINK_NOARG ( RemoteFilesDialog, DoubleClickHdl )
IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool )
{
if( m_pFileView->GetSelectionCount() )
{
@@ -940,7 +940,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, DoubleClickHdl )
}
}
return 1;
return true;
}
IMPL_LINK_NOARG ( RemoteFilesDialog, SelectHdl )
fpicker/source/office/RemoteFilesDialog.hxx
+1 -1
View File
@@ -189,7 +189,7 @@ private:
DECL_LINK ( SelectServiceHdl, void * );
DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void );
DECL_LINK( DoubleClickHdl, void * );
DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK( SelectHdl, void * );
DECL_LINK( FileNameGetFocusHdl, void * );
fpicker/source/office/iodlg.cxx
+2 -2
View File
@@ -1596,13 +1596,13 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl)
IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool)
{
_pImp->_bDoubleClick = true;
OpenHdl_Impl( NULL );
_pImp->_bDoubleClick = false;
return 0;
return false;
}
fpicker/source/office/iodlg.hxx
+3 -3
View File
@@ -121,12 +121,12 @@ private:
void AddControls_Impl( );
DECL_LINK( SelectHdl_Impl, SvTabListBox* );
DECL_LINK(DblClickHdl_Impl, void *);
DECL_LINK_TYPED( DblClickHdl_Impl, SvTreeListBox*, bool);
DECL_LINK(EntrySelectHdl_Impl, void *);
DECL_LINK( OpenDoneHdl_Impl, SvtFileView* );
DECL_LINK_TYPED(AutoExtensionHdl_Impl, Button*, void);
DECL_LINK_TYPED( AutoExtensionHdl_Impl, Button*, void);
DECL_LINK_TYPED( ClickHdl_Impl, Button*, void );
DECL_LINK_TYPED(PlayButtonHdl_Impl, Button*, void);
DECL_LINK_TYPED( PlayButtonHdl_Impl, Button*, void);
// removes a filter with wildcards from the path and returns it
include/svtools/fileview.hxx
+5 -4
View File
@@ -37,6 +37,7 @@ class SvtFileView_Impl;
class SvTreeListEntry;
class HeaderBar;
struct SvtContentEntry;
class SvTreeListBox;
/// the result of an action in the FileView
enum FileViewResult
@@ -158,12 +159,12 @@ public:
void SetNoSelection();
void SetSelectHdl( const Link<>& rHdl );
void SetDoubleClickHdl( const Link<>& rHdl );
void SetDoubleClickHdl( const Link<SvTreeListBox*,bool>& rHdl );
void SetOpenDoneHdl( const Link<>& rHdl );
sal_uLong GetSelectionCount() const;
SvTreeListEntry* FirstSelected() const;
SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const;
sal_uLong GetSelectionCount() const;
SvTreeListEntry* FirstSelected() const;
SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const;
void EnableAutoResize();
void EnableDelete( bool bEnable );
include/svtools/treelistbox.hxx
+3 -3
View File
@@ -282,7 +282,7 @@ class SVT_DLLPUBLIC SvTreeListBox
SvLBoxItem* pEdItem;
protected:
Link<> aDoubleClickHdl;
Link<SvTreeListBox*,bool> aDoubleClickHdl;
SvTreeListEntry* pTargetEntry;
SvLBoxButtonData* pCheckButtonData;
std::vector<SvLBoxTab*> aTabs;
@@ -477,10 +477,10 @@ public:
void SetSelectHdl( const Link<SvTreeListBox*,void>& rNewHdl ) {aSelectHdl=rNewHdl; }
void SetDeselectHdl( const Link<SvTreeListBox*,void>& rNewHdl ) {aDeselectHdl=rNewHdl; }
void SetDoubleClickHdl(const Link<>& rNewHdl) {aDoubleClickHdl=rNewHdl;}
void SetDoubleClickHdl(const Link<SvTreeListBox*,bool>& rNewHdl) {aDoubleClickHdl=rNewHdl;}
const Link<SvTreeListBox*,void>& GetSelectHdl() const { return aSelectHdl; }
const Link<SvTreeListBox*,void>& GetDeselectHdl() const { return aDeselectHdl; }
const Link<>& GetDoubleClickHdl() const { return aDoubleClickHdl; }
const Link<SvTreeListBox*,bool>& GetDoubleClickHdl() const { return aDoubleClickHdl; }
void SetExpandingHdl(const Link<SvTreeListBox*,bool>& rNewHdl){aExpandingHdl=rNewHdl;}
void SetExpandedHdl(const Link<SvTreeListBox*,void>& rNewHdl){aExpandedHdl=rNewHdl;}
reportdesign/source/ui/dlg/AddField.cxx
+2 -2
View File
@@ -504,12 +504,12 @@ IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnClickHdl, Button*, void )
OnDoubleClickHdl(NULL);
}
IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl )
IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool )
{
if ( m_aCreateLink.IsSet() )
m_aCreateLink.Call(this);
return 0L;
return false;
}
void OAddFieldWindow::setImageList(sal_Int16 _eBitmapSet)
reportdesign/source/ui/inc/AddField.hxx
+1 -1
View File
@@ -70,7 +70,7 @@ class OAddFieldWindow :public FloatingWindow
::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener;
DECL_LINK_TYPED( OnClickHdl, Button*, void );
DECL_LINK( OnDoubleClickHdl, void* );
DECL_LINK_TYPED( OnDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( OnSortAction, ToolBox*, void );
sc/source/ui/condformat/condformatmgr.cxx
+3 -3
View File
@@ -165,16 +165,16 @@ IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void)
{
EditBtnHdl(nullptr);
}
IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl)
IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool)
{
ScConditionalFormat* pFormat = m_pCtrlManager->GetSelection();
if(!pFormat)
return 0;
return false;
EndDialog( DLG_RET_EDIT );
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, AddBtnHdl, Button*, void)
sc/source/ui/inc/condformatmgr.hxx
+1 -1
View File
@@ -70,7 +70,7 @@ private:
DECL_LINK_TYPED(RemoveBtnHdl, Button*, void);
DECL_LINK_TYPED(EditBtnClickHdl, Button*, void);
DECL_LINK_TYPED(AddBtnHdl, Button*, void);
DECL_LINK(EditBtnHdl, void*);
DECL_LINK_TYPED(EditBtnHdl, SvTreeListBox*, bool);
bool mbModified;
};
sc/source/ui/inc/content.hxx
+1 -1
View File
@@ -102,7 +102,7 @@ class ScContentTree : public SvTreeListBox
ScDocument* GetSourceDocument();
DECL_LINK( ContentDoubleClickHdl, void* );
DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( ExecDragHdl, void*, void );
public:
SvTreeListEntry* pTmpEntry;
sc/source/ui/inc/solveroptions.hxx
+1 -1
View File
@@ -47,7 +47,7 @@ class ScSolverOptionsDialog : public ModalDialog
DECL_LINK( EngineSelectHdl, void* );
DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void );
DECL_LINK( SettingsDoubleClickHdl, void* );
DECL_LINK_TYPED( SettingsDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( ButtonHdl, Button*, void );
void ReadFromComponent();
sc/source/ui/miscdlgs/solveroptions.cxx
+2 -2
View File
@@ -355,10 +355,10 @@ IMPL_LINK_TYPED( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void )
EditOption();
}
IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl)
IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, bool)
{
EditOption();
return 0;
return false;
}
IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl)
sc/source/ui/navipi/content.cxx
+3 -3
View File
@@ -349,7 +349,7 @@ static OUString lcl_GetDBAreaRange( ScDocument* pDoc, const OUString& rDBName )
return aRet;
}
IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl)
IMPL_LINK_NOARG_TYPED(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool)
{
sal_uInt16 nType;
sal_uLong nChild;
@@ -359,7 +359,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl)
if( pEntry && (nType != SC_CONTENT_ROOT) && (nChild != SC_CONTENT_NOCHILD) )
{
if ( bHiddenDoc )
return 0; //! spaeter...
return false; //! spaeter...
OUString aText( GetEntryText( pEntry ) );
@@ -419,7 +419,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl)
ScNavigatorDlg::ReleaseFocus(); // set focus into document
}
return 0;
return false;
}
void ScContentTree::MouseButtonDown( const MouseEvent& rMEvt )
sd/source/ui/dlg/navigatr.cxx
+2 -2
View File
@@ -389,7 +389,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
}
}
IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
{
if( !mbDocImported || maLbDocs->GetSelectEntryPos() != 0 )
{
@@ -422,7 +422,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
}
}
}
return 0L;
return false;
}
IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
sd/source/ui/inc/navigatr.hxx
+1 -1
View File
@@ -146,7 +146,7 @@ private:
DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void );
DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void );
DECL_LINK( ClickPageHdl, void * );
DECL_LINK( ClickObjectHdl, void * );
DECL_LINK_TYPED( ClickObjectHdl, SvTreeListBox*, bool );
DECL_LINK( SelectDocumentHdl, void * );
DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
DECL_LINK_TYPED( ShapeFilterCallback, Menu *, bool );
sfx2/source/appl/newhelp.cxx
+4 -3
View File
@@ -1726,8 +1726,6 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<>& rLink )
{
aPageDoubleClickLink = rLink;
if ( pCPage )
pCPage->SetOpenHdl( aPageDoubleClickLink );
if ( pIPage )
pIPage->SetDoubleClickHdl( aPageDoubleClickLink );
if ( pSPage )
@@ -1736,7 +1734,10 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<>& rLink )
pBPage->SetDoubleClickHdl( aPageDoubleClickLink );
}
IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeListBox*, p, bool)
{
return aPageDoubleClickLink.Call(p);
}
void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive )
{
sfx2/source/appl/newhelp.hxx
+4 -3
View File
@@ -64,7 +64,7 @@ public:
virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
inline void SetOpenHdl( const Link<>& rLink ) { SetDoubleClickHdl( rLink ); }
inline void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); }
OUString GetSelectEntry() const;
};
@@ -101,7 +101,7 @@ public:
virtual void ActivatePage() SAL_OVERRIDE;
virtual Control* GetLastFocusControl() SAL_OVERRIDE;
void SetOpenHdl( const Link<>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); }
void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); }
OUString GetSelectEntry() const { return m_pContentBox->GetSelectEntry(); }
void SetFocusOnBox() { m_pContentBox->GrabFocus(); }
};
@@ -317,6 +317,7 @@ private:
DECL_LINK_TYPED(InitHdl, Idle *, void);
DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void);
DECL_LINK(KeywordHdl, void *);
DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool);
public:
SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent );
@@ -353,7 +354,7 @@ ContentTabPage_Impl* SfxHelpIndexWindow_Impl::GetContentPage()
if ( !pCPage )
{
pCPage = VclPtr<ContentTabPage_Impl>::Create( m_pTabCtrl, this );
pCPage->SetOpenHdl( aPageDoubleClickLink );
pCPage->SetOpenHdl( LINK(this, SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl) );
}
return pCPage;
}
sfx2/source/dialog/templdlg.cxx
+7 -3
View File
@@ -866,7 +866,7 @@ void SfxCommonTemplateDialog_Impl::Initialize()
Update_Impl();
aFilterLb->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, FilterSelectHdl ) );
aFmtLb->SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl, ApplyHdl ) );
aFmtLb->SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl, TreeListApplyHdl ) );
aFmtLb->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, FmtSelectHdl ) );
aFmtLb->SetSelectionMode(MULTIPLE_SELECTION);
@@ -2086,10 +2086,14 @@ void SfxCommonTemplateDialog_Impl::ResetFocus()
}
}
IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool )
{
return ApplyHdl(NULL) == 1;
}
// Double-click on a style sheet in the ListBox is applied.
IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, /*pControl*/ )
{
(void)pControl; //unused
// only if that region is allowed
if ( IsInitialized() && 0 != pFamilyState[nActFamily-1] &&
!GetSelectedEntry().isEmpty() )
sfx2/source/dialog/versdlg.cxx
+2 -2
View File
@@ -370,10 +370,10 @@ void SfxVersionDialog::Open_Impl()
Close();
}
IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl)
IMPL_LINK_NOARG_TYPED(SfxVersionDialog, DClickHdl_Impl, SvTreeListBox*, bool)
{
Open_Impl();
return 0L;
return false;
}
IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void)
sfx2/source/inc/templdgi.hxx
+1
View File
@@ -218,6 +218,7 @@ protected:
DECL_LINK( FilterSelectHdl, ListBox* );
DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void );
DECL_LINK( ApplyHdl, Control* );
DECL_LINK_TYPED( TreeListApplyHdl, SvTreeListBox*, bool );
DECL_LINK( DropHdl, StyleTreeListBox_Impl* );
DECL_LINK_TYPED( TimeOut, Idle*, void );
sfx2/source/inc/versdlg.hxx
+1 -1
View File
@@ -57,7 +57,7 @@ class SfxVersionDialog : public SfxModalDialog
SfxVersionTableDtor* m_pTable;
bool m_bIsSaveVersionOnClose;
DECL_LINK(DClickHdl_Impl, void *);
DECL_LINK_TYPED( DClickHdl_Impl, SvTreeListBox*, bool);
DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void);
DECL_LINK_TYPED( ButtonHdl_Impl, Button*, void );
void Init_Impl();
svtools/source/contnr/fileview.cxx
+1 -1
View File
@@ -1250,7 +1250,7 @@ void SvtFileView::SetSelectHdl( const Link<>& rHdl )
void SvtFileView::SetDoubleClickHdl( const Link<>& rHdl )
void SvtFileView::SetDoubleClickHdl( const Link<SvTreeListBox*,bool>& rHdl )
{
mpImp->mpView->SetDoubleClickHdl( rHdl );
}
sw/source/ui/chrdlg/swuiccoll.cxx
+7 -3
View File
@@ -82,7 +82,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)
// Install handlers
m_pConditionCB->SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl));
m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveTreeListBoxHdl ));
m_pStyleLB->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
m_pRemovePB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl ));
m_pAssignPB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl ));
@@ -230,9 +230,13 @@ IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void )
IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void)
{
AssignRemoveHdl(static_cast<PushButton*>(pBtn));
AssignRemoveHdl(pBtn);
}
IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn)
IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn, bool)
{
return AssignRemoveHdl(pBtn) != 0;
}
IMPL_LINK( SwCondCollPage, AssignRemoveHdl, void*, pBtn)
{
SvTreeListEntry* pE = m_pTbLinks->FirstSelected();
sal_uLong nPos;
sw/source/ui/fldui/flddb.cxx
+1 -1
View File
@@ -66,7 +66,7 @@ SwFieldDBPage::SwFieldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
m_pNumFormatLB->SetSelectHdl(LINK(this, SwFieldDBPage, NumSelectHdl));
m_pDatabaseTLB->SetSelectHdl(LINK(this, SwFieldDBPage, TreeSelectHdl));
m_pDatabaseTLB->SetDoubleClickHdl(LINK(this, SwFieldDBPage, InsertHdl));
m_pDatabaseTLB->SetDoubleClickHdl(LINK(this, SwFieldDBPage, TreeListBoxInsertHdl));
m_pValueED->SetModifyHdl(LINK(this, SwFieldDBPage, ModifyHdl));
m_pAddDBPB->SetClickHdl(LINK(this, SwFieldDBPage, AddDBHdl));
sw/source/ui/fldui/flddinf.cxx
+1 -1
View File
@@ -206,7 +206,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
m_pTypeTLB->SetUpdateMode(true);
m_pTypeTLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, TypeHdl));
m_pTypeTLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl));
m_pTypeTLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, TreeListBoxInsertHdl));
m_pSelectionLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, SubTypeHdl));
m_pSelectionLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl));
m_pFormatLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl));
sw/source/ui/fldui/fldpage.cxx
+7 -2
View File
@@ -307,7 +307,12 @@ void SwFieldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
}
// Insert new fields
IMPL_LINK( SwFieldPage, InsertHdl, Button *, pBtn )
IMPL_LINK_TYPED( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool )
{
return InsertHdl(pBtn);
}
IMPL_LINK( SwFieldPage, InsertHdl, void *, pBtn )
{
SwFieldDlg *pDlg = static_cast<SwFieldDlg*>(GetTabDialog());
if (pDlg)
@@ -315,7 +320,7 @@ IMPL_LINK( SwFieldPage, InsertHdl, Button *, pBtn )
pDlg->InsertHdl();
if (pBtn)
pBtn->GrabFocus(); // because of InputField-Dlg
static_cast<Button*>(pBtn)->GrabFocus(); // because of InputField-Dlg
}
else
{
sw/source/ui/fldui/fldpage.hxx
+3 -1
View File
@@ -25,6 +25,7 @@
#define FIELD_COLUMN_WIDTH 76
class ListBox;
class SvTreeListBox;
const int coLBCount = 3;
@@ -53,7 +54,8 @@ protected:
SwField* GetCurField() { return m_pCurField;}
SwWrtShell* GetWrtShell() { return m_pWrtShell;}
DECL_LINK( InsertHdl, Button * = 0);
DECL_LINK( InsertHdl, void * = 0);
DECL_LINK_TYPED( TreeListBoxInsertHdl, SvTreeListBox*, bool);
DECL_LINK(NumFormatHdl, void *);
void Init();
sw/source/ui/fldui/fldref.cxx
+1 -1
View File
@@ -99,7 +99,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet
// #i83479#
m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeTreeListBoxHdl) );
m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, InsertHdl) );
m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, TreeListBoxInsertHdl) );
m_pSelectionToolTipLB->SetStyle( m_pSelectionToolTipLB->GetStyle() | WB_HSCROLL );
m_pSelectionToolTipLB->SetSpaceBetweenEntries(1);
m_pSelectionToolTipLB->SetHighlightRange();
sw/source/ui/misc/glossary.cxx
+2 -2
View File
@@ -410,12 +410,12 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit )
return 0;
}
IMPL_LINK( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
IMPL_LINK_TYPED( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool )
{
SvTreeListEntry* pEntry = pBox->FirstSelected();
if(pBox->GetParent(pEntry) && !bIsDocReadOnly)
EndDialog( RET_OK );
return 0;
return false;
}
IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool )
sw/source/uibase/inc/conttree.hxx
+2 -2
View File
@@ -185,7 +185,7 @@ public:
const SwWrtShell* GetActiveWrtShell() {return pActiveShell;}
SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;}
DECL_LINK( ContentDoubleClickHdl, void * );
DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( TimerUpdate, Timer *, void );
virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE;
@@ -289,7 +289,7 @@ protected:
DECL_LINK_TYPED( PopupHdl, Menu*, bool );
DECL_LINK_TYPED( Timeout, Timer*, void );
DECL_LINK( DoubleClickHdl, void* );
DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool );
SwNavigationPI* GetParentWindow();
sw/source/uibase/inc/glossary.hxx
+1 -1
View File
@@ -124,7 +124,7 @@ class SwGlossaryDlg : public SvxStandardDialog
void ShowPreview();
DECL_LINK( NameModify, Edit * );
DECL_LINK( NameDoubleClick, SvTreeListBox * );
DECL_LINK_TYPED( NameDoubleClick, SvTreeListBox*, bool );
DECL_LINK_TYPED( GrpSelect, SvTreeListBox *, void );
DECL_LINK_TYPED( MenuHdl, Menu *, bool );
DECL_LINK_TYPED( EnableHdl, Menu *, bool );
sw/source/uibase/inc/swuiccoll.hxx
+2 -1
View File
@@ -53,7 +53,8 @@ class SwCondCollPage : public SfxTabPage
virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
DECL_LINK_TYPED( OnOffHdl, Button*, void );
DECL_LINK( AssignRemoveHdl, PushButton*);
DECL_LINK( AssignRemoveHdl, void*);
DECL_LINK_TYPED( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool);
DECL_LINK_TYPED( AssignRemoveClickHdl, Button*, void);
DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void );
DECL_LINK( SelectHdl, void* );
sw/source/uibase/utlui/content.cxx
+2 -2
View File
@@ -1509,7 +1509,7 @@ bool SwContentTree::Collapse( SvTreeListEntry* pParent )
// Also on double click will be initially opened only.
IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl)
IMPL_LINK_NOARG_TYPED(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool)
{
SvTreeListEntry* pEntry = GetCurEntry();
// Is it a content type?
@@ -1532,7 +1532,7 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl)
pActiveShell->EnterStdMode();
}
}
return 0;
return false;
}
// Show the file
sw/source/uibase/utlui/glbltree.cxx
+2 -2
View File
@@ -1197,7 +1197,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont)
}
}
IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl)
IMPL_LINK_NOARG_TYPED( SwGlobalTree, DoubleClickHdl, SvTreeListBox*, bool)
{
SvTreeListEntry* pEntry = GetCurEntry();
SwGlblDocContent* pCont = static_cast<SwGlblDocContent*>(pEntry->GetUserData());
@@ -1208,7 +1208,7 @@ IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl)
GotoContent(pCont);
pActiveShell->GetView().GetEditWin().GrabFocus();
}
return 0;
return false;
}
SwNavigationPI* SwGlobalTree::GetParentWindow()
xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+1 -1
View File
@@ -58,7 +58,7 @@ private:
DECL_LINK_TYPED(ViewButtonHdl, Button*, void);
DECL_LINK_TYPED(CertificateHighlightHdl, SvTreeListBox*, void );
DECL_LINK( CertificateSelectHdl, void* );
DECL_LINK_TYPED(CertificateSelectHdl, SvTreeListBox*, bool );
void ImplShowCertificateDetails();
void ImplInitialize();
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+1 -1
View File
@@ -92,7 +92,7 @@ private:
DECL_LINK_TYPED(AddButtonHdl, Button*, void);
DECL_LINK_TYPED(RemoveButtonHdl, Button*, void);
DECL_LINK_TYPED(SignatureHighlightHdl, SvTreeListBox*, void );
DECL_LINK( SignatureSelectHdl, void* );
DECL_LINK_TYPED(SignatureSelectHdl, SvTreeListBox*, bool );
DECL_LINK( StartVerifySignatureHdl, void* );
DECL_LINK_TYPED(OKButtonHdl, Button*, void );
xmlsecurity/source/dialogs/certificatechooser.cxx
+2 -2
View File
@@ -207,10 +207,10 @@ IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox
m_pOKBtn->Enable( bEnable );
}
IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl)
IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateSelectHdl, SvTreeListBox*, bool)
{
EndDialog( RET_OK );
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED(CertificateChooser, ViewButtonHdl, Button*, void)
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+2 -2
View File
@@ -407,10 +407,10 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void)
EndDialog(RET_OK);
}
IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl)
IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, bool)
{
ImplShowSignaturesDetails();
return 0;
return false;
}
IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, ViewButtonHdl, Button*, void)