diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-20 17:27:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 18:19:58 +0200 |
| commit | 9940f077fdfc0c271aa66ad64578ae2236a2ca81 (patch) | |
| tree | a52b00f3ba98d78f88a0d2aa5a02605746f8e6c7 /sw/source | |
| parent | f19a599f6911f5ccd1049228454b6c6c8fd6d5cb (diff) | |
add Toggleable as a separate thing to a Button
and inherit ToggleButton from both it and Button
Change-Id: If0e500aca8d0ffa087cb5e2bfc1786372fbff4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
90 files changed, 267 insertions, 266 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 2bef906093f7..4a0a20f11759 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -55,7 +55,7 @@ void SwBreakDlg::rememberResult() } } -IMPL_LINK_NOARG(SwBreakDlg, ToggleHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwBreakDlg, ToggleHdl, weld::Toggleable&, void) { CheckEnable(); } @@ -66,7 +66,7 @@ IMPL_LINK_NOARG(SwBreakDlg, ChangeHdl, weld::ComboBox&, void) } // Handler for Change Page Number -IMPL_LINK(SwBreakDlg, PageNumHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwBreakDlg, PageNumHdl, weld::Toggleable&, rBox, void) { if (rBox.get_active()) m_xPageNumEdit->set_value(1); @@ -136,7 +136,7 @@ SwBreakDlg::SwBreakDlg(weld::Window *pParent, SwWrtShell &rS) , nKind(0) , bHtmlMode(0 != ::GetHtmlMode(rS.GetView().GetDocShell())) { - Link<weld::ToggleButton&,void> aLk = LINK(this, SwBreakDlg, ToggleHdl); + Link<weld::Toggleable&,void> aLk = LINK(this, SwBreakDlg, ToggleHdl); m_xPageBtn->connect_toggled(aLk); m_xLineBtn->connect_toggled(aLk); m_xColumnBtn->connect_toggled(aLk); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 9c42b44228e4..5f0731b12810 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -587,7 +587,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) bModified = false; } -IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, weld::Toggleable&, void) { bool bChecked = m_xDropCapsBox->get_active(); @@ -615,7 +615,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, weld::ToggleButton&, void) bModified = true; } -IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl, weld::Toggleable&, void) { m_xDropCapsField->set_sensitive(!m_xWholeWordCB->get_active()); m_xSwitchText->set_sensitive(!m_xWholeWordCB->get_active()); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 9a8d7e8c87d9..4f1cbdcc0135 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -273,14 +273,14 @@ void SwParagraphNumTabPage::EnableNewStart() m_xNewStartBX->show(); } -IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl, weld::Toggleable&, void) { bool bEnable = m_xNewStartCB->get_active(); m_xNewStartNumberCB->set_sensitive(bEnable); m_xNewStartNF->set_sensitive(bEnable && m_xNewStartNumberCB->get_active()); } -IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, weld::Toggleable&, void) { m_xRestartParaCountCB->set_sensitive(m_xCountParaCB->get_active()); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 81bebf9c0253..f42ba0364c45 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -92,9 +92,9 @@ class SwAuthenticationSettingsDialog : public SfxDialogController std::unique_ptr<weld::Button> m_xOKPB; DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(RadioButtonHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(InServerHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl_Impl, weld::Toggleable&, void); + DECL_LINK(RadioButtonHdl_Impl, weld::Toggleable&, void); + DECL_LINK(InServerHdl_Impl, weld::Toggleable&, void); public: SwAuthenticationSettingsDialog(weld::Window* pParent, SwMailMergeConfigItem& rItem); @@ -175,7 +175,7 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ ) m_xSecureCB->save_state(); } -IMPL_LINK(SwMailConfigPage, ReplyToHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwMailConfigPage, ReplyToHdl, weld::Toggleable&, rBox, void) { bool bEnable = rBox.get_active(); m_xReplyToFT->set_sensitive(bEnable); @@ -196,7 +196,7 @@ IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, weld::Button&, void) aDlg.run(); } -IMPL_LINK(SwMailConfigPage, SecureHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwMailConfigPage, SecureHdl, weld::Toggleable&, rBox, void) { bool bEnable = rBox.get_active(); m_pConfigItem->SetSecureConnection(bEnable); @@ -387,7 +387,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( , m_xOKPB(m_xBuilder->weld_button("ok")) { m_xAuthenticationCB->connect_toggled( LINK( this, SwAuthenticationSettingsDialog, CheckBoxHdl_Impl)); - Link<weld::ToggleButton&,void> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl ); + Link<weld::Toggleable&,void> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl ); m_xSeparateAuthenticationRB->connect_toggled( aRBLink ); m_xSMTPAfterPOPRB->connect_toggled( aRBLink ); m_xOKPB->connect_clicked( LINK( this, SwAuthenticationSettingsDialog, OKHdl_Impl)); @@ -427,7 +427,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, weld::Toggleable&, rBox, void) { bool bChecked = rBox.get_active(); m_xSeparateAuthenticationRB->set_sensitive(bChecked); @@ -435,7 +435,7 @@ IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, weld::ToggleButton& RadioButtonHdl_Impl(*m_xSeparateAuthenticationRB); } -IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, weld::Toggleable&, void) { bool bSeparate = m_xSeparateAuthenticationRB->get_active(); bool bIsEnabled = m_xSeparateAuthenticationRB->get_sensitive(); @@ -472,7 +472,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, weld::Toggl m_xInPasswordED->set_sensitive(bNotSeparate); } -IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl, weld::Toggleable&, void) { bool bPOP = m_xPOP3RB->get_active(); m_rConfigItem.SetInServerPOP(bPOP); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 6639024a8baf..af0765ab11d3 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -144,7 +144,7 @@ std::unique_ptr<SfxTabPage> SwLoadOptPage::Create( weld::Container* pPage, weld: return std::make_unique<SwLoadOptPage>(pPage, pController, *rAttrSet ); } -IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, weld::Toggleable&, void) { m_xStandardizedPageSizeNF->set_sensitive(m_xShowStandardizedPageCount->get_active()); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index cb68fc883c63..95eaf4acf213 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -279,12 +279,12 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) return bRet; } -IMPL_LINK(SwContentOptPage, VertRulerHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwContentOptPage, VertRulerHdl, weld::Toggleable&, rBox, void) { m_xVRulerRightCBox->set_sensitive(rBox.get_sensitive() && rBox.get_active()); } -IMPL_LINK(SwContentOptPage, ShowOutlineContentVisibilityButtonHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwContentOptPage, ShowOutlineContentVisibilityButtonHdl, weld::Toggleable&, rBox, void) { m_xTreatSubOutlineLevelsAsContent->set_sensitive(rBox.get_active()); } @@ -317,7 +317,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(weld::Container* pPage, weld::DialogCon , m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray")) , m_xFaxLB(m_xBuilder->weld_combo_box("fax")) { - Link<weld::ToggleButton&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); + Link<weld::Toggleable&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); m_xGrfCB->connect_toggled( aLk ); m_xRightPageCB->connect_toggled( aLk ); m_xLeftPageCB->connect_toggled( aLk ); @@ -454,7 +454,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* ) m_xProspectCB_RTL->set_sensitive( false ); } -IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::Toggleable&, void) { bAttrModified = true; bool bIsProspect = m_xProspectCB->get_active(); @@ -1028,7 +1028,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage(weld::Container* pPage, weld::Dialo , m_xFixPropRB(m_xBuilder->weld_radio_button("fixprop")) , m_xVarRB(m_xBuilder->weld_radio_button("var")) { - Link<weld::ToggleButton&,void> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); + Link<weld::Toggleable&,void> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); m_xNumFormattingCB->connect_toggled(aLnk); m_xNumFormatFormattingCB->connect_toggled(aLnk); m_xHeaderCB->connect_toggled(aLnk); @@ -1195,7 +1195,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet) CheckBoxHdl(*m_xHeaderCB); } -IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, weld::Toggleable&, void) { m_xNumFormatFormattingCB->set_sensitive(m_xNumFormattingCB->get_active()); m_xNumAlignmentCB->set_sensitive(m_xNumFormattingCB->get_active()); @@ -2017,7 +2017,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage(weld::Container* pPage, weld::D , m_xLenNF(m_xBuilder->weld_spin_button("ignorelen")) , m_xStoreRsidCB(m_xBuilder->weld_check_button("storeRSID")) { - Link<weld::ToggleButton&,void> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) ); + Link<weld::Toggleable&,void> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) ); m_xAutoRB->connect_toggled( aLnk ); m_xWordRB->connect_toggled( aLnk ); m_xCharRB->connect_toggled( aLnk ); @@ -2125,7 +2125,7 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) m_xStoreRsidCB->save_state(); } -IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; @@ -2136,7 +2136,7 @@ IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl, weld::ToggleButton&, rButton, m_xLenNF->set_sensitive( bChecked && m_xIgnoreCB->get_active() ); } -IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::Toggleable&, void) { m_xLenNF->set_sensitive(m_xIgnoreCB->get_active()); } @@ -2215,7 +2215,7 @@ void SwTestTabPage::Reset( const SfxItemSet* ) void SwTestTabPage::Init() { // handler - Link<weld::ToggleButton&,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl ); + Link<weld::Toggleable&,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl ); m_xTest1CBox->connect_toggled( aLk ); m_xTest2CBox->connect_toggled( aLk ); m_xTest3CBox->connect_toggled( aLk ); @@ -2228,7 +2228,7 @@ void SwTestTabPage::Init() m_xTest10CBox->connect_toggled( aLk ); } -IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, weld::Toggleable&, void) { bAttrModified = true; } diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index b9047f92201d..6e4d47ca9190 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -387,14 +387,15 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot() { } -IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, weld::Toggleable&, rButton, void ) { if (!rButton.get_active()) return; bool bShowTable = m_xRbAsTable->get_active(); - m_xHeadFrame->set_label(MnemonicGenerator::EraseAllMnemonicChars(rButton.get_label().replace('_', '~'))); + weld::RadioButton& rRadio = dynamic_cast<weld::RadioButton&>(rButton); + m_xHeadFrame->set_label(MnemonicGenerator::EraseAllMnemonicChars(rRadio.get_label().replace('_', '~'))); m_xLbTextDbColumn->set_visible( !bShowTable ); m_xIbDbcolToEdit->set_visible( !bShowTable ); @@ -421,7 +422,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, weld::ToggleButton&, rButton, void ) TVSelectHdl( bShowTable ? *m_xLbTableDbColumn : *m_xLbTextDbColumn ); } -IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, weld::Toggleable&, rButton, void ) { if (!rButton.get_active()) return; @@ -801,7 +802,7 @@ IMPL_LINK_NOARG(SwInsertDBColAutoPilot, CBSelectHdl, weld::ComboBox&, void) } } -IMPL_LINK_NOARG(SwInsertDBColAutoPilot, HeaderHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwInsertDBColAutoPilot, HeaderHdl, weld::Toggleable&, void) { bool bEnable = m_xCbTableHeadon->get_active(); m_xRbHeadlColnms->set_sensitive( bEnable ); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index ec7f7ae75108..3217a01147d5 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -230,7 +230,7 @@ void SwMailMergeAddressBlockPage::EnableAddressBlock(bool bAll, bool bSelective) m_xStep4->set_sensitive(bSelective); } -IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, weld::Toggleable&, rBox, void) { EnableAddressBlock(rBox.get_sensitive(), rBox.get_active()); SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); @@ -251,7 +251,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkPar GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); } -IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, weld::Toggleable&, rBox, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); rConfigItem.SetHideEmptyParagraphs(rBox.get_active()); @@ -333,7 +333,7 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(weld::Window* pParent, Sw m_xDeletePB->connect_clicked(LINK(this, SwSelectAddressBlockDialog, DeleteHdl_Impl)); - Link<weld::ToggleButton&,void> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl); + Link<weld::Toggleable&,void> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl); m_xNeverRB->connect_toggled(aLk); m_xAlwaysRB->connect_toggled(aLk); m_xDependentRB->connect_toggled(aLk); @@ -435,7 +435,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, weld::Button&, rButt m_xDeletePB->set_sensitive(m_aAddressBlocks.getLength() > 1); } -IMPL_LINK_NOARG(SwSelectAddressBlockDialog, IncludeHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwSelectAddressBlockDialog, IncludeHdl_Impl, weld::Toggleable&, void) { m_xCountryED->set_sensitive(m_xDependentRB->get_active()); } diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 1ab100c9539b..65071c11d7a6 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -69,10 +69,10 @@ class SwMailMergeAddressBlockPage : public vcl::OWizardPage DECL_LINK(AddressListHdl_Impl, weld::Button&, void); DECL_LINK(SettingsHdl_Impl, weld::Button&, void); DECL_LINK(AssignHdl_Impl, weld::Button&, void); - DECL_LINK(AddressBlockHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(AddressBlockHdl_Impl, weld::Toggleable&, void); DECL_LINK(InsertDataHdl_Impl, weld::Button&, void); DECL_LINK(AddressBlockSelectHdl_Impl, LinkParamNone*, void); - DECL_LINK(HideParagraphsHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(HideParagraphsHdl_Impl, weld::Toggleable&, void); void EnableAddressBlock(bool bAll, bool bSelective); @@ -103,7 +103,7 @@ class SwSelectAddressBlockDialog : public SfxDialogController DECL_LINK(NewCustomizeHdl_Impl, weld::Button&, void); DECL_LINK(DeleteHdl_Impl, weld::Button&, void); - DECL_LINK(IncludeHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(IncludeHdl_Impl, weld::Toggleable&, void); public: SwSelectAddressBlockDialog(weld::Window* pParent, SwMailMergeConfigItem& rConfig); diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 5ef0ee737f3a..cfed29e5a49d 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -56,7 +56,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage, SwMai m_xCurrentDocRB->set_active(true); DocSelectHdl(*m_xNewDocRB); - Link<weld::ToggleButton&,void> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl); + Link<weld::Toggleable&,void> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl); m_xCurrentDocRB->connect_toggled(aDocSelectLink); m_xNewDocRB->connect_toggled(aDocSelectLink); m_xLoadDocRB->connect_toggled(aDocSelectLink); @@ -87,7 +87,7 @@ SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage() { } -IMPL_LINK_NOARG(SwMailMergeDocSelectPage, DocSelectHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMailMergeDocSelectPage, DocSelectHdl, weld::Toggleable&, void) { m_xRecentDocLB->set_sensitive(m_xRecentDocRB->get_active()); m_pWizard->UpdateRoadmap(); diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 5220c3fd7fe2..d1cdca67d330 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -42,7 +42,7 @@ class SwMailMergeDocSelectPage : public vcl::OWizardPage std::unique_ptr<weld::Label> m_xDataSourceWarningFT; std::unique_ptr<weld::Button> m_xExchangeDatabasePB; - DECL_LINK(DocSelectHdl, weld::ToggleButton&, void); + DECL_LINK(DocSelectHdl, weld::Toggleable&, void); DECL_LINK(FileSelectHdl, weld::Button&, void); DECL_LINK(ExchangeDatabaseHdl, weld::Button&, void); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 8287e064ec43..77e9242ba2d2 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -56,7 +56,7 @@ static void lcl_StoreGreetingsBox(const weld::ComboBox& rBox, rConfig.SetCurrentGreeting(eType, rBox.get_active()); } -IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, weld::Toggleable&, void) { bool bIndividual = m_xPersonalizedCB->get_sensitive() && m_xPersonalizedCB->get_active(); m_xFemaleFT->set_sensitive(bIndividual); @@ -216,7 +216,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(weld::Container* pPage, SwMai m_bIsTabPage = true; m_xGreetingLineCB->connect_toggled(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl)); - Link<weld::ToggleButton&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); + Link<weld::Toggleable&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); m_xPersonalizedCB->connect_toggled(aIndividualLink); Link<weld::Button&,void> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); m_xFemalePB->connect_clicked(aGreetingLink); @@ -303,7 +303,7 @@ bool SwMailMergeGreetingsPage::commitPage( ::vcl::WizardTypes::CommitPageReason return true; } -IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, weld::Toggleable&, rBox, void) { bool bContainsGreeting = rBox.get_active(); SwGreetingsHandler::Contains(bContainsGreeting); @@ -349,7 +349,7 @@ SwMailBodyDialog::SwMailBodyDialog(weld::Window* pParent) m_xBodyMLE->set_size_request(m_xBodyMLE->get_approximate_digit_width() * 45, m_xBodyMLE->get_height_rows(6)); m_xGreetingLineCB->connect_toggled(LINK(this, SwMailBodyDialog, ContainsHdl_Impl)); - Link<weld::ToggleButton&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); + Link<weld::Toggleable&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); m_xPersonalizedCB->connect_toggled(aIndividualLink); Link<weld::Button&,void> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); m_xFemalePB->connect_clicked(aGreetingLink); @@ -387,7 +387,7 @@ SwMailBodyDialog::~SwMailBodyDialog() { } -IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, weld::Toggleable&, rBox, void) { SwGreetingsHandler::Contains(rBox.get_active()); m_rConfigItem.SetGreetingLine(rBox.get_active(), true); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 3fd55ea2b002..86aaf9c553f2 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -76,7 +76,7 @@ protected: ~SwGreetingsHandler() {} - DECL_LINK(IndividualHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(IndividualHdl_Impl, weld::Toggleable&, void); DECL_LINK(GreetingHdl_Impl, weld::Button&, void); void Contains(bool bContainsGreeting); @@ -95,7 +95,7 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage, public SwGreetingsHand OUString m_sDocument; - DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ContainsHdl_Impl, weld::Toggleable&, void); DECL_LINK(InsertDataHdl_Impl, weld::Button&, void); DECL_LINK(GreetingSelectComboBoxHdl_Impl, weld::ComboBox&, void); DECL_LINK(GreetingSelectListBoxHdl_Impl, weld::ComboBox&, void); @@ -116,7 +116,7 @@ class SwMailBodyDialog : public SfxDialogController, public SwGreetingsHandler std::unique_ptr<weld::TextView> m_xBodyMLE; std::unique_ptr<weld::Button> m_xOK; - DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ContainsHdl_Impl, weld::Toggleable&, void); DECL_LINK(OKHdl, weld::Button&, void); public: diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index b31025719351..7d12b35e5e68 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -683,7 +683,7 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, weld::Button&, rButton, void m_xExampleFrame->Invalidate(); } -IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, weld::Toggleable&, rBox, void) { bool bCheck = rBox.get_active() && rBox.get_sensitive(); m_xLeftFT->set_sensitive(!bCheck); diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index a0f732e8af28..abec12bb2c52 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -60,7 +60,7 @@ class SwMailMergeLayoutPage : public vcl::OWizardPage DECL_LINK(ZoomHdl_Impl, weld::ComboBox&, void); DECL_LINK(ChangeAddressHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(GreetingsHdl_Impl, weld::Button&, void); - DECL_LINK(AlignToTextHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(AlignToTextHdl_Impl, weld::Toggleable&, void); static SwFrameFormat* InsertAddressFrame( SwWrtShell& rShell, diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index d55275d02ff7..660c9ea74384 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -45,7 +45,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(weld::Container* pPage, SwM , m_xLetterHint(m_xBuilder->weld_label("letterft")) , m_xMailHint(m_xBuilder->weld_label("emailft")) { - Link<weld::ToggleButton&,void> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl); + Link<weld::Toggleable&,void> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl); m_xLetterRB->connect_toggled(aLink); m_xMailRB->connect_toggled(aLink); @@ -61,7 +61,7 @@ SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage() { } -IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::Toggleable&, void) { bool bLetter = m_xLetterRB->get_active(); m_xLetterHint->set_visible(bLetter); diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index eccd2bb9d08f..0fa6c00d0fdc 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -32,7 +32,7 @@ class SwMailMergeOutputTypePage : public vcl::OWizardPage std::unique_ptr<weld::Label> m_xLetterHint; std::unique_ptr<weld::Label> m_xMailHint; - DECL_LINK(TypeHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(TypeHdl_Impl, weld::Toggleable&, void); public: SwMailMergeOutputTypePage(weld::Container* pPage, SwMailMergeWizard* pWizard); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index d726c1c2d830..6e081c68a9a1 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -257,7 +257,7 @@ SwMMResultSaveDialog::SwMMResultSaveDialog(weld::Window* pParent) , m_xToNF(m_xBuilder->weld_spin_button("to")) , m_xOKButton(m_xBuilder->weld_button("ok")) { - Link<weld::ToggleButton&,void> aLink = LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl); + Link<weld::Toggleable&,void> aLink = LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl); m_xSaveAsOneRB->connect_toggled(aLink); m_xSaveIndividualRB->connect_toggled(aLink); m_xFromRB->connect_toggled(aLink); @@ -295,7 +295,7 @@ SwMMResultPrintDialog::SwMMResultPrintDialog(weld::Window* pParent) m_xPrinterLB->connect_changed(LINK(this, SwMMResultPrintDialog, PrinterChangeHdl_Impl)); m_xPrinterSettingsPB->connect_clicked(LINK(this, SwMMResultPrintDialog, PrinterSetupHdl_Impl)); - Link<weld::ToggleButton&,void> aLink = LINK(this, SwMMResultPrintDialog, DocumentSelectionHdl_Impl); + Link<weld::Toggleable&,void> aLink = LINK(this, SwMMResultPrintDialog, DocumentSelectionHdl_Impl); m_xPrintAllRB->connect_toggled(aLink); m_xFromRB->connect_toggled(aLink); // m_pPrintAllRB is the default, so disable m_xFromNF and m_xToNF initially. @@ -338,7 +338,7 @@ SwMMResultEmailDialog::SwMMResultEmailDialog(weld::Window* pParent) m_xSendAsLB->connect_changed(LINK(this, SwMMResultEmailDialog, SendTypeHdl_Impl)); m_xPasswordCB->connect_toggled( LINK( this, SwMMResultEmailDialog, CheckHdl )); - Link<weld::ToggleButton&,void> aLink = LINK(this, SwMMResultEmailDialog, DocumentSelectionHdl_Impl); + Link<weld::Toggleable&,void> aLink = LINK(this, SwMMResultEmailDialog, DocumentSelectionHdl_Impl); m_xSendAllRB->connect_toggled(aLink); m_xFromRB->connect_toggled(aLink); // m_xSendAllRB is the default, so disable m_xFromNF and m_xToNF initially. @@ -455,7 +455,7 @@ void SwMMResultEmailDialog::FillInEmailSettings() m_xToNF->set_value(nCount); } -IMPL_LINK_NOARG(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, weld::Toggleable&, void) { bool bEnableFromTo = m_xFromRB->get_active(); m_xFromNF->set_sensitive(bEnableFromTo); @@ -463,7 +463,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, weld::ToggleBut m_xToNF->set_sensitive(bEnableFromTo); } -IMPL_LINK_NOARG(SwMMResultEmailDialog, CheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMMResultEmailDialog, CheckHdl, weld::Toggleable&, void) { bool bEnable = m_xPasswordCB->get_active(); @@ -471,7 +471,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, CheckHdl, weld::ToggleButton&, void) m_xPasswordLB->set_sensitive(bEnable); } -IMPL_LINK_NOARG(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, weld::Toggleable&, void) { bool bEnableFromTo = m_xFromRB->get_active(); m_xFromNF->set_sensitive(bEnableFromTo); @@ -479,7 +479,7 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, weld::ToggleBu m_xToNF->set_sensitive(bEnableFromTo); } -IMPL_LINK_NOARG(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, weld::Toggleable&, void) { bool bEnableFromTo = m_xFromRB->get_active(); m_xFromNF->set_sensitive(bEnableFromTo); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index dc02888cf0fb..afd6f1892474 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -425,7 +425,7 @@ IMPL_LINK_NOARG(SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBox&, void) UpdateIncludeBOMSensitiveState(); } -IMPL_LINK(SwAsciiFilterDlg, LineEndHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(SwAsciiFilterDlg, LineEndHdl, weld::Toggleable&, rBtn, void) { if (m_bSaveLineStatus) rBtn.save_state(); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 18c3d6f2476a..fd0d32801caa 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -398,7 +398,7 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh) bDontCheckPasswd = false; } -bool SwEditRegionDlg::CheckPasswd(weld::ToggleButton* pBox) +bool SwEditRegionDlg::CheckPasswd(weld::Toggleable* pBox) { if (bDontCheckPasswd) return true; @@ -799,7 +799,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, weld::Button&, void) } // Toggle protect -IMPL_LINK(SwEditRegionDlg, ChangeProtectHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwEditRegionDlg, ChangeProtectHdl, weld::Toggleable&, rButton, void) { if (!CheckPasswd(&rButton)) return; @@ -816,7 +816,7 @@ IMPL_LINK(SwEditRegionDlg, ChangeProtectHdl, weld::ToggleButton&, rButton, void) } // Toggle hide -IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, weld::Toggleable&, rButton, void) { if (!CheckPasswd(&rButton)) return; @@ -834,7 +834,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, weld::ToggleButton&, rButton, void) } // Toggle edit in readonly -IMPL_LINK(SwEditRegionDlg, ChangeEditInReadonlyHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwEditRegionDlg, ChangeEditInReadonlyHdl, weld::Toggleable&, rButton, void) { if (!CheckPasswd(&rButton)) return; @@ -920,7 +920,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl, weld::Button&, void) } // link CheckBox to file? -IMPL_LINK(SwEditRegionDlg, UseFileHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwEditRegionDlg, UseFileHdl, weld::Toggleable&, rButton, void) { if (!CheckPasswd(&rButton)) return; @@ -1131,7 +1131,7 @@ IMPL_LINK(SwEditRegionDlg, FileNameEntryHdl, weld::Entry&, rEdit, void) } } -IMPL_LINK(SwEditRegionDlg, DDEHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwEditRegionDlg, DDEHdl, weld::Toggleable&, rButton, void) { if (!CheckPasswd(&rButton)) return; @@ -1231,7 +1231,7 @@ void SwEditRegionDlg::ChangePasswd(bool bChange) }); } -IMPL_LINK_NOARG(SwEditRegionDlg, TogglePasswdHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwEditRegionDlg, TogglePasswdHdl, weld::Toggleable&, void) { ChangePasswd(false); } @@ -1593,14 +1593,14 @@ std::unique_ptr<SfxTabPage> SwInsertSectionTabPage::Create(weld::Container* pPag return std::make_unique<SwInsertSectionTabPage>(pPage, pController, *rAttrSet); } -IMPL_LINK(SwInsertSectionTabPage, ChangeHideHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwInsertSectionTabPage, ChangeHideHdl, weld::Toggleable&, rBox, void) { bool bHide = rBox.get_active(); m_xConditionED->set_sensitive(bHide); m_xConditionFT->set_sensitive(bHide); } -IMPL_LINK(SwInsertSectionTabPage, ChangeProtectHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwInsertSectionTabPage, ChangeProtectHdl, weld::Toggleable&, rBox, void) { bool bCheck = rBox.get_active(); m_xPasswdCB->set_sensitive(bCheck); @@ -1639,7 +1639,7 @@ void SwInsertSectionTabPage::ChangePasswd(bool bChange) m_aNewPasswd.realloc(0); } -IMPL_LINK_NOARG(SwInsertSectionTabPage, TogglePasswdHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwInsertSectionTabPage, TogglePasswdHdl, weld::Toggleable&, void) { ChangePasswd(false); } @@ -1657,7 +1657,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl, weld::ComboBox&, void) m_xCurName->find_text(aName) == -1); } -IMPL_LINK(SwInsertSectionTabPage, UseFileHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwInsertSectionTabPage, UseFileHdl, weld::Toggleable&, rButton, void) { if (rButton.get_active()) { @@ -1698,7 +1698,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl, weld::Button&, void) m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); } -IMPL_LINK( SwInsertSectionTabPage, DDEHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SwInsertSectionTabPage, DDEHdl, weld::Toggleable&, rButton, void ) { bool bDDE = rButton.get_active(); bool bFile = m_xFileCB->get_active(); @@ -1774,7 +1774,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(weld::Container* pPage, m_xFootnoteNumViewBox->Reload(SwInsertNumTypes::Extended); m_xEndNumViewBox->Reload(SwInsertNumTypes::Extended); - Link<weld::ToggleButton&,void> aLk( LINK( this, SwSectionFootnoteEndTabPage, FootEndHdl)); + Link<weld::Toggleable&,void> aLk( LINK( this, SwSectionFootnoteEndTabPage, FootEndHdl)); m_xFootnoteNtAtTextEndCB->connect_toggled( aLk ); m_xFootnoteNtNumCB->connect_toggled( aLk ); m_xEndNtAtTextEndCB->connect_toggled( aLk ); @@ -1931,7 +1931,7 @@ std::unique_ptr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( weld::Container return std::make_unique<SwSectionFootnoteEndTabPage>(pPage, pController, *rAttrSet); } -IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::ToggleButton&, rBox, void ) +IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::Toggleable&, rBox, void ) { bool bFoot = m_xFootnoteNtAtTextEndCB.get() == &rBox || m_xFootnoteNtNumCB.get() == &rBox || m_xFootnoteNtNumFormatCB.get() == &rBox ; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 121a523479c5..5e27412aca59 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl, weld::Button&, void) m_xAddrEdit->select_region(nStartPos, nEndPos); } -IMPL_LINK_NOARG(SwEnvPage, SenderHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwEnvPage, SenderHdl, weld::Toggleable&, void) { const bool bEnable = m_xSenderBox->get_active(); GetParentSwEnvDlg()->aEnvItem.m_bSend = bEnable; diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 43dd2f1a9b8d..a55ef0d526a2 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -76,7 +76,7 @@ SwEnvPrtPage::~SwEnvPrtPage() m_xPrt.clear(); } -IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, weld::Toggleable&, void) { // Envelope from bottom, otherwise Envelope from top const bool bLowerActive = m_xBottomButton->get_active(); @@ -84,7 +84,7 @@ IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, weld::ToggleButton&, void) m_xLower->set_visible(bLowerActive); } -IMPL_LINK(SwEnvPrtPage, LowerHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwEnvPrtPage, LowerHdl, weld::Toggleable&, rButton, void) { for (int i = ENV_HOR_LEFT; i <= ENV_VER_RGHT; ++i) { @@ -96,7 +96,7 @@ IMPL_LINK(SwEnvPrtPage, LowerHdl, weld::ToggleButton&, rButton, void) } } -IMPL_LINK(SwEnvPrtPage, UpperHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwEnvPrtPage, UpperHdl, weld::Toggleable&, rButton, void) { for (int i = ENV_HOR_LEFT; i <= ENV_VER_RGHT; ++i) { diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 4fde994f6eeb..078efa0995c4 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -45,9 +45,9 @@ class SwEnvPrtPage : public SfxTabPage VclPtr<Printer> m_xPrt; - DECL_LINK(LowerHdl, weld::ToggleButton&, void); - DECL_LINK(UpperHdl, weld::ToggleButton&, void); - DECL_LINK(ClickHdl, weld::ToggleButton&, void); + DECL_LINK(LowerHdl, weld::Toggleable&, void); + DECL_LINK(UpperHdl, weld::Toggleable&, void); + DECL_LINK(ClickHdl, weld::Toggleable&, void); DECL_LINK(ButtonHdl, weld::Button&, void); SwEnvDlg* GetParentSwEnvDlg() { return static_cast<SwEnvDlg*>(GetDialogController()); } diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 54cc0ff0a61f..31d2ffddd6be 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -280,7 +280,7 @@ void SwLabPage::SetToBusinessCard() m_xAddressFrame->hide(); }; -IMPL_LINK_NOARG(SwLabPage, AddrHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwLabPage, AddrHdl, weld::Toggleable&, void) { OUString aWriting; @@ -323,7 +323,7 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl, weld::Button&, void) m_xWritingEdit->select_region(nStartPos, nEndPos); } -IMPL_LINK_NOARG(SwLabPage, PageHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwLabPage, PageHdl, weld::Toggleable&, void) { MakeHdl(*m_xMakeBox); } diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index b145fa3187b2..893da83a9d7a 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -41,7 +41,7 @@ SwLabPrtPage::SwLabPrtPage(weld::Container* pPage, weld::DialogController* pCont SetExchangeSupport(); // Install handlers - Link<weld::ToggleButton&,void> aLk = LINK(this, SwLabPrtPage, CountHdl); + Link<weld::Toggleable&,void> aLk = LINK(this, SwLabPrtPage, CountHdl); m_xPageButton->connect_toggled(aLk); m_xSingleButton->connect_toggled(aLk); m_xPrtSetup->connect_clicked(LINK(this, SwLabPrtPage, PrtSetupHdl)); @@ -71,7 +71,7 @@ IMPL_LINK( SwLabPrtPage, PrtSetupHdl, weld::Button&, rButton, void ) m_xPrinterInfo->set_label(pPrinter->GetName()); } -IMPL_LINK(SwLabPrtPage, CountHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwLabPrtPage, CountHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 79b1e95f023f..de3cac2e4cfa 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -40,7 +40,7 @@ class SwLabPrtPage : public SfxTabPage std::unique_ptr<weld::Label> m_xPrinterInfo; std::unique_ptr<weld::Button> m_xPrtSetup; - DECL_LINK(CountHdl, weld::ToggleButton&, void); + DECL_LINK(CountHdl, weld::Toggleable&, void); DECL_LINK(PrtSetupHdl, weld::Button&, void); SwLabDlg* GetParentSwLabDlg() { return static_cast<SwLabDlg*>(GetDialogController()); } diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 19c570514a25..acd73a741757 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -354,7 +354,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, ButtonHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(SwMailMergeDlg, OutputTypeHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMailMergeDlg, OutputTypeHdl, weld::Toggleable&, void) { bool bPrint = m_xPrinterRB->get_active(); m_xSingleJobsCB->set_sensitive(bPrint); @@ -380,7 +380,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, OutputTypeHdl, weld::ToggleButton&, void) } } -IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::Toggleable&, void) { bool bIndividual = m_xSaveIndividualRB->get_active(); @@ -404,7 +404,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::ToggleButton&, void) } } -IMPL_LINK( SwMailMergeDlg, FilenameHdl, weld::ToggleButton&, rBox, void ) +IMPL_LINK( SwMailMergeDlg, FilenameHdl, weld::Toggleable&, rBox, void ) { bool bEnable = rBox.get_active(); m_xColumnFT->set_sensitive( bEnable ); diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index b4229e0c22c8..be438ecb82d4 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -44,10 +44,10 @@ class SwLabPage : public SfxTabPage std::unique_ptr<weld::ComboBox> m_xHiddenSortTypeBox; std::unique_ptr<weld::Label> m_xFormatInfo; - DECL_LINK(AddrHdl, weld::ToggleButton&, void); + DECL_LINK(AddrHdl, weld::Toggleable&, void); DECL_LINK(DatabaseHdl, weld::ComboBox&, void); DECL_LINK(FieldHdl, weld::Button&, void); - DECL_LINK(PageHdl, weld::ToggleButton&, void); + DECL_LINK(PageHdl, weld::Toggleable&, void); DECL_LINK(MakeHdl, weld::ComboBox&, void); DECL_LINK(TypeHdl, weld::ComboBox&, void); diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 4cd9f3a39c85..15f2544fa81a 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -53,7 +53,7 @@ SwJavaEditDialog::SwJavaEditDialog(weld::Window* pParent, SwWrtShell* pWrtSh) m_xNextBtn->connect_clicked( LINK( this, SwJavaEditDialog, NextHdl ) ); m_xOKBtn->connect_clicked( LINK( this, SwJavaEditDialog, OKHdl ) ); - Link<weld::ToggleButton&,void> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl); + Link<weld::Toggleable&,void> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl); m_xUrlRB->connect_toggled(aLk); m_xEditRB->connect_toggled(aLk); m_xUrlPB->connect_clicked(LINK(this, SwJavaEditDialog, InsertFileHdl)); @@ -197,7 +197,7 @@ bool SwJavaEditDialog::IsUpdate() const return m_pField && ( sal_uInt32(m_bIsUrl ? 1 : 0) != m_pField->GetFormat() || m_pField->GetPar2() != m_aType || m_pField->GetPar1() != m_aText ); } -IMPL_LINK(SwJavaEditDialog, RadioButtonHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwJavaEditDialog, RadioButtonHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 9dbe84c5e5f1..80a290a9bcc9 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1015,7 +1015,7 @@ IMPL_LINK(SwColumnPage, EdModify, weld::MetricSpinButton&, rEdit, void) // Handler behind the Checkbox for automatic width. When the box is checked // no explicit values for the column width can be entered. -IMPL_LINK(SwColumnPage, AutoWidthHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwColumnPage, AutoWidthHdl, weld::Toggleable&, rBox, void) { tools::Long nDist = static_cast< tools::Long >(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FieldUnit::TWIP))); m_xColMgr->SetCount(m_nCols, static_cast<sal_uInt16>(nDist)); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index e7c6b268ba2e..0708a639e6c7 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -696,7 +696,7 @@ SwFramePage::SwFramePage(weld::Container* pPage, weld::DialogController* pContro m_xAtVertPosED->connect_value_changed( aLk3 ); m_xFollowTextFlowCB->connect_toggled(LINK(this, SwFramePage, RangeModifyClickHdl)); - Link<weld::ToggleButton&,void> aLk2 = LINK(this, SwFramePage, AnchorTypeHdl); + Link<weld::Toggleable&,void> aLk2 = LINK(this, SwFramePage, AnchorTypeHdl); m_xAnchorAtPageRB->connect_toggled( aLk2 ); m_xAnchorAtParaRB->connect_toggled( aLk2 ); m_xAnchorAtCharRB->connect_toggled( aLk2 ); @@ -1716,13 +1716,13 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * _pSet) } // swap left/right with inside/outside -IMPL_LINK_NOARG(SwFramePage, MirrorHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFramePage, MirrorHdl, weld::Toggleable&, void) { RndStdIds eId = GetAnchor(); InitPos(eId, -1, 0, -1, 0, LONG_MAX, LONG_MAX); } -IMPL_LINK( SwFramePage, RelSizeClickHdl, weld::ToggleButton&, rBtn, void ) +IMPL_LINK( SwFramePage, RelSizeClickHdl, weld::Toggleable&, rBtn, void ) { if (&rBtn == m_xRelWidthCB.get()) { @@ -1748,7 +1748,7 @@ IMPL_LINK( SwFramePage, RelSizeClickHdl, weld::ToggleButton&, rBtn, void ) } // range check -IMPL_LINK_NOARG(SwFramePage, RangeModifyClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFramePage, RangeModifyClickHdl, weld::Toggleable&, void) { RangeModifyHdl(); } @@ -1873,7 +1873,7 @@ void SwFramePage::RangeModifyHdl() m_xAtVertPosED->set_value(m_xAtVertPosED->normalize(aVal.nVPos), FieldUnit::TWIP); } -IMPL_LINK_NOARG(SwFramePage, AnchorTypeHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFramePage, AnchorTypeHdl, weld::Toggleable&, void) { m_xMirrorPagesCB->set_sensitive(!m_xAnchorAsCharRB->get_active()); @@ -2036,13 +2036,13 @@ IMPL_LINK_NOARG(SwFramePage, RealSizeHdl, weld::Button&, void) UpdateExample(); } -IMPL_LINK_NOARG(SwFramePage, AutoWidthClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFramePage, AutoWidthClickHdl, weld::Toggleable&, void) { if( !IsInGraficMode() ) HandleAutoCB( m_xAutoWidthCB->get_active(), *m_xWidthFT, *m_xWidthAutoFT, *m_xWidthED->get() ); } -IMPL_LINK_NOARG(SwFramePage, AutoHeightClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFramePage, AutoHeightClickHdl, weld::Toggleable&, void) { if (!IsInGraficMode()) HandleAutoCB(m_xAutoHeightCB->get_active(), *m_xHeightFT, *m_xHeightAutoFT, *m_xWidthED->get()); @@ -2563,7 +2563,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, weld::Button&, void) } -IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl, weld::Toggleable&, void) { bool bEnable = m_xMirrorHorzBox->get_active(); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index bf4029269154..95df8eeb85d0 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -102,7 +102,7 @@ SwWrapTabPage::SwWrapTabPage(weld::Container* pPage, weld::DialogController* pCo m_xTopMarginED->connect_value_changed(aLk); m_xBottomMarginED->connect_value_changed(aLk); - Link<weld::ToggleButton&,void> aLk2 = LINK(this, SwWrapTabPage, WrapTypeHdl); + Link<weld::Toggleable&,void> aLk2 = LINK(this, SwWrapTabPage, WrapTypeHdl); m_xNoWrapRB->connect_toggled(aLk2); m_xWrapLeftRB->connect_toggled(aLk2); m_xWrapRightRB->connect_toggled(aLk2); @@ -580,7 +580,7 @@ IMPL_LINK(SwWrapTabPage, RangeModifyHdl, weld::MetricSpinButton&, rEdit, void) } } -IMPL_LINK_NOARG(SwWrapTabPage, WrapTypeHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwWrapTabPage, WrapTypeHdl, weld::Toggleable&, void) { bool bWrapThrough = m_xWrapThroughRB->get_active(); m_xWrapTransparentCB->set_sensitive(bWrapThrough && !m_bHtmlMode); @@ -594,7 +594,7 @@ IMPL_LINK_NOARG(SwWrapTabPage, WrapTypeHdl, weld::ToggleButton&, void) ContourHdl(*m_xWrapOutlineCB); } -IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, weld::Toggleable&, void) { bool bEnable = !(m_xWrapOutlineCB->get_active() && m_xWrapOutlineCB->get_sensitive()); diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 18151a810f99..72d86389ac8e 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -44,7 +44,7 @@ class SwMMResultSaveDialog : public SfxDialogController std::unique_ptr<weld::Button> m_xOKButton; DECL_LINK(SaveOutputHdl_Impl, weld::Button& , void); - DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void); public: SwMMResultSaveDialog(weld::Window* pParent); @@ -69,7 +69,7 @@ class SwMMResultPrintDialog : public SfxDialogController DECL_LINK(PrinterChangeHdl_Impl, weld::ComboBox&, void ); DECL_LINK(PrintHdl_Impl, weld::Button&, void); DECL_LINK(PrinterSetupHdl_Impl, weld::Button&, void ); - DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void); void FillInPrinterSettings(); @@ -110,8 +110,8 @@ class SwMMResultEmailDialog : public SfxDialogController DECL_LINK(SendTypeHdl_Impl, weld::ComboBox&, void); DECL_LINK(SendAsHdl_Impl, weld::Button&, void); DECL_LINK(SendDocumentsHdl_Impl, weld::Button&, void); - DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(CheckHdl, weld::ToggleButton&, void ); + DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void ); void FillInEmailSettings(); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5aceedce652b..71ed6cb64e2d 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -406,7 +406,7 @@ std::unique_ptr<SwTOXDescription> SwMultiTOXTabDialog::CreateTOXDescFromTOXBase( return pDesc; } -IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, weld::Toggleable&, void) { if (m_xShowExampleCB->get_active()) { @@ -765,7 +765,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage, weld::DialogContr m_xAutoMarkPB->connect_toggled(LINK(this, SwTOXSelectTabPage, MenuEnableHdl)); m_xAutoMarkPB->connect_selected(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl)); - Link<weld::ToggleButton&,void> aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl); + Link<weld::Toggleable&,void> aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl); m_xAddStylesCB->connect_toggled(aLk); m_xFromHeadingsCB->connect_toggled(aLk); m_xTOXMarksCB->connect_toggled(aLk); @@ -1252,7 +1252,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifySpinHdl, weld::SpinButton&, void) ModifyHdl(); } -IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, weld::Toggleable&, rButton, void) { SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetDialogController()); const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); @@ -1280,7 +1280,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, weld::ToggleButton&, rButton, void) ModifyHdl(); }; -IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl, weld::Toggleable&, void) { bool bEnable = m_xFromCaptionsRB->get_active(); m_xCaptionSequenceFT->set_sensitive(bEnable); @@ -1331,7 +1331,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, AddStylesHdl, weld::Button&, void) ModifyHdl(); } -IMPL_LINK_NOARG(SwTOXSelectTabPage, MenuEnableHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTOXSelectTabPage, MenuEnableHdl, weld::Toggleable&, void) { m_xAutoMarkPB->set_item_sensitive("edit", !sAutoMarkURL.isEmpty()); } @@ -1905,7 +1905,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage() m_xTokenWIN.reset(); } -IMPL_LINK_NOARG(SwTOXEntryTabPage, ModifyClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, ModifyClickHdl, weld::Toggleable&, void) { OnModify(true); } @@ -2281,7 +2281,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, weld::TreeView&, rBox, void) rBox.grab_focus(); } -IMPL_LINK_NOARG(SwTOXEntryTabPage, SortKeyHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTOXEntryTabPage, SortKeyHdl, weld::Toggleable&, void) { bool bEnable = m_xSortContentRB->get_active(); m_xSortKeyFrame->set_sensitive(bEnable); @@ -2493,7 +2493,7 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, weld::ComboBox&, rBox, void) ModifyHdl(nullptr); } -IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, weld::Toggleable&, rBox, void) { //the most right style::TabStop is usually right aligned SwTOXWidget* pCurCtrl = m_xTokenWIN->GetActiveControl(); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7b988a4cbec6..40e62f9b7d7b 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -666,7 +666,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, NewUserIdxHdl, weld::Button&, void) } } -IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, weld::Toggleable&, rBox, void) { const bool bEnable = rBox.get_active() && rBox.get_sensitive(); m_xSearchCaseWordOnlyCB->set_sensitive(bEnable); @@ -1091,7 +1091,7 @@ class SwCreateAuthEntryDlg_Impl : public weld::GenericDialogController DECL_LINK(ShortNameHdl, weld::Entry&, void); DECL_LINK(EnableHdl, weld::ComboBox&, void); DECL_LINK(BrowseHdl, weld::Button&, void); - DECL_LINK(PageNumHdl, weld::ToggleButton&, void); + DECL_LINK(PageNumHdl, weld::Toggleable&, void); public: SwCreateAuthEntryDlg_Impl(weld::Window* pParent, @@ -1373,7 +1373,7 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, weld::Button&, rButton, void) } } -IMPL_LINK_NOARG(SwAuthorMarkPane, ChangeSourceHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwAuthorMarkPane, ChangeSourceHdl, weld::Toggleable&, void) { bool bFromComp = m_xFromComponentRB->get_active(); bIsFromComponent = bFromComp; @@ -1856,7 +1856,7 @@ IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, BrowseHdl, weld::Button&, void) } }; -IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, PageNumHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, PageNumHdl, weld::Toggleable&, void) { if (m_xPageCB->get_active()) { diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 60c5d3737b23..1eeca19769c5 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -220,7 +220,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, InsertHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK(SwInsertBookmarkDlg, ChangeHideHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwInsertBookmarkDlg, ChangeHideHdl, weld::Toggleable&, rBox, void) { bool bHide = rBox.get_active(); m_xConditionED->set_sensitive(bHide); diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index af45f76e9bbe..dbc733d87d1e 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -257,7 +257,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) pSh->GetView().GetDocShell(), true); } -IMPL_LINK(SwEndNoteOptionPage, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwEndNoteOptionPage, ToggleHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index eb05d93a92a1..75da931ab6bc 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -411,7 +411,7 @@ IMPL_LINK( SwGlossaryDlg, NameDoubleClick, weld::TreeView&, rBox, bool ) return true; } -IMPL_LINK_NOARG( SwGlossaryDlg, EnableHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SwGlossaryDlg, EnableHdl, weld::Toggleable&, void ) { std::unique_ptr<weld::TreeIter> xEntry = m_xCategoryBox->make_iterator(); bool bEntry = m_xCategoryBox->get_selected(xEntry.get()); @@ -822,7 +822,7 @@ IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK(SwGlossaryDlg, CheckBoxHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwGlossaryDlg, CheckBoxHdl, weld::Toggleable&, rBox, void) { SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); bool bCheck = rBox.get_active(); diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 7b32c6677686..9119ff148022 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -56,7 +56,7 @@ class SwEndNoteOptionPage : public SfxTabPage inline void SelectNumbering(SwFootnoteNum eNum); SwFootnoteNum GetNumbering() const; - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(NumCountHdl, weld::ComboBox&, void); public: diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index ec3efba6bd32..a7b16b1e1868 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -74,7 +74,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl, weld::Entry&, void) m_xOkBtn->set_sensitive( !m_xNumberCharEdit->get_text().isEmpty() ); } -IMPL_LINK(SwInsFootNoteDlg, NumberToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwInsFootNoteDlg, NumberToggleHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index ec107202aba0..f04efd98bfe6 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -250,7 +250,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl, weld::Entry&, void) } // On/Off -IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, weld::Toggleable&, void) { bool bEnable = m_xNumberingOnCB->get_active(); m_xBodyContent->set_sensitive(bEnable); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index cb2cf60e95d6..df91dd6e6096 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -646,7 +646,7 @@ IMPL_LINK(SwNumPositionTabPage, DistanceHdl, weld::MetricSpinButton&, rField, vo m_xDistBorderMF->set_text(OUString()); } -IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::ToggleButton&, rBox, void ) +IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::Toggleable&, rBox, void ) { bool bOn = rBox.get_active(); bool bSingleSelection = m_xLevelLB->n_children() == 1 && USHRT_MAX != nActNumLvl; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 69e2887c1af2..8c03aef47a4e 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -206,7 +206,7 @@ IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl, weld::Button&, void) m_xDialog->response(RET_CANCEL); } -IMPL_LINK_NOARG(SwOutlineTabDialog, FormHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwOutlineTabDialog, FormHdl, weld::Toggleable&, void) { if (!m_xMenuButton->get_active()) return; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 51b41703a82c..608f54492b45 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -45,13 +45,13 @@ const sal_uInt16 SwFootNotePage::aPageRg[] = { // handler to switch between the different possibilities how the footnote // region's height can be set. -IMPL_LINK_NOARG(SwFootNotePage, HeightPage, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightPage, weld::Toggleable&, void) { if (m_xMaxHeightPageBtn->get_active()) m_xMaxHeightEdit->set_sensitive(false); } -IMPL_LINK_NOARG(SwFootNotePage, HeightMetric, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFootNotePage, HeightMetric, weld::Toggleable&, void) { if (m_xMaxHeightBtn->get_active()) { diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 19faefe56827..20a964eceaf7 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -76,7 +76,7 @@ SwTextGridPage::SwTextGridPage(weld::Container* pPage, weld::DialogController* p m_xRubySizeMF->connect_value_changed(aSizeLink); m_xCharWidthMF->connect_value_changed(aSizeLink); - Link<weld::ToggleButton&,void> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl); + Link<weld::Toggleable&,void> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl); m_xNoGridRB->connect_toggled(aGridTypeHdl); m_xLinesGridRB->connect_toggled(aGridTypeHdl); m_xCharsGridRB->connect_toggled(aGridTypeHdl); @@ -434,7 +434,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, weld::MetricSpinButton&, rField, v GridModifyHdl(); } -IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void) { bool bEnable = m_xNoGridRB.get() != &rButton; m_xLayoutFL->set_sensitive(bEnable); @@ -460,14 +460,14 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::ToggleButton&, rButton, void) GridModifyHdl(); } -IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, weld::Toggleable&, void) { bool bChecked = m_xDisplayCB->get_active(); m_xPrintCB->set_sensitive(bChecked); m_xPrintCB->set_active(bChecked); } -IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, weld::Toggleable&, void) { GridModifyHdl(); } diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 3e46ea05a1eb..5f03f9c6ea56 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -146,7 +146,7 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell) m_xColEdt3->set_accessible_name(m_xColLbl->get_label()); // initialise - Link<weld::ToggleButton&,void> aLk = LINK(this, SwSortDlg, CheckHdl); + Link<weld::Toggleable&,void> aLk = LINK(this, SwSortDlg, CheckHdl); m_xKeyCB1->connect_toggled( aLk ); m_xKeyCB2->connect_toggled( aLk ); m_xKeyCB3->connect_toggled( aLk ); @@ -314,7 +314,7 @@ void SwSortDlg::Apply() } } -IMPL_LINK( SwSortDlg, DelimHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SwSortDlg, DelimHdl, weld::Toggleable&, rButton, void ) { bool bEnable = &rButton == m_xDelimFreeRB.get() && m_xDelimFreeRB->get_sensitive(); m_xDelimEdt->set_sensitive( bEnable ); @@ -335,7 +335,7 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl, weld::Button&, void) } } -IMPL_LINK( SwSortDlg, CheckHdl, weld::ToggleButton&, rControl, void ) +IMPL_LINK( SwSortDlg, CheckHdl, weld::Toggleable&, rControl, void ) { if (&rControl == m_xRowRB.get()) { diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 33b7743d90e9..03a630a13a28 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -209,7 +209,7 @@ SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent) m_xDocumentStartRB->set_active(true); m_xPageStartNF->set_sensitive(false); m_xPageStartNF->set_value(lcl_GetCurrentPage(mrSh)); - Link<weld::ToggleButton&,void> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl); + Link<weld::Toggleable&,void> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl); m_xDocumentStartRB->connect_toggled(aStartPageHdl); m_xPageStartRB->connect_toggled(aStartPageHdl); @@ -235,17 +235,17 @@ IMPL_LINK_NOARG(SwTitlePageDlg, ValueChangeHdl, weld::SpinButton&, void) FillList(); } -IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl, weld::Toggleable&, void) { m_xRestartNumberingNF->set_sensitive(m_xRestartNumberingCB->get_active()); } -IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl, weld::Toggleable&, void) { m_xSetPageNumberNF->set_sensitive(m_xSetPageNumberCB->get_active()); } -IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl, weld::Toggleable&, void) { m_xPageStartNF->set_sensitive(m_xPageStartRB->get_active()); } diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index cd14678bf704..629b6c4f1607 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -138,7 +138,7 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) } m_xKeepColumn->save_state(); - Link<weld::ToggleButton&, void> aLk(LINK(this, SwConvertTableDlg, BtnHdl)); + Link<weld::Toggleable&, void> aLk(LINK(this, SwConvertTableDlg, BtnHdl)); m_xTabBtn->connect_toggled(aLk); m_xSemiBtn->connect_toggled(aLk); m_xParaBtn->connect_toggled(aLk); @@ -172,7 +172,7 @@ IMPL_LINK_NOARG(SwConvertTableDlg, AutoFormatHdl, weld::Button&, void) mxTAutoFormat = pDlg->FillAutoFormatOfIndex(); } -IMPL_LINK(SwConvertTableDlg, BtnHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SwConvertTableDlg, BtnHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; @@ -188,13 +188,13 @@ IMPL_LINK(SwConvertTableDlg, BtnHdl, weld::ToggleButton&, rButton, void) m_xOtherEd->set_sensitive(m_xOtherBtn->get_active()); } -IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl, weld::Toggleable&, void) { m_xRepeatHeaderCB->set_sensitive(m_xHeaderCB->get_active()); RepeatHeaderCheckBoxHdl(*m_xRepeatHeaderCB); } -IMPL_LINK_NOARG(SwConvertTableDlg, RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwConvertTableDlg, RepeatHeaderCheckBoxHdl, weld::Toggleable&, void) { bool bEnable = m_xHeaderCB->get_active() && m_xRepeatHeaderCB->get_active(); m_xRepeatRows->set_sensitive(bEnable); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 6ba513c4f2fb..6ace6f4bc10d 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -277,13 +277,13 @@ IMPL_LINK( SwInsTableDlg, ModifyRowCol, weld::Entry&, rEdit, void ) m_xRepeatHeaderNF->set_value(std::min(nEnteredValRepeatHeaderNF, nMax)); } -IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl, weld::Toggleable&, void) { m_xRepeatHeaderCB->set_sensitive(m_xHeaderCB->get_active()); RepeatHeaderCheckBoxHdl(*m_xRepeatHeaderCB); } -IMPL_LINK_NOARG(SwInsTableDlg, RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwInsTableDlg, RepeatHeaderCheckBoxHdl, weld::Toggleable&, void) { m_xRepeatGroup->set_sensitive(m_xHeaderCB->get_active() && m_xRepeatHeaderCB->get_active()); } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 6ab262e7eca1..836a3499f50e 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -128,7 +128,7 @@ void SwFormatTablePage::Init() m_xRightMF->SetMetricFieldMin(-999999); //handler - Link<weld::ToggleButton&,void> aLk2 = LINK( this, SwFormatTablePage, AutoClickHdl ); + Link<weld::Toggleable&,void> aLk2 = LINK( this, SwFormatTablePage, AutoClickHdl ); m_xFullBtn->connect_toggled( aLk2 ); m_xFreeBtn->connect_toggled( aLk2 ); m_xLeftBtn->connect_toggled( aLk2 ); @@ -146,7 +146,7 @@ void SwFormatTablePage::Init() m_xRelWidthCB->connect_toggled(LINK( this, SwFormatTablePage, RelWidthClickHdl )); } -IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::ToggleButton&, rBtn, void ) +IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::Toggleable&, rBtn, void ) { OSL_ENSURE(pTableData, "table data not available?"); bool bIsChecked = rBtn.get_active(); @@ -180,7 +180,7 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::ToggleButton&, rBtn, void bModified = true; } -IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::Toggleable&, void) { bool bRestore = true, bLeftEnable = false, @@ -873,7 +873,7 @@ void SwTableColumnPage::Init(bool bWeb) m_xUpBtn->connect_clicked(aClickLk); m_xDownBtn->connect_clicked(aClickLk); - Link<weld::ToggleButton&,void> aToggleLk = LINK(this, SwTableColumnPage, ModeHdl); + Link<weld::Toggleable&,void> aToggleLk = LINK(this, SwTableColumnPage, ModeHdl); m_xModifyTableCB->connect_toggled(aToggleLk); m_xProportionalCB->connect_toggled(aToggleLk); } @@ -916,7 +916,7 @@ IMPL_LINK(SwTableColumnPage, ValueChangedHdl, weld::MetricSpinButton&, rEdit, vo ModifyHdl(&rEdit); } -IMPL_LINK(SwTableColumnPage, ModeHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwTableColumnPage, ModeHdl, weld::Toggleable&, rBox, void) { const bool bCheck = rBox.get_active(); if (&rBox == m_xProportionalCB.get()) @@ -1636,7 +1636,7 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh) } } -IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::Toggleable&, void) { if (m_xPgBrkCB->get_active()) { @@ -1672,7 +1672,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::ToggleButton&, void) } } -IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, weld::Toggleable&, void) { bool bEnable = false; if (m_xPageCollCB->get_active() && m_xPageCollLB->get_count()) @@ -1692,7 +1692,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, weld::ToggleButton&, voi } } -IMPL_LINK_NOARG(SwTextFlowPage, PageBreakPosHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextFlowPage, PageBreakPosHdl_Impl, weld::Toggleable&, void) { if (!m_xPgBrkCB->get_active()) return; @@ -1720,7 +1720,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakPosHdl_Impl, weld::ToggleButton&, void) } } -IMPL_LINK_NOARG(SwTextFlowPage, PageBreakTypeHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextFlowPage, PageBreakTypeHdl_Impl, weld::Toggleable&, void) { if (m_xColBrkRB->get_active() || m_xPgBrkAfterRB->get_active()) { @@ -1734,17 +1734,17 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakTypeHdl_Impl, weld::ToggleButton&, void PageBreakPosHdl_Impl(*m_xPgBrkBeforeRB); } -IMPL_LINK_NOARG(SwTextFlowPage, PageNoClickHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextFlowPage, PageNoClickHdl_Impl, weld::Toggleable&, void) { m_xPageNoNF->set_sensitive(m_xPageNoCB->get_active()); } -IMPL_LINK(SwTextFlowPage, SplitHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SwTextFlowPage, SplitHdl_Impl, weld::Toggleable&, rBox, void) { m_xSplitRowCB->set_sensitive(rBox.get_active()); } -IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl, weld::Toggleable&, void) { m_xRepeatHeaderCombo->set_sensitive(m_xHeadLineCB->get_active()); } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 169d38f228cc..8dbc965e80ba 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -111,7 +111,7 @@ SwAutoFormatDlg::~SwAutoFormatDlg() void SwAutoFormatDlg::Init( const SwTableAutoFormat* pSelFormat ) { - Link<weld::ToggleButton&, void> aLk(LINK(this, SwAutoFormatDlg, CheckHdl)); + Link<weld::Toggleable&, void> aLk(LINK(this, SwAutoFormatDlg, CheckHdl)); m_xBtnBorder->connect_toggled(aLk); m_xBtnFont->connect_toggled(aLk); m_xBtnPattern->connect_toggled(aLk); @@ -176,7 +176,7 @@ std::unique_ptr<SwTableAutoFormat> SwAutoFormatDlg::FillAutoFormatOfIndex() cons } // Handler: -IMPL_LINK(SwAutoFormatDlg, CheckHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(SwAutoFormatDlg, CheckHdl, weld::Toggleable&, rBtn, void) { if (m_nIndex == 255) return; diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 482b1216f753..3f3ace7d801a 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -191,7 +191,7 @@ public: m_xWidget->set_active(bActive); } - void connect_toggled(const Link<weld::ToggleButton&, void>& rLink) + void connect_toggled(const Link<weld::Toggleable&, void>& rLink) { m_xWidget->connect_toggled(rLink); } @@ -212,7 +212,7 @@ class MMExcludeEntryController : public svt::ToolboxController, public lang::XSe { VclPtr<ExcludeCheckBox> m_xExcludeCheckbox; - DECL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::ToggleButton&, void); + DECL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::Toggleable&, void); public: explicit MMExcludeEntryController(const uno::Reference<uno::XComponentContext>& rContext) @@ -358,7 +358,7 @@ uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const un return VCLUnoHelper::GetInterface(m_xExcludeCheckbox); } -IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::ToggleButton&, rCheckbox, void) +IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::Toggleable&, rCheckbox, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem; diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index 48f848416ec6..1696f7e6d338 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -61,7 +61,7 @@ IMPL_LINK(SwAnnotationWin, SelectHdl, const OString&, rIdent, void) GrabFocusToDocument(); } -IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl, weld::Toggleable&, void) { if (!mxMenuButton->get_active()) return; diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 582ff2701933..6223d56057ae 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -450,7 +450,7 @@ void SwPageBreakWin::Fade( bool bFadeIn ) m_aFadeTimer.Start( ); } -IMPL_LINK(SwPageBreakWin, ToggleHdl, weld::ToggleButton&, rMenuButton, void) +IMPL_LINK(SwPageBreakWin, ToggleHdl, weld::Toggleable&, rMenuButton, void) { // hide on dropdown, draw fully unfaded if dropdown before fully faded in Fade(rMenuButton.get_active()); diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index c5cc9cd7774e..761a983eeb8b 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -54,7 +54,7 @@ public: private: DECL_LINK( FadeHandler, Timer *, void ); /// Hide the button when the menu is toggled closed, e.g by clicking outside - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(SelectHdl, const OString&, void); void PaintButton(); }; diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index c50d51956cd7..fc652fab3da3 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -44,7 +44,7 @@ class SwAsciiFilterDlg : public SfxDialogController std::unique_ptr<weld::CheckButton> m_xIncludeBOM_CB; DECL_LINK(CharSetSelHdl, weld::ComboBox&, void); - DECL_LINK(LineEndHdl, weld::ToggleButton&, void); + DECL_LINK(LineEndHdl, weld::Toggleable&, void); void SetCRLF(LineEnd eEnd); LineEnd GetCRLF() const; void SetIncludeBOM(bool bIncludeBOM); diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index 85f67e9c2981..2c3b81ffe69e 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -87,7 +87,7 @@ class SwInsertBookmarkDlg : public SfxDialogController DECL_LINK(SelectionChangedHdl, weld::TreeView&, void); DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); DECL_LINK(HeaderBarClick, int, void); - DECL_LINK(ChangeHideHdl, weld::ToggleButton&, void); + DECL_LINK(ChangeHideHdl, weld::Toggleable&, void); // Fill table with bookmarks void PopulateTable(); diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 9de8a9f4a366..8b021d0d6d1a 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -43,9 +43,9 @@ class SwBreakDlg : public weld::GenericDialogController bool bHtmlMode; - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(ChangeHdl, weld::ComboBox&, void); - DECL_LINK(PageNumHdl, weld::ToggleButton&, void); + DECL_LINK(PageNumHdl, weld::Toggleable&, void); DECL_LINK(PageNumModifyHdl, weld::SpinButton&, void); DECL_LINK(OkHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 2d883c2b4d17..e7c39cb7db90 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -140,7 +140,7 @@ class SwColumnPage : public SfxTabPage void ColModify(bool bForceColReset); DECL_LINK(GapModify, weld::MetricSpinButton&, void); DECL_LINK(EdModify, weld::MetricSpinButton&, void); - DECL_LINK(AutoWidthHdl, weld::ToggleButton&, void ); + DECL_LINK(AutoWidthHdl, weld::Toggleable&, void ); DECL_LINK(SetDefaultsHdl, ValueSet *, void); DECL_LINK(Up, weld::Button&, void); diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 19080ac7581e..867ae46ce21a 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -52,9 +52,9 @@ class SwConvertTableDlg : public SfxDialogController SwWrtShell* pShell; DECL_LINK(AutoFormatHdl, weld::Button&, void); - DECL_LINK(BtnHdl, weld::ToggleButton&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); - DECL_LINK(RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(BtnHdl, weld::Toggleable&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); + DECL_LINK(RepeatHeaderCheckBoxHdl, weld::Toggleable&, void); public: SwConvertTableDlg(SwView& rView, bool bToTable); diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 49d6fd9e39ea..3cd7a76a6b26 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -123,15 +123,15 @@ class SwInsertDBColAutoPilot : public SfxDialogController, public utl::ConfigIte std::unique_ptr<weld::Button> m_xPbTableFormat; std::unique_ptr<weld::Button> m_xPbTableAutofmt; - DECL_LINK( PageHdl, weld::ToggleButton&, void ); + DECL_LINK( PageHdl, weld::Toggleable&, void ); DECL_LINK( AutoFormatHdl, weld::Button&, void ); DECL_LINK( TableFormatHdl, weld::Button&, void ); - DECL_LINK( DBFormatHdl, weld::ToggleButton&, void ); + DECL_LINK( DBFormatHdl, weld::Toggleable&, void ); DECL_LINK( TableToFromHdl, weld::Button&, void ); DECL_LINK( TVSelectHdl, weld::TreeView&, void ); DECL_LINK( CBSelectHdl, weld::ComboBox&, void ); DECL_LINK( DblClickHdl, weld::TreeView&, bool ); - DECL_LINK( HeaderHdl, weld::ToggleButton&, void ); + DECL_LINK( HeaderHdl, weld::Toggleable&, void ); bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField ); virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 39479738cde8..bf02a7284b09 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -137,12 +137,12 @@ friend class SwDropCapsPict; void ModifyEntry(weld::Entry& rEdit); - DECL_LINK(ClickHdl, weld::ToggleButton&, void); + DECL_LINK(ClickHdl, weld::Toggleable&, void); DECL_LINK(MetricValueChangedHdl, weld::MetricSpinButton&, void); DECL_LINK(ValueChangedHdl, weld::SpinButton&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); DECL_LINK(SelectHdl, weld::ComboBox&, void); - DECL_LINK(WholeWordHdl, weld::ToggleButton&, void); + DECL_LINK(WholeWordHdl, weld::Toggleable&, void); static const sal_uInt16 aPageRg[]; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index ed23fb6b0f6a..00abb7ab2889 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -98,7 +98,7 @@ class SwEnvPage : public SfxTabPage DECL_LINK(DatabaseHdl, weld::ComboBox&, void); DECL_LINK(FieldHdl, weld::Button&, void); - DECL_LINK(SenderHdl, weld::ToggleButton&, void); + DECL_LINK(SenderHdl, weld::Toggleable&, void); void InitDatabaseBox(); diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 63d6e5bf1e78..831ce60933d1 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -126,9 +126,9 @@ class SwFramePage: public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - DECL_LINK(RangeModifyClickHdl, weld::ToggleButton&, void); + DECL_LINK(RangeModifyClickHdl, weld::Toggleable&, void); void RangeModifyHdl(); - DECL_LINK(AnchorTypeHdl, weld::ToggleButton&, void); + DECL_LINK(AnchorTypeHdl, weld::Toggleable&, void); DECL_LINK(PosHdl, weld::ComboBox&, void); DECL_LINK(RelHdl, weld::ComboBox&, void); void InitPos(RndStdIds eId, sal_Int16 nH, sal_Int16 nHRel, @@ -136,11 +136,11 @@ class SwFramePage: public SfxTabPage tools::Long nX, tools::Long nY); DECL_LINK(RealSizeHdl, weld::Button&, void); - DECL_LINK(RelSizeClickHdl, weld::ToggleButton&, void); - DECL_LINK(MirrorHdl, weld::ToggleButton&, void); + DECL_LINK(RelSizeClickHdl, weld::Toggleable&, void); + DECL_LINK(MirrorHdl, weld::Toggleable&, void); - DECL_LINK(AutoWidthClickHdl, weld::ToggleButton&, void); - DECL_LINK(AutoHeightClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoWidthClickHdl, weld::Toggleable&, void); + DECL_LINK(AutoHeightClickHdl, weld::Toggleable&, void); // update example void UpdateExample(); @@ -225,7 +225,7 @@ class SwGrfExtPage : public SfxTabPage std::unique_ptr<weld::Label> m_xLabelGraphicType; // handler for mirroring - DECL_LINK(MirrorHdl, weld::ToggleButton&, void); + DECL_LINK(MirrorHdl, weld::Toggleable&, void); DECL_LINK(BrowseHdl, weld::Button&, void); virtual void ActivatePage(const SfxItemSet& rSet) override; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index 4ac5b6c8e4ec..6427f04a5c34 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -84,11 +84,11 @@ class SwGlossaryDlg : public SfxDialogController DECL_LINK( NameDoubleClick, weld::TreeView&, bool ); DECL_LINK( GrpSelect, weld::TreeView&, void ); DECL_LINK( MenuHdl, const OString&, void ); - DECL_LINK( EnableHdl, weld::ToggleButton&, void ); + DECL_LINK( EnableHdl, weld::Toggleable&, void ); DECL_LINK( BibHdl, weld::Button&, void ); DECL_LINK( InsertHdl, weld::Button&, void ); DECL_LINK( PathHdl, weld::Button&, void ); - DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckBoxHdl, weld::Toggleable&, void ); DECL_LINK( PreviewLoadedHdl, SwOneExampleFrame&, void ); DECL_LINK( KeyInputHdl, const KeyEvent&, bool ); DECL_LINK( TextFilterHdl, OUString&, bool ); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index ac523457e343..bf0600bb73aa 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -49,7 +49,7 @@ class SwInsFootNoteDlg: public weld::GenericDialogController std::unique_ptr<weld::Button> m_xPrevBT; std::unique_ptr<weld::Button> m_xNextBT; - DECL_LINK(NumberToggleHdl, weld::ToggleButton&, void); + DECL_LINK(NumberToggleHdl, weld::Toggleable&, void); DECL_LINK(NumberEditHdl, weld::Entry&, void); DECL_LINK(NumberExtCharHdl, weld::Button&, void); DECL_LINK(NextPrevHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 3070dcccbd54..e802503c3fb2 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -71,8 +71,8 @@ class SwInsTableDlg : public SfxDialogController DECL_LINK(ModifyName, weld::Entry&, void); DECL_LINK(ModifyRowCol, weld::Entry&, void); DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); - DECL_LINK(RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); + DECL_LINK(RepeatHeaderCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(ModifyRepeatHeaderNF_Hdl, weld::SpinButton&, void); public: diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 74130d40284f..b71adfc18348 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -53,7 +53,7 @@ private: DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(PrevHdl, weld::Button&, void); DECL_LINK(NextHdl, weld::Button&, void); - DECL_LINK(RadioButtonHdl, weld::ToggleButton&, void); + DECL_LINK(RadioButtonHdl, weld::Toggleable&, void); DECL_LINK(InsertFileHdl, weld::Button&, void); DECL_LINK(DlgClosedHdl, sfx2::FileDialogHelper *, void); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index c05a8fe7d61c..d239e631992f 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -48,7 +48,7 @@ private: std::unique_ptr<weld::Widget> m_xNumIntervalFT; std::unique_ptr<weld::Widget> m_xNumRowsFT; DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(LineOnOffHdl, weld::ToggleButton&, void); + DECL_LINK(LineOnOffHdl, weld::Toggleable&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); public: diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index be6dfe137c15..e008a702ab46 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -42,10 +42,10 @@ class SwMailConfigPage : public SfxTabPage std::unique_ptr<weld::Button> m_xServerAuthenticationPB; std::unique_ptr<weld::Button> m_xTestPB; - DECL_LINK(ReplyToHdl, weld::ToggleButton&, void); + DECL_LINK(ReplyToHdl, weld::Toggleable&, void); DECL_LINK(AuthenticationHdl, weld::Button&, void); DECL_LINK(TestHdl, weld::Button&, void); - DECL_LINK(SecureHdl, weld::ToggleButton&, void); + DECL_LINK(SecureHdl, weld::Toggleable&, void); public: SwMailConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index f409c664ffe9..0eebc628618b 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -103,10 +103,10 @@ class SwMailMergeDlg : public SfxDialogController DECL_LINK( ButtonHdl, weld::Button&, void ); DECL_LINK( InsertPathHdl, weld::Button&, void ); - DECL_LINK( OutputTypeHdl, weld::ToggleButton&, void ); - DECL_LINK( FilenameHdl, weld::ToggleButton&, void ); + DECL_LINK( OutputTypeHdl, weld::Toggleable&, void ); + DECL_LINK( FilenameHdl, weld::Toggleable&, void ); DECL_LINK( ModifyHdl, weld::SpinButton&, void ); - DECL_LINK( SaveTypeHdl, weld::ToggleButton&, void ); + DECL_LINK( SaveTypeHdl, weld::Toggleable&, void ); DECL_LINK( FileFormatHdl, weld::ComboBox&, void ); bool ExecQryShell(); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 9d536066915c..ff4d1e7671b7 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -79,7 +79,7 @@ class SwNumPositionTabPage : public SfxTabPage DECL_LINK(LevelHdl, weld::TreeView&, void); DECL_LINK(EditModifyHdl, weld::ComboBox&, void); DECL_LINK(DistanceHdl, weld::MetricSpinButton&, void); - DECL_LINK(RelativeHdl, weld::ToggleButton&, void); + DECL_LINK(RelativeHdl, weld::Toggleable&, void); DECL_LINK(StandardHdl, weld::Button&, void); void InitPosAndSpaceMode(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 1589220e6b8b..db67c1358ab2 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -50,9 +50,9 @@ class SwParagraphNumTabPage final : public SfxTabPage std::unique_ptr<weld::Widget> m_xRestartBX; std::unique_ptr<weld::SpinButton> m_xRestartNF; - DECL_LINK(NewStartHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(NewStartHdl_Impl, weld::Toggleable&, void); DECL_LINK(StyleHdl_Impl, weld::ComboBox&,void); - DECL_LINK(LineCountHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(LineCountHdl_Impl, weld::Toggleable&, void); DECL_LINK(EditNumStyleHdl_Impl, weld::Button&, void); DECL_LINK(EditNumStyleSelectHdl_Impl, weld::ComboBox&, void); diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 4f8b8c23ca2b..931156795eb8 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -77,7 +77,7 @@ private: std::unique_ptr<weld::SpinButton> m_xStandardizedPageSizeNF; DECL_LINK(MetricHdl, weld::ComboBox&, void); - DECL_LINK(StandardizedPageCountCheckHdl, weld::ToggleButton&, void); + DECL_LINK(StandardizedPageCountCheckHdl, weld::Toggleable&, void); public: SwLoadOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 8ca8bf3fc55b..dfd0e4d4bf85 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -61,8 +61,8 @@ class SwContentOptPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xFieldHiddenCB; std::unique_ptr<weld::CheckButton> m_xFieldHiddenParaCB; - DECL_LINK(VertRulerHdl, weld::ToggleButton&, void); - DECL_LINK(ShowOutlineContentVisibilityButtonHdl, weld::ToggleButton&, void); + DECL_LINK(VertRulerHdl, weld::Toggleable&, void); + DECL_LINK(ShowOutlineContentVisibilityButtonHdl, weld::Toggleable&, void); public: SwContentOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwContentOptPage() override; @@ -104,7 +104,7 @@ class SwAddPrinterTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xPaperFromSetupCB; std::unique_ptr<weld::ComboBox> m_xFaxLB; - DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoClickHdl, weld::Toggleable&, void); DECL_LINK(SelectHdl, weld::ComboBox&, void); public: @@ -205,7 +205,7 @@ class SwTableOptionsTabPage : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xFixPropRB; std::unique_ptr<weld::RadioButton> m_xVarRB; - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); public: SwTableOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -362,7 +362,7 @@ private: std::unique_ptr<weld::CheckButton> m_xTest10CBox; void Init(); - DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoClickHdl, weld::Toggleable&, void); }; #endif // DBG_UTIL @@ -376,8 +376,8 @@ class SwCompareOptionsTabPage : public SfxTabPage std::unique_ptr<weld::SpinButton> m_xLenNF; std::unique_ptr<weld::CheckButton> m_xStoreRsidCB; - DECL_LINK(ComparisonHdl, weld::ToggleButton&, void); - DECL_LINK(IgnoreHdl, weld::ToggleButton&, void); + DECL_LINK(ComparisonHdl, weld::Toggleable&, void); + DECL_LINK(IgnoreHdl, weld::Toggleable&, void); public: SwCompareOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index d1e1b2915b7d..17b9568bac23 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -45,7 +45,7 @@ class SwOutlineTabDialog final : public SfxTabDialogController std::unique_ptr<weld::MenuButton> m_xMenuButton; DECL_LINK(CancelHdl, weld::Button&, void); - DECL_LINK(FormHdl, weld::ToggleButton&, void); + DECL_LINK(FormHdl, weld::Toggleable&, void); DECL_LINK(MenuSelectHdl, const OString&, void); virtual void PageCreated(const OString& rPageId, SfxTabPage& rPage) override; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index c67c2f6a5b62..1bf5bd63fa81 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -52,8 +52,8 @@ private: std::unique_ptr<weld::MetricSpinButton> m_xLineLengthEdit; std::unique_ptr<weld::MetricSpinButton> m_xLineDistEdit; - DECL_LINK(HeightPage, weld::ToggleButton&, void); - DECL_LINK(HeightMetric, weld::ToggleButton&, void); + DECL_LINK(HeightPage, weld::Toggleable&, void); + DECL_LINK(HeightMetric, weld::Toggleable&, void); DECL_LINK(HeightModify, weld::MetricSpinButton&, void); DECL_LINK(LineWidthChanged_Impl, weld::MetricSpinButton&, void); DECL_LINK(LineColorSelected_Impl, ColorListBox&, void); diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index a43aee7b4686..a714abff7fd4 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -65,12 +65,12 @@ class SwTextGridPage: public SfxTabPage void GridModifyHdl(); - DECL_LINK(GridTypeHdl, weld::ToggleButton&, void); + DECL_LINK(GridTypeHdl, weld::Toggleable&, void); DECL_LINK(CharorLineChangedHdl, weld::SpinButton&, void); DECL_LINK(TextSizeChangedHdl, weld::MetricSpinButton&, void); DECL_LINK(ColorModifyHdl, ColorListBox&, void); - DECL_LINK(GridModifyClickHdl, weld::ToggleButton&, void); - DECL_LINK(DisplayGridHdl, weld::ToggleButton&, void); + DECL_LINK(GridModifyClickHdl, weld::Toggleable&, void); + DECL_LINK(DisplayGridHdl, weld::Toggleable&, void); public: SwTextGridPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index a16fc1b93f5e..fb959c521d1e 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -88,23 +88,23 @@ class SwEditRegionDlg : public SfxDialogController DECL_LINK( ConditionEditHdl, weld::Entry&, void ); void ChangePasswd(bool bChange); - DECL_LINK( TogglePasswdHdl, weld::ToggleButton&, void ); + DECL_LINK( TogglePasswdHdl, weld::Toggleable&, void ); DECL_LINK( ChangePasswdHdl, weld::Button&, void ); - DECL_LINK( ChangeProtectHdl, weld::ToggleButton&, void ); - DECL_LINK( ChangeHideHdl, weld::ToggleButton&, void ); + DECL_LINK( ChangeProtectHdl, weld::Toggleable&, void ); + DECL_LINK( ChangeHideHdl, weld::Toggleable&, void ); // #114856# edit in readonly sections - DECL_LINK( ChangeEditInReadonlyHdl, weld::ToggleButton&, void ); + DECL_LINK( ChangeEditInReadonlyHdl, weld::Toggleable&, void ); DECL_LINK( ChangeDismissHdl, weld::Button&, void); - DECL_LINK( UseFileHdl, weld::ToggleButton&, void ); + DECL_LINK( UseFileHdl, weld::Toggleable&, void ); DECL_LINK( FileSearchHdl, weld::Button&, void ); DECL_LINK( OptionsHdl, weld::Button&, void ); DECL_LINK( FileNameComboBoxHdl, weld::ComboBox&, void ); DECL_LINK( FileNameEntryHdl, weld::Entry&, void ); - DECL_LINK( DDEHdl, weld::ToggleButton&, void ); + DECL_LINK( DDEHdl, weld::Toggleable&, void ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); DECL_LINK( SubRegionEventHdl, weld::ComboBox&, void ); - bool CheckPasswd(weld::ToggleButton* pBox = nullptr); + bool CheckPasswd(weld::Toggleable* pBox = nullptr); public: SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh); @@ -145,14 +145,14 @@ class SwInsertSectionTabPage : public SfxTabPage void ChangePasswd(bool bChange); - DECL_LINK( ChangeHideHdl, weld::ToggleButton&, void ); - DECL_LINK( ChangeProtectHdl, weld::ToggleButton&, void ); + DECL_LINK( ChangeHideHdl, weld::Toggleable&, void ); + DECL_LINK( ChangeProtectHdl, weld::Toggleable&, void ); DECL_LINK( ChangePasswdHdl, weld::Button&, void ); - DECL_LINK( TogglePasswdHdl, weld::ToggleButton&, void ); + DECL_LINK( TogglePasswdHdl, weld::Toggleable&, void ); DECL_LINK( NameEditHdl, weld::ComboBox&, void ); - DECL_LINK( UseFileHdl, weld::ToggleButton&, void ); + DECL_LINK( UseFileHdl, weld::Toggleable&, void ); DECL_LINK( FileSearchHdl, weld::Button&, void ); - DECL_LINK( DDEHdl, weld::ToggleButton&, void ); + DECL_LINK( DDEHdl, weld::Toggleable&, void ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); public: @@ -191,7 +191,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage std::unique_ptr<weld::Label> m_xEndSuffixFT; std::unique_ptr<weld::Entry> m_xEndSuffixED; - DECL_LINK(FootEndHdl, weld::ToggleButton&, void); + DECL_LINK(FootEndHdl, weld::Toggleable&, void); void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& ); public: diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index e47a974e40ee..2e3a6a137088 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -73,8 +73,8 @@ class SwSortDlg : public weld::GenericDialogController void Apply(); sal_Unicode GetDelimChar() const; - DECL_LINK(CheckHdl, weld::ToggleButton&, void); - DECL_LINK(DelimHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); + DECL_LINK(DelimHdl, weld::Toggleable&, void); DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); void LanguageHdl(weld::ComboBox const*); DECL_LINK(DelimCharHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 16756594f82b..5afa438eb5a1 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -84,7 +84,7 @@ class SwMultiTOXTabDialog : public SfxTabDialogController std::unique_ptr<SwTOXDescription> CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK(CreateExample_Hdl, SwOneExampleFrame&, void); - DECL_LINK(ShowPreviewHdl, weld::ToggleButton&, void); + DECL_LINK(ShowPreviewHdl, weld::Toggleable&, void); public: SwMultiTOXTabDialog(weld::Widget* pParent, const SfxItemSet& rSet, @@ -190,12 +190,12 @@ class SwTOXSelectTabPage : public SfxTabPage DECL_LINK(TOXTypeHdl, weld::ComboBox&, void ); DECL_LINK(AddStylesHdl, weld::Button&, void ); - DECL_LINK(MenuEnableHdl, weld::ToggleButton&, void); + DECL_LINK(MenuEnableHdl, weld::Toggleable&, void); DECL_LINK(MenuExecuteHdl, const OString&, void); DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); void LanguageHdl(const weld::ComboBox*); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void ); - DECL_LINK(RadioButtonHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void ); + DECL_LINK(RadioButtonHdl, weld::Toggleable&, void); DECL_LINK(ModifyEntryHdl, weld::Entry&, void); DECL_LINK(ModifySpinHdl, weld::SpinButton&, void); DECL_LINK(ModifyListBoxHdl, weld::ComboBox&, void); @@ -364,12 +364,12 @@ class SwTOXEntryTabPage : public SfxTabPage DECL_LINK(EditStyleHdl, weld::Button&, void); DECL_LINK(InsertTokenHdl, weld::Button&, void); DECL_LINK(LevelHdl, weld::TreeView&, void); - DECL_LINK(AutoRightHdl, weld::ToggleButton&, void); + DECL_LINK(AutoRightHdl, weld::Toggleable&, void); DECL_LINK(TokenSelectedHdl, SwFormToken&, void); DECL_LINK(TabPosHdl, weld::MetricSpinButton&, void); DECL_LINK(FillCharHdl, weld::ComboBox&, void); DECL_LINK(RemoveInsertAuthHdl, weld::Button&, void); - DECL_LINK(SortKeyHdl, weld::ToggleButton&, void); + DECL_LINK(SortKeyHdl, weld::Toggleable&, void); DECL_LINK(ChapterInfoHdl, weld::ComboBox&, void); DECL_LINK(ChapterInfoOutlineHdl, weld::SpinButton&, void); DECL_LINK(NumberFormatHdl, weld::ComboBox&, void); @@ -380,7 +380,7 @@ class SwTOXEntryTabPage : public SfxTabPage void UpdateDescriptor(); DECL_LINK(ModifyHdl, LinkParamNone*, void); void OnModify(bool bAllLevels); - DECL_LINK(ModifyClickHdl, weld::ToggleButton&, void); + DECL_LINK(ModifyClickHdl, weld::Toggleable&, void); public: SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index ee738021fc13..617425c6def8 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -106,7 +106,7 @@ class SwIndexMarkPane void ModifyHdl(const weld::Widget& rWidget); DECL_LINK( KeyDCBModifyHdl, weld::ComboBox&, void ); DECL_LINK( NewUserIdxHdl, weld::Button&, void ); - DECL_LINK( SearchTypeHdl, weld::ToggleButton&, void ); + DECL_LINK( SearchTypeHdl, weld::Toggleable&, void ); DECL_LINK( PhoneticEDModifyHdl, weld::Entry&, void ); //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' @@ -194,7 +194,7 @@ class SwAuthorMarkPane DECL_LINK(CloseHdl, weld::Button&, void); DECL_LINK(CreateEntryHdl, weld::Button&, void); DECL_LINK(CompEntryHdl, weld::ComboBox&, void); - DECL_LINK(ChangeSourceHdl, weld::ToggleButton&, void); + DECL_LINK(ChangeSourceHdl, weld::Toggleable&, void); DECL_LINK(IsEditAllowedHdl, weld::Entry&, bool); DECL_LINK(IsEntryAllowedHdl, weld::Entry&, bool); DECL_LINK(EditModifyHdl, weld::Entry&, void); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 8438e5701049..f5ea72206dad 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -67,7 +67,7 @@ class SwAutoFormatDlg : public SfxDialogController void Init( const SwTableAutoFormat* pSelFormat ); void UpdateChecks( const SwTableAutoFormat&, bool bEnableBtn ); - DECL_LINK(CheckHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); DECL_LINK(AddHdl, weld::Button&, void); DECL_LINK(RemoveHdl, weld::Button&, void); DECL_LINK(RenameHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index f6b1456a01a0..c37def2e3e41 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -51,10 +51,10 @@ private: DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(EditHdl, weld::Button&, void); - DECL_LINK(RestartNumberingHdl, weld::ToggleButton&, void); - DECL_LINK(SetPageNumberHdl, weld::ToggleButton&, void); + DECL_LINK(RestartNumberingHdl, weld::Toggleable&, void); + DECL_LINK(SetPageNumberHdl, weld::Toggleable&, void); DECL_LINK(ValueChangeHdl, weld::SpinButton&, void); - DECL_LINK(StartPageHdl, weld::ToggleButton&, void); + DECL_LINK(StartPageHdl, weld::Toggleable&, void); public: SwTitlePageDlg(weld::Window* pParent); diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 6ea3e192e6f3..6588bd359953 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -79,8 +79,8 @@ class SwWrapTabPage: public SfxTabPage virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; DECL_LINK(RangeModifyHdl, weld::MetricSpinButton&, void); - DECL_LINK(WrapTypeHdl, weld::ToggleButton&, void); - DECL_LINK(ContourHdl, weld::ToggleButton&, void); + DECL_LINK(WrapTypeHdl, weld::Toggleable&, void); + DECL_LINK(ContourHdl, weld::Toggleable&, void); static const sal_uInt16 m_aWrapPageRg[]; diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index c85969e29168..fe039942d5b9 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -246,7 +246,7 @@ void PageFooterPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, weld::Toggleable&, void ) { bool IsChecked = mxFooterToggle->get_active(); mpFooterItem->SetValue(IsChecked); diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index aa67de6e760d..33294bf5fbb5 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -88,7 +88,7 @@ private: static FieldUnit GetCurrentUnit(SfxItemState eState, const SfxPoolItem* pState); - DECL_LINK( FooterToggleHdl, weld::ToggleButton&, void ); + DECL_LINK( FooterToggleHdl, weld::Toggleable&, void ); DECL_LINK( FooterLRMarginHdl, weld::ComboBox&, void); DECL_LINK( FooterSpacingHdl, weld::ComboBox&, void); DECL_LINK( FooterLayoutHdl, weld::ComboBox&, void); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx index 9f7cd0b795d6..339d9c2ccc9f 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx @@ -249,7 +249,7 @@ void PageHeaderPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, weld::Toggleable&, void ) { bool IsChecked = mxHeaderToggle->get_active(); mpHeaderItem->SetValue(IsChecked); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index bffc5d992b75..589c959eaafc 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -87,7 +87,7 @@ private: static FieldUnit GetCurrentUnit(SfxItemState eState, const SfxPoolItem* pState); - DECL_LINK( HeaderToggleHdl, weld::ToggleButton&, void ); + DECL_LINK( HeaderToggleHdl, weld::Toggleable&, void ); DECL_LINK( HeaderLRMarginHdl, weld::ComboBox&, void); DECL_LINK( HeaderSpacingHdl, weld::ComboBox&, void); DECL_LINK( HeaderLayoutHdl, weld::ComboBox&, void); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 4c1171dd72eb..7c3a4ceea816 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -71,8 +71,8 @@ class SwFormatTablePage : public SfxTabPage void Init(); void ModifyHdl(const weld::MetricSpinButton& rEdit, bool bAllowInconsistencies = false); - DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); - DECL_LINK(RelWidthClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoClickHdl, weld::Toggleable&, void); + DECL_LINK(RelWidthClickHdl, weld::Toggleable&, void); void RightModify(); DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void); @@ -120,7 +120,7 @@ class SwTableColumnPage : public SfxTabPage DECL_LINK(AutoClickHdl, weld::Button&, void); void ModifyHdl(const weld::MetricSpinButton* pEdit); DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void); - DECL_LINK(ModeHdl, weld::ToggleButton&, void); + DECL_LINK(ModeHdl, weld::Toggleable&, void); void UpdateCols( sal_uInt16 nCurrentPos ); SwTwips GetVisibleWidth(sal_uInt16 nPos); void SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth); @@ -162,13 +162,13 @@ class SwTextFlowPage : public SfxTabPage std::unique_ptr<weld::ComboBox> m_xTextDirectionLB; std::unique_ptr<weld::ComboBox> m_xVertOrientLB; - DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(PageBreakPosHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(PageBreakTypeHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(PageNoClickHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(SplitHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(HeadLineCBClickHdl, weld::ToggleButton&, void); + DECL_LINK(PageBreakHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ApplyCollClickHdl_Impl, weld::Toggleable&, void); + DECL_LINK(PageBreakPosHdl_Impl, weld::Toggleable&, void); + DECL_LINK(PageBreakTypeHdl_Impl, weld::Toggleable&, void); + DECL_LINK(PageNoClickHdl_Impl, weld::Toggleable&, void); + DECL_LINK(SplitHdl_Impl, weld::Toggleable&, void); + DECL_LINK(HeadLineCBClickHdl, weld::Toggleable&, void); public: SwTextFlowPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); |