summaryrefslogtreecommitdiff
path: root/sw/source/ui/config
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/config')
-rw-r--r--sw/source/ui/config/optcomp.cxx4
-rw-r--r--sw/source/ui/config/optload.cxx19
-rw-r--r--sw/source/ui/config/optpage.cxx40
3 files changed, 28 insertions, 35 deletions
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index cc674d8f57ed..4cf969f803f3 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -308,13 +308,11 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
m_pFormattingLB->SetDropDownLineCount( m_pFormattingLB->GetEntryCount() );
}
-IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl)
+IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, SelectHdl, ListBox&, void)
{
const sal_Int32 nPos = m_pFormattingLB->GetSelectEntryPos();
sal_uLong nOptions = reinterpret_cast<sal_uLong>(m_pFormattingLB->GetEntryData( nPos ));
SetCurrentOptions( nOptions );
-
- return 0;
}
IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void)
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 7b101cecc533..f9ee4c19c368 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -352,7 +352,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet)
m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked());
}
-IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl)
+IMPL_LINK_NOARG_TYPED(SwLoadOptPage, MetricHdl, ListBox&, void)
{
const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos();
if(nMPos != LISTBOX_ENTRY_NOTFOUND)
@@ -368,8 +368,6 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl)
if(!bModified)
m_pTabMF->ClearModifyFlag();
}
-
- return 0;
}
SwCaptionOptDlg::SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet)
@@ -533,9 +531,8 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
m_pNumberingSeparatorED->SetModifyHdl( aLk );
m_pTextEdit->SetModifyHdl( aLk );
- aLk = LINK(this, SwCaptionOptPage, SelectHdl);
- m_pCategoryBox->SetSelectHdl( aLk );
- m_pFormatBox->SetSelectHdl( aLk );
+ m_pCategoryBox->SetSelectHdl( LINK(this, SwCaptionOptPage, SelectHdl) );
+ m_pFormatBox->SetSelectHdl( LINK(this, SwCaptionOptPage, SelectListBoxHdl) );
m_pLbCaptionOrder->SetSelectHdl( LINK(this, SwCaptionOptPage, OrderHdl));
@@ -850,7 +847,12 @@ IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl)
return 0;
}
-IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
+IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SelectListBoxHdl, ListBox&, void)
+{
+ InvalidatePreview();
+}
+
+IMPL_LINK_TYPED( SwCaptionOptPage, OrderHdl, ListBox&, rBox, void )
{
InvalidatePreview();
@@ -861,10 +863,9 @@ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
bChecked = m_pCheckLB->IsChecked(m_pCheckLB->GetModel()->GetAbsPos(pSelEntry));
}
- sal_Int32 nPos = pBox->GetSelectEntryPos();
+ sal_Int32 nPos = rBox.GetSelectEntryPos();
m_pNumberingSeparatorFT->Enable( bChecked && nPos == 1 );
m_pNumberingSeparatorED->Enable( bChecked && nPos == 1 );
- return 0;
}
void SwCaptionOptPage::InvalidatePreview()
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index c4ec368b83d2..54575fc5e718 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -508,10 +508,9 @@ void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
m_pFaxLB->SelectEntryPos(0);
}
-IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl)
+IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, SelectHdl, ListBox&, void)
{
bAttrModified=true;
- return 0;
}
void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
@@ -1785,7 +1784,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent,
pDeletedLB->RemoveEntry(4);
pDeletedLB->RemoveEntry(3);
- Link<> aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
+ Link<ListBox&,void> aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
pInsertLB->SetSelectHdl( aLk );
pDeletedLB->SetSelectHdl( aLk );
pChangedLB->SetSelectHdl( aLk );
@@ -2066,27 +2065,27 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet* )
pMarkPosLB->SelectEntryPos(nPos);
// show settings in preview
- AttribHdl(pInsertLB);
- ColorHdl(pInsertColorLB);
- AttribHdl(pDeletedLB);
- ColorHdl(pInsertColorLB);
- AttribHdl(pChangedLB);
- ColorHdl(pChangedColorLB);
+ AttribHdl(*pInsertLB);
+ ColorHdl(*pInsertColorLB);
+ AttribHdl(*pDeletedLB);
+ ColorHdl(*pInsertColorLB);
+ AttribHdl(*pChangedLB);
+ ColorHdl(*pChangedColorLB);
- ChangedMaskPrevHdl();
+ ChangedMaskPrevHdl(*pMarkPosLB);
}
-IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB )
+IMPL_LINK_TYPED( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void )
{
SvxFontPrevWindow *pPrev = 0;
ColorListBox *pColorLB;
- if (pLB == pInsertLB)
+ if (&rLB == pInsertLB)
{
pColorLB = pInsertColorLB;
pPrev = pInsertedPreviewWN;
}
- else if (pLB == pDeletedLB)
+ else if (&rLB == pDeletedLB)
{
pColorLB = pDeletedColorLB;
pPrev = pDeletedPreviewWN;
@@ -2130,11 +2129,11 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB )
break;
}
- nPos = pLB->GetSelectEntryPos();
+ nPos = rLB.GetSelectEntryPos();
if( nPos == LISTBOX_ENTRY_NOTFOUND )
nPos = 0;
- CharAttr* pAttr = static_cast<CharAttr*>(pLB->GetEntryData( nPos ));
+ CharAttr* pAttr = static_cast<CharAttr*>(rLB.GetEntryData( nPos ));
//switch off preview background color
pPrev->ResetColor();
switch (pAttr->nItemId)
@@ -2179,12 +2178,11 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB )
}
pPrev->Invalidate();
-
- return 0;
}
-IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ColorListBox *, pColorLB )
+IMPL_LINK_TYPED( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void )
{
+ ColorListBox* pColorLB = static_cast<ColorListBox*>(&rListBox);
SvxFontPrevWindow *pPrev = 0;
ListBox* pLB;
@@ -2245,18 +2243,14 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ColorListBox *, pColorLB )
}
pPrev->Invalidate();
-
- return 0;
}
-IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskPrevHdl)
+IMPL_LINK_NOARG_TYPED(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void)
{
pMarkPreviewWN->SetMarkPos(pMarkPosLB->GetSelectEntryPos());
pMarkPreviewWN->SetColor(pMarkColorLB->GetSelectEntryColor().GetColor());
pMarkPreviewWN->Invalidate();
-
- return 0;
}
void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 03:29:44 +0000