summaryrefslogtreecommitdiff
path: root/sw/source/ui/index
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/index')
-rw-r--r--sw/source/ui/index/cnttab.cxx38
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx52
2 files changed, 42 insertions, 48 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 282de8c9b02a..08e32af3e8f1 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -884,7 +884,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
m_pInitialCapsCB->SetClickHdl(aLk);
m_pKeyAsEntryCB->SetClickHdl(aLk);
- Link<> aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl);
+ Link<Edit&,void> aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl);
m_pTitleED->SetModifyHdl(aModifyLk);
m_pLevelNF->SetModifyHdl(aModifyLk);
m_pSortAlgorithmLB->SetSelectHdl(LINK(this, SwTOXSelectTabPage, ModifyListBoxHdl));
@@ -1379,14 +1379,14 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void)
{
ApplyTOXDescription();
}
- ModifyHdl(0);
+ ModifyHdl(*m_pTitleED);
}
IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyListBoxHdl, ListBox&, void)
{
- ModifyHdl(0);
+ ModifyHdl(*m_pTitleED);
}
-IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, ModifyHdl, Edit&, void)
{
if(!m_bWaitingInitialSettings)
{
@@ -1394,7 +1394,6 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl)
SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
pTOXDlg->CreateOrUpdateExample(pTOXDlg->GetCurrentTOXType().eType, TOX_PAGE_SELECT);
}
- return 0;
}
IMPL_LINK_TYPED(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void )
@@ -1423,7 +1422,7 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void )
m_pUseDashCB->Enable(m_pCollectSameCB->IsChecked() && !m_pUseFFCB->IsChecked());
m_pCaseSensitiveCB->Enable(m_pCollectSameCB->IsChecked());
}
- ModifyHdl(0);
+ ModifyHdl(*m_pTitleED);
};
IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, RadioButtonHdl, Button*, void)
@@ -1433,7 +1432,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, RadioButtonHdl, Button*, void)
m_pCaptionSequenceLB->Enable(bEnable);
m_pDisplayTypeFT->Enable(bEnable);
m_pDisplayTypeLB->Enable(bEnable);
- ModifyHdl(0);
+ ModifyHdl(*m_pTitleED);
}
IMPL_LINK_TYPED(SwTOXSelectTabPage, LanguageListBoxHdl, ListBox&, rBox, void)
@@ -1476,7 +1475,7 @@ void SwTOXSelectTabPage::LanguageHdl( ListBox* pBox )
m_pSortAlgorithmLB->SelectEntryPos( 0 );
if(pBox)
- ModifyHdl(0);
+ ModifyHdl(*m_pTitleED);
};
IMPL_LINK_TYPED(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void)
@@ -1486,7 +1485,7 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void)
aStyleArr);
pDlg->Execute();
pDlg.disposeAndClear();
- ModifyHdl(0);
+ ModifyHdl(*m_pTitleED);
}
IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool)
@@ -2575,9 +2574,9 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void)
}
}
-IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, NumericField*, pField)
+IMPL_LINK_TYPED(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void)
{
- const sal_uInt16 nLevel = static_cast<sal_uInt8>(pField->GetValue());
+ const sal_uInt16 nLevel = static_cast<sal_uInt8>(static_cast<NumericField&>(rEdit).GetValue());
Control* pCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(pCtrl, "no active control?");
@@ -2585,7 +2584,6 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, NumericField*, pField)
static_cast<SwTOXButton*>(pCtrl)->SetOutlineLevel(nLevel);
ModifyHdl(0);
- return 0;
}
IMPL_LINK_TYPED(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void)
@@ -2604,8 +2602,9 @@ IMPL_LINK_TYPED(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void)
}
}
-IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, MetricField*, pField)
+IMPL_LINK_TYPED(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void)
{
+ MetricField* pField = static_cast<MetricField*>(&rEdit);
Control* pCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(pCtrl && WINDOW_EDIT != pCtrl->GetType() &&
TOKEN_TAB_STOP == static_cast<SwTOXButton*>(pCtrl)->GetFormToken().eTokenType,
@@ -2616,10 +2615,9 @@ IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, MetricField*, pField)
pField->Denormalize( pField->GetValue( FUNIT_TWIP ))));
}
ModifyHdl(0);
- return 0;
}
-IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox)
+IMPL_LINK_TYPED(SwTOXEntryTabPage, FillCharHdl, Edit&, rBox, void)
{
Control* pCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(pCtrl && WINDOW_EDIT != pCtrl->GetType() &&
@@ -2628,14 +2626,13 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox)
if(pCtrl && WINDOW_EDIT != pCtrl->GetType())
{
sal_Unicode cSet;
- if( !pBox->GetText().isEmpty() )
- cSet = pBox->GetText()[0];
+ if( !rBox.GetText().isEmpty() )
+ cSet = rBox.GetText()[0];
else
cSet = ' ';
static_cast<SwTOXButton*>(pCtrl)->SetFillChar( cSet );
}
ModifyHdl(0);
- return 0;
}
IMPL_LINK_TYPED(SwTOXEntryTabPage, AutoRightHdl, Button*, pBox, void)
@@ -3459,12 +3456,11 @@ bool SwTokenWindow::CreateQuickHelp(Control* pCtrl,
return bRet;
}
-IMPL_LINK(SwTokenWindow, EditResize, Edit*, pEdit)
+IMPL_LINK_TYPED(SwTokenWindow, EditResize, Edit&, rEdit, void)
{
- static_cast<SwTOXEdit*>(pEdit)->AdjustSize();
+ static_cast<SwTOXEdit*>(&rEdit)->AdjustSize();
AdjustPositions();
aModifyHdl.Call(0);
- return 0;
}
IMPL_LINK_TYPED(SwTokenWindow, NextItemHdl, SwTOXEdit&, rEdit, void)
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 331bb63ba67d..7f5108e0c577 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -144,8 +144,8 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg,
m_pTypeDCB->SetSelectHdl(LINK(this,SwIndexMarkPane, ModifyListBoxHdl));
m_pKey1DCB->SetModifyHdl(LINK(this,SwIndexMarkPane, KeyDCBModifyHdl));
m_pKey2DCB->SetModifyHdl(LINK(this,SwIndexMarkPane, KeyDCBModifyHdl));
- m_pCloseBT->SetClickHdl(LINK(this,SwIndexMarkPane, CloseHdl));
- m_pEntryED->SetModifyHdl(LINK(this,SwIndexMarkPane, ModifyHdl));
+ m_pCloseBT->SetClickHdl(LINK(this,SwIndexMarkPane, CloseHdl));
+ m_pEntryED->SetModifyHdl(LINK(this,SwIndexMarkPane, ModifyEditHdl));
m_pNewBT->SetClickHdl(LINK(this, SwIndexMarkPane, NewUserIdxHdl));
m_pApplyToAllCB->SetClickHdl(LINK(this, SwIndexMarkPane, SearchTypeHdl));
m_pPhoneticED0->SetModifyHdl(LINK(this,SwIndexMarkPane, PhoneticEDModifyHdl));
@@ -550,7 +550,7 @@ class SwNewUserIdxDlg : public ModalDialog
SwIndexMarkPane* m_pDlg;
- DECL_LINK( ModifyHdl, Edit*);
+ DECL_LINK_TYPED( ModifyHdl, Edit&, void);
public:
explicit SwNewUserIdxDlg(SwIndexMarkPane* pPane)
@@ -575,10 +575,9 @@ class SwNewUserIdxDlg : public ModalDialog
OUString GetName(){return m_pNameED->GetText();}
};
-IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, Edit*, pEdit)
+IMPL_LINK_TYPED( SwNewUserIdxDlg, ModifyHdl, Edit&, rEdit, void)
{
- m_pOKPB->Enable(!pEdit->GetText().isEmpty() && !m_pDlg->IsTOXType(pEdit->GetText()));
- return 0;
+ m_pOKPB->Enable(!rEdit.GetText().isEmpty() && !m_pDlg->IsTOXType(rEdit.GetText()));
}
IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NewUserIdxHdl, Button*, void)
@@ -627,7 +626,11 @@ IMPL_LINK_TYPED( SwIndexMarkPane, ModifyListBoxHdl, ListBox&, rBox, void )
{
ModifyHdl(&rBox);
}
-IMPL_LINK( SwIndexMarkPane, ModifyHdl, void*, pBox )
+IMPL_LINK_TYPED( SwIndexMarkPane, ModifyEditHdl, Edit&, rEdit, void )
+{
+ ModifyHdl(&rEdit);
+}
+void SwIndexMarkPane::ModifyHdl(Control* pBox)
{
if (m_pTypeDCB == pBox)
{
@@ -699,7 +702,6 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, void*, pBox )
}
m_pOKBT->Enable(!pSh->HasReadonlySel() &&
(!m_pEntryED->GetText().isEmpty() || pSh->GetCrsrCnt(false)));
- return 0;
}
IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextHdl, Button*, void)
@@ -848,26 +850,26 @@ void SwIndexMarkPane::UpdateDialog()
}
// Remind whether the edit boxes for Phonetic reading are changed manually
-IMPL_LINK( SwIndexMarkPane, PhoneticEDModifyHdl, Edit *, pEdit )
+IMPL_LINK_TYPED( SwIndexMarkPane, PhoneticEDModifyHdl, Edit&, rEdit, void )
{
- if (m_pPhoneticED0 == pEdit)
+ if (m_pPhoneticED0 == &rEdit)
{
- bPhoneticED0_ChangedByUser = !pEdit->GetText().isEmpty();
+ bPhoneticED0_ChangedByUser = !rEdit.GetText().isEmpty();
}
- else if (m_pPhoneticED1 == pEdit)
+ else if (m_pPhoneticED1 == &rEdit)
{
- bPhoneticED1_ChangedByUser = !pEdit->GetText().isEmpty();
+ bPhoneticED1_ChangedByUser = !rEdit.GetText().isEmpty();
}
- else if (m_pPhoneticED2 == pEdit)
+ else if (m_pPhoneticED2 == &rEdit)
{
- bPhoneticED2_ChangedByUser = !pEdit->GetText().isEmpty();
+ bPhoneticED2_ChangedByUser = !rEdit.GetText().isEmpty();
}
- return 0;
}
// Enable Disable of the 2nd key
-IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
+IMPL_LINK_TYPED( SwIndexMarkPane, KeyDCBModifyHdl, Edit&, rEdit, void )
{
+ ComboBox* pBox = static_cast<ComboBox*>(&rEdit);
if (m_pKey1DCB == pBox)
{
bool bEnable = !pBox->GetText().isEmpty();
@@ -917,8 +919,6 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
m_pPhoneticED1->Enable(bKey1HasText && bIsPhoneticReadingEnabled);
m_pPhoneticFT2->Enable(bKey2HasText && bIsPhoneticReadingEnabled);
m_pPhoneticED2->Enable(bKey2HasText && bIsPhoneticReadingEnabled);
-
- return 0;
}
SwIndexMarkPane::~SwIndexMarkPane()
@@ -993,7 +993,7 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog
bool m_bNameAllowed;
DECL_LINK_TYPED(IdentifierHdl, ComboBox&, void);
- DECL_LINK(ShortNameHdl, Edit*);
+ DECL_LINK_TYPED(ShortNameHdl, Edit&, void);
DECL_LINK_TYPED(EnableHdl, ListBox&, void);
public:
@@ -1333,18 +1333,17 @@ IMPL_LINK_TYPED(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void)
CompEntryHdl(*m_pEntryLB);
}
-IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit*, pEdit)
+IMPL_LINK_TYPED(SwAuthorMarkPane, EditModifyHdl, Edit&, rEdit, void)
{
Link<Edit*,bool> aAllowed = LINK(this, SwAuthorMarkPane, IsEntryAllowedHdl);
- bool bResult = aAllowed.Call(pEdit);
+ bool bResult = aAllowed.Call(&rEdit);
m_pActionBT->Enable(bResult);
if(bResult)
{
- OUString sEntry(pEdit->GetText());
+ OUString sEntry(rEdit.GetText());
m_sFields[AUTH_FIELD_IDENTIFIER] = sEntry;
m_sCreatedEntry[AUTH_FIELD_IDENTIFIER] = sEntry;
}
- return 0;
};
IMPL_LINK_TYPED(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit, bool)
@@ -1579,15 +1578,14 @@ IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void)
}
}
-IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit*, pEdit)
+IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit&, rEdit, void)
{
if(aShortNameCheckLink.IsSet())
{
- bool bEnable = aShortNameCheckLink.Call(pEdit);
+ bool bEnable = aShortNameCheckLink.Call(&rEdit);
m_bNameAllowed |= bEnable;
m_pOKBT->Enable(pTypeListBox->GetSelectEntryCount() && bEnable);
}
- return 0;
}
IMPL_LINK_TYPED(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox&, rBox, void)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 04:19:37 +0000