[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source formula/source fpicker/source include/editeng include/sfx2 include/svtools include/svx include/vcl reportdesign/source sc/source sd/source sfx2/inc sfx2/source starmath/inc starmath/source svtools/source svx/inc svx/source sw/inc sw/source uui/source vcl/inc vcl/jsdialog vcl/source vcl/unx xmlsecurity/inc xmlsecurity/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri May 21 16:21:07 UTC 2021


 basctl/source/basicide/brkdlg.cxx                                     |    2 
 basctl/source/basicide/brkdlg.hxx                                     |    2 
 chart2/source/controller/dialogs/ChartResourceGroups.cxx              |    8 
 chart2/source/controller/dialogs/res_DataLabel.cxx                    |    2 
 chart2/source/controller/dialogs/res_DataLabel.hxx                    |    2 
 chart2/source/controller/dialogs/res_ErrorBar.cxx                     |    6 
 chart2/source/controller/dialogs/res_LegendPosition.cxx               |    4 
 chart2/source/controller/dialogs/res_Trendline.cxx                    |    6 
 chart2/source/controller/dialogs/res_Trendline.hxx                    |    6 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx            |    4 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx            |    4 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx              |    4 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx              |    4 
 chart2/source/controller/dialogs/tp_AxisLabel.cxx                     |    4 
 chart2/source/controller/dialogs/tp_AxisLabel.hxx                     |    4 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx                  |    4 
 chart2/source/controller/dialogs/tp_RangeChooser.hxx                  |    4 
 chart2/source/controller/dialogs/tp_Scale.cxx                         |    2 
 chart2/source/controller/dialogs/tp_Scale.hxx                         |    2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx                  |    2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx                  |    2 
 chart2/source/controller/dialogs/tp_TitleRotation.cxx                 |    2 
 chart2/source/controller/dialogs/tp_TitleRotation.hxx                 |    2 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx       |    2 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx       |    2 
 chart2/source/controller/inc/res_ErrorBar.hxx                         |    8 
 chart2/source/controller/inc/res_LegendPosition.hxx                   |    6 
 chart2/source/controller/sidebar/ChartAxisPanel.cxx                   |    4 
 chart2/source/controller/sidebar/ChartAxisPanel.hxx                   |    2 
 chart2/source/controller/sidebar/ChartElementsPanel.cxx               |    4 
 chart2/source/controller/sidebar/ChartElementsPanel.hxx               |    2 
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx               |    4 
 chart2/source/controller/sidebar/ChartErrorBarPanel.hxx               |    2 
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx                 |    8 
 chart2/source/controller/sidebar/ChartSeriesPanel.hxx                 |    4 
 chart2/source/inc/ChartResourceGroups.hxx                             |    8 
 cui/source/customize/acccfg.cxx                                       |    2 
 cui/source/dialogs/FontFeaturesDialog.cxx                             |    4 
 cui/source/dialogs/SpellDialog.cxx                                    |    2 
 cui/source/dialogs/colorpicker.cxx                                    |    6 
 cui/source/dialogs/cuifmsearch.cxx                                    |    6 
 cui/source/dialogs/cuigaldlg.cxx                                      |    2 
 cui/source/dialogs/cuigrfflt.cxx                                      |    4 
 cui/source/dialogs/hangulhanjadlg.cxx                                 |   10 
 cui/source/dialogs/hlinettp.cxx                                       |    6 
 cui/source/dialogs/insdlg.cxx                                         |    8 
 cui/source/dialogs/linkdlg.cxx                                        |    2 
 cui/source/dialogs/passwdomdlg.cxx                                    |    2 
 cui/source/dialogs/splitcelldlg.cxx                                   |    2 
 cui/source/dialogs/toolbarmodedlg.cxx                                 |    4 
 cui/source/dialogs/zoom.cxx                                           |   12 
 cui/source/factory/dlgfact.cxx                                        |    4 
 cui/source/factory/dlgfact.hxx                                        |    4 
 cui/source/inc/FontFeaturesDialog.hxx                                 |    2 
 cui/source/inc/SpellDialog.hxx                                        |    2 
 cui/source/inc/acccfg.hxx                                             |    2 
 cui/source/inc/align.hxx                                              |   10 
 cui/source/inc/autocdlg.hxx                                           |    4 
 cui/source/inc/border.hxx                                             |    4 
 cui/source/inc/chardlg.hxx                                            |   18 -
 cui/source/inc/cuifmsearch.hxx                                        |    6 
 cui/source/inc/cuigaldlg.hxx                                          |    2 
 cui/source/inc/cuigrfflt.hxx                                          |    4 
 cui/source/inc/cuitabarea.hxx                                         |   44 +-
 cui/source/inc/cuitabline.hxx                                         |   12 
 cui/source/inc/hangulhanjadlg.hxx                                     |   10 
 cui/source/inc/hlinettp.hxx                                           |    4 
 cui/source/inc/insdlg.hxx                                             |    4 
 cui/source/inc/labdlg.hxx                                             |    2 
 cui/source/inc/linkdlg.hxx                                            |    2 
 cui/source/inc/measure.hxx                                            |    4 
 cui/source/inc/numfmt.hxx                                             |    4 
 cui/source/inc/numpages.hxx                                           |    8 
 cui/source/inc/optasian.hxx                                           |    2 
 cui/source/inc/page.hxx                                               |    6 
 cui/source/inc/paragrph.hxx                                           |   20 -
 cui/source/inc/passwdomdlg.hxx                                        |    2 
 cui/source/inc/splitcelldlg.hxx                                       |    2 
 cui/source/inc/swpossizetabpage.hxx                                   |    8 
 cui/source/inc/tabstpge.hxx                                           |    4 
 cui/source/inc/textanim.hxx                                           |    6 
 cui/source/inc/textattr.hxx                                           |    4 
 cui/source/inc/toolbarmodedlg.hxx                                     |    2 
 cui/source/inc/transfrm.hxx                                           |    8 
 cui/source/inc/zoom.hxx                                               |    6 
 cui/source/options/connpooloptions.cxx                                |    2 
 cui/source/options/connpooloptions.hxx                                |    2 
 cui/source/options/fontsubs.cxx                                       |    4 
 cui/source/options/fontsubs.hxx                                       |    4 
 cui/source/options/optasian.cxx                                       |    2 
 cui/source/options/optcolor.cxx                                       |   24 -
 cui/source/options/optctl.cxx                                         |    2 
 cui/source/options/optctl.hxx                                         |    2 
 cui/source/options/optfltr.cxx                                        |    4 
 cui/source/options/optfltr.hxx                                        |    4 
 cui/source/options/optgdlg.cxx                                        |    8 
 cui/source/options/optgdlg.hxx                                        |    6 
 cui/source/options/opthtml.cxx                                        |    2 
 cui/source/options/opthtml.hxx                                        |    2 
 cui/source/options/optinet2.cxx                                       |    4 
 cui/source/options/optinet2.hxx                                       |    4 
 cui/source/options/optjava.cxx                                        |    2 
 cui/source/options/optjava.hxx                                        |    2 
 cui/source/options/optsave.cxx                                        |    2 
 cui/source/options/optsave.hxx                                        |    2 
 cui/source/options/optupdt.cxx                                        |    4 
 cui/source/options/optupdt.hxx                                        |    4 
 cui/source/tabpages/align.cxx                                         |   10 
 cui/source/tabpages/autocdlg.cxx                                      |    4 
 cui/source/tabpages/border.cxx                                        |    4 
 cui/source/tabpages/chardlg.cxx                                       |   20 -
 cui/source/tabpages/labdlg.cxx                                        |    2 
 cui/source/tabpages/measure.cxx                                       |    4 
 cui/source/tabpages/numfmt.cxx                                        |    4 
 cui/source/tabpages/numpages.cxx                                      |    8 
 cui/source/tabpages/page.cxx                                          |   10 
 cui/source/tabpages/paragrph.cxx                                      |   22 -
 cui/source/tabpages/swpossizetabpage.cxx                              |   10 
 cui/source/tabpages/tabstpge.cxx                                      |    6 
 cui/source/tabpages/textanim.cxx                                      |    6 
 cui/source/tabpages/textattr.cxx                                      |    6 
 cui/source/tabpages/tparea.cxx                                        |    6 
 cui/source/tabpages/tpbitmap.cxx                                      |    2 
 cui/source/tabpages/tpcolor.cxx                                       |    4 
 cui/source/tabpages/tpgradnt.cxx                                      |    2 
 cui/source/tabpages/tphatch.cxx                                       |    2 
 cui/source/tabpages/tpline.cxx                                        |    8 
 cui/source/tabpages/tplnedef.cxx                                      |    4 
 cui/source/tabpages/tpshadow.cxx                                      |    2 
 cui/source/tabpages/tptrans.cxx                                       |    6 
 cui/source/tabpages/transfrm.cxx                                      |    8 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                        |    2 
 dbaccess/source/ui/app/AppDetailPageHelper.hxx                        |    2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx                     |   18 -
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx                     |    4 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx                       |    4 
 dbaccess/source/ui/dlg/TextConnectionHelper.hxx                       |    2 
 dbaccess/source/ui/dlg/admincontrols.cxx                              |    2 
 dbaccess/source/ui/dlg/admincontrols.hxx                              |    2 
 dbaccess/source/ui/dlg/adminpages.cxx                                 |    2 
 dbaccess/source/ui/dlg/adminpages.hxx                                 |    8 
 dbaccess/source/ui/dlg/adtabdlg.cxx                                   |    2 
 dbaccess/source/ui/dlg/advancedsettings.cxx                           |   10 
 dbaccess/source/ui/dlg/advancedsettings.hxx                           |    8 
 dbaccess/source/ui/dlg/detailpages.cxx                                |    8 
 dbaccess/source/ui/dlg/detailpages.hxx                                |    4 
 dbaccess/source/ui/dlg/dlgsize.cxx                                    |    2 
 dbaccess/source/ui/dlg/generalpage.cxx                                |    2 
 dbaccess/source/ui/dlg/generalpage.hxx                                |    2 
 dbaccess/source/ui/dlg/indexdialog.cxx                                |    2 
 dbaccess/source/ui/inc/WCPage.hxx                                     |    4 
 dbaccess/source/ui/inc/adtabdlg.hxx                                   |    2 
 dbaccess/source/ui/inc/dlgsize.hxx                                    |    2 
 dbaccess/source/ui/inc/indexdialog.hxx                                |    2 
 dbaccess/source/ui/misc/WCPage.cxx                                    |    4 
 dbaccess/source/ui/querydesign/querydlg.cxx                           |    2 
 dbaccess/source/ui/querydesign/querydlg.hxx                           |    2 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx                      |    2 
 desktop/source/deployment/gui/dp_gui_dialog2.hxx                      |    2 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx                 |    2 
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx                 |    2 
 editeng/source/misc/hangulhanja.cxx                                   |    8 
 extensions/source/abpilot/abpfinalpage.cxx                            |    4 
 extensions/source/abpilot/abpfinalpage.hxx                            |    4 
 extensions/source/abpilot/typeselectionpage.cxx                       |    4 
 extensions/source/abpilot/typeselectionpage.hxx                       |    2 
 extensions/source/dbpilots/commonpagesdbp.cxx                         |    2 
 extensions/source/dbpilots/commonpagesdbp.hxx                         |    2 
 extensions/source/propctrlr/selectlabeldialog.cxx                     |    2 
 extensions/source/propctrlr/selectlabeldialog.hxx                     |    2 
 extensions/source/scanner/sanedlg.cxx                                 |    2 
 extensions/source/scanner/sanedlg.hxx                                 |    2 
 filter/source/pdf/impdialog.cxx                                       |   30 -
 filter/source/pdf/impdialog.hxx                                       |   30 -
 formula/source/ui/dlg/formula.cxx                                     |    4 
 fpicker/source/office/OfficeControlAccess.cxx                         |    4 
 fpicker/source/office/iodlg.cxx                                       |    4 
 fpicker/source/office/iodlg.hxx                                       |    4 
 include/editeng/edtdlg.hxx                                            |    7 
 include/sfx2/printopt.hxx                                             |   14 
 include/sfx2/sidebar/TabBar.hxx                                       |    2 
 include/sfx2/templatedlg.hxx                                          |    8 
 include/svtools/ctrlbox.hxx                                           |    2 
 include/svtools/editbrowsebox.hxx                                     |    4 
 include/svx/ClassificationDialog.hxx                                  |    2 
 include/svx/colorbox.hxx                                              |    2 
 include/svx/compressgraphicdialog.hxx                                 |    4 
 include/svx/ctredlin.hxx                                              |    2 
 include/svx/float3d.hxx                                               |    2 
 include/svx/hdft.hxx                                                  |    4 
 include/svx/optgrid.hxx                                               |    4 
 include/svx/srchdlg.hxx                                               |    4 
 include/vcl/jsdialog/executor.hxx                                     |    2 
 include/vcl/weld.hxx                                                  |   22 -
 reportdesign/source/ui/dlg/DateTime.cxx                               |    2 
 reportdesign/source/ui/inc/DateTime.hxx                               |    2 
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx           |    2 
 sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx              |    2 
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx        |    2 
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx                   |    2 
 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx                     |    4 
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx        |    2 
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx        |    2 
 sc/source/ui/attrdlg/tabpages.cxx                                     |   10 
 sc/source/ui/cctrl/checklistmenu.cxx                                  |    2 
 sc/source/ui/dbgui/PivotLayoutDialog.cxx                              |    6 
 sc/source/ui/dbgui/dapitype.cxx                                       |    2 
 sc/source/ui/dbgui/dpgroupdlg.cxx                                     |    4 
 sc/source/ui/dbgui/filtdlg.cxx                                        |    2 
 sc/source/ui/dbgui/foptmgr.cxx                                        |    2 
 sc/source/ui/dbgui/pfiltdlg.cxx                                       |    2 
 sc/source/ui/dbgui/pvfundlg.cxx                                       |    6 
 sc/source/ui/dbgui/scendlg.cxx                                        |    2 
 sc/source/ui/dbgui/scuiasciiopt.cxx                                   |    6 
 sc/source/ui/dbgui/scuiimoptdlg.cxx                                   |    2 
 sc/source/ui/dbgui/textimportoptions.cxx                              |    4 
 sc/source/ui/dbgui/tpsort.cxx                                         |    4 
 sc/source/ui/dbgui/tpsubt.cxx                                         |    4 
 sc/source/ui/dbgui/validate.cxx                                       |    2 
 sc/source/ui/dialogs/searchresults.cxx                                |    2 
 sc/source/ui/inc/AnalysisOfVarianceDialog.hxx                         |    2 
 sc/source/ui/inc/FourierAnalysisDialog.hxx                            |    2 
 sc/source/ui/inc/PivotLayoutDialog.hxx                                |    4 
 sc/source/ui/inc/RandomNumberGeneratorDialog.hxx                      |    2 
 sc/source/ui/inc/RegressionDialog.hxx                                 |    2 
 sc/source/ui/inc/SamplingDialog.hxx                                   |    4 
 sc/source/ui/inc/StatisticsInputOutputDialog.hxx                      |    2 
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx                      |    2 
 sc/source/ui/inc/checklistmenu.hxx                                    |    2 
 sc/source/ui/inc/crnrdlg.hxx                                          |    2 
 sc/source/ui/inc/dapitype.hxx                                         |    2 
 sc/source/ui/inc/datastreamdlg.hxx                                    |    2 
 sc/source/ui/inc/delcodlg.hxx                                         |    2 
 sc/source/ui/inc/dpgroupdlg.hxx                                       |    4 
 sc/source/ui/inc/filldlg.hxx                                          |    2 
 sc/source/ui/inc/filtdlg.hxx                                          |    2 
 sc/source/ui/inc/foptmgr.hxx                                          |    2 
 sc/source/ui/inc/highred.hxx                                          |    2 
 sc/source/ui/inc/inscodlg.hxx                                         |    4 
 sc/source/ui/inc/instbdlg.hxx                                         |    2 
 sc/source/ui/inc/linkarea.hxx                                         |    2 
 sc/source/ui/inc/mtrindlg.hxx                                         |    2 
 sc/source/ui/inc/mvtabdlg.hxx                                         |    2 
 sc/source/ui/inc/namedlg.hxx                                          |    2 
 sc/source/ui/inc/pfiltdlg.hxx                                         |    2 
 sc/source/ui/inc/protectiondlg.hxx                                    |    2 
 sc/source/ui/inc/pvfundlg.hxx                                         |    6 
 sc/source/ui/inc/retypepassdlg.hxx                                    |    4 
 sc/source/ui/inc/scendlg.hxx                                          |    2 
 sc/source/ui/inc/scuiasciiopt.hxx                                     |    4 
 sc/source/ui/inc/scuiautofmt.hxx                                      |    2 
 sc/source/ui/inc/scuiimoptdlg.hxx                                     |    2 
 sc/source/ui/inc/searchresults.hxx                                    |    2 
 sc/source/ui/inc/sharedocdlg.hxx                                      |    2 
 sc/source/ui/inc/tabpages.hxx                                         |   10 
 sc/source/ui/inc/textimportoptions.hxx                                |    2 
 sc/source/ui/inc/tpcalc.hxx                                           |    4 
 sc/source/ui/inc/tpformula.hxx                                        |    2 
 sc/source/ui/inc/tphf.hxx                                             |    2 
 sc/source/ui/inc/tpsort.hxx                                           |    4 
 sc/source/ui/inc/tpsubt.hxx                                           |    4 
 sc/source/ui/inc/tptable.hxx                                          |    8 
 sc/source/ui/inc/tpview.hxx                                           |    4 
 sc/source/ui/inc/validate.hxx                                         |    2 
 sc/source/ui/miscdlgs/crnrdlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/datastreamdlg.cxx                               |    2 
 sc/source/ui/miscdlgs/delcodlg.cxx                                    |    2 
 sc/source/ui/miscdlgs/filldlg.cxx                                     |    2 
 sc/source/ui/miscdlgs/highred.cxx                                     |    2 
 sc/source/ui/miscdlgs/inscodlg.cxx                                    |    4 
 sc/source/ui/miscdlgs/instbdlg.cxx                                    |    2 
 sc/source/ui/miscdlgs/linkarea.cxx                                    |    2 
 sc/source/ui/miscdlgs/mtrindlg.cxx                                    |    2 
 sc/source/ui/miscdlgs/mvtabdlg.cxx                                    |    2 
 sc/source/ui/miscdlgs/protectiondlg.cxx                               |    3 
 sc/source/ui/miscdlgs/retypepassdlg.cxx                               |    4 
 sc/source/ui/miscdlgs/scuiautofmt.cxx                                 |    2 
 sc/source/ui/miscdlgs/sharedocdlg.cxx                                 |    2 
 sc/source/ui/namedlg/namedlg.cxx                                      |   12 
 sc/source/ui/optdlg/calcoptionsdlg.cxx                                |    4 
 sc/source/ui/optdlg/calcoptionsdlg.hxx                                |    4 
 sc/source/ui/optdlg/tpcalc.cxx                                        |    4 
 sc/source/ui/optdlg/tpformula.cxx                                     |    4 
 sc/source/ui/optdlg/tpview.cxx                                        |    6 
 sc/source/ui/pagedlg/tphf.cxx                                         |    2 
 sc/source/ui/pagedlg/tptable.cxx                                      |   12 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx                       |   10 
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx                       |    8 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx                    |    2 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx                    |    2 
 sd/source/filter/html/pubdlg.cxx                                      |   14 
 sd/source/ui/animations/CustomAnimationPane.cxx                       |    2 
 sd/source/ui/animations/SlideTransitionPane.cxx                       |    6 
 sd/source/ui/dlg/BulletAndPositionDlg.cxx                             |   15 
 sd/source/ui/dlg/animobjs.cxx                                         |    2 
 sd/source/ui/dlg/custsdlg.cxx                                         |    2 
 sd/source/ui/dlg/dlgsnap.cxx                                          |    2 
 sd/source/ui/dlg/headerfooterdlg.cxx                                  |    4 
 sd/source/ui/dlg/paragr.cxx                                           |    4 
 sd/source/ui/dlg/present.cxx                                          |    6 
 sd/source/ui/dlg/prntopts.cxx                                         |    6 
 sd/source/ui/dlg/vectdlg.cxx                                          |    2 
 sd/source/ui/inc/BulletAndPositionDlg.hxx                             |   22 -
 sd/source/ui/inc/CustomAnimationPane.hxx                              |    2 
 sd/source/ui/inc/SlideTransitionPane.hxx                              |    6 
 sd/source/ui/inc/TableDesignPane.hxx                                  |    2 
 sd/source/ui/inc/animobjs.hxx                                         |    2 
 sd/source/ui/inc/custsdlg.hxx                                         |    2 
 sd/source/ui/inc/dlgsnap.hxx                                          |    2 
 sd/source/ui/inc/present.hxx                                          |    4 
 sd/source/ui/inc/prntopts.hxx                                         |    4 
 sd/source/ui/inc/pubdlg.hxx                                           |   14 
 sd/source/ui/inc/vectdlg.hxx                                          |    2 
 sd/source/ui/sidebar/SlideBackground.cxx                              |    4 
 sd/source/ui/sidebar/SlideBackground.hxx                              |    4 
 sd/source/ui/table/TableDesignPane.cxx                                |    2 
 sfx2/inc/emojicontrol.hxx                                             |    4 
 sfx2/source/appl/newhelp.cxx                                          |    2 
 sfx2/source/appl/newhelp.hxx                                          |    2 
 sfx2/source/control/emojicontrol.cxx                                  |    4 
 sfx2/source/dialog/printopt.cxx                                       |   14 
 sfx2/source/dialog/securitypage.cxx                                   |    4 
 sfx2/source/dialog/templdlg.cxx                                       |    2 
 sfx2/source/dialog/versdlg.cxx                                        |    2 
 sfx2/source/doc/templatedlg.cxx                                       |    4 
 sfx2/source/inc/templdgi.hxx                                          |    2 
 sfx2/source/inc/versdlg.hxx                                           |    2 
 sfx2/source/sidebar/TabBar.cxx                                        |    2 
 starmath/inc/dialog.hxx                                               |    6 
 starmath/source/dialog.cxx                                            |    6 
 svtools/source/brwbox/ebbcontrols.cxx                                 |    4 
 svtools/source/control/ctrlbox.cxx                                    |    2 
 svtools/source/dialogs/ServerDetailsControls.cxx                      |    2 
 svtools/source/dialogs/ServerDetailsControls.hxx                      |    2 
 svtools/source/filter/exportdialog.cxx                                |    4 
 svtools/source/filter/exportdialog.hxx                                |    4 
 svx/inc/galbrws2.hxx                                                  |    2 
 svx/source/dialog/ClassificationDialog.cxx                            |    2 
 svx/source/dialog/SafeModeDialog.cxx                                  |    4 
 svx/source/dialog/SafeModeDialog.hxx                                  |    4 
 svx/source/dialog/_bmpmask.cxx                                        |    8 
 svx/source/dialog/compressgraphicdialog.cxx                           |    4 
 svx/source/dialog/ctredlin.cxx                                        |    4 
 svx/source/dialog/hdft.cxx                                            |    4 
 svx/source/dialog/optgrid.cxx                                         |    6 
 svx/source/dialog/srchdlg.cxx                                         |    8 
 svx/source/engine3d/float3d.cxx                                       |    2 
 svx/source/form/datanavi.cxx                                          |   10 
 svx/source/gallery2/galbrws2.cxx                                      |    2 
 svx/source/inc/datanavi.hxx                                           |    6 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx                   |    2 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx                   |    2 
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx                     |    2 
 svx/source/sidebar/shadow/ShadowPropertyPanel.hxx                     |    2 
 svx/source/tbxctrls/extrusioncontrols.cxx                             |    8 
 svx/source/tbxctrls/extrusioncontrols.hxx                             |    8 
 svx/source/tbxctrls/fontworkgallery.cxx                               |   12 
 svx/source/tbxctrls/tbcontrl.cxx                                      |    2 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |    2 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx |    2 
 sw/inc/AnnotationWin.hxx                                              |    2 
 sw/source/ui/chrdlg/break.cxx                                         |    6 
 sw/source/ui/chrdlg/drpcps.cxx                                        |    4 
 sw/source/ui/chrdlg/numpara.cxx                                       |    4 
 sw/source/ui/config/mailconfigpage.cxx                                |   18 -
 sw/source/ui/config/optload.cxx                                       |    2 
 sw/source/ui/config/optpage.cxx                                       |   22 -
 sw/source/ui/dbui/dbinsdlg.cxx                                        |    9 
 sw/source/ui/dbui/mmaddressblockpage.cxx                              |    8 
 sw/source/ui/dbui/mmaddressblockpage.hxx                              |    6 
 sw/source/ui/dbui/mmdocselectpage.cxx                                 |    4 
 sw/source/ui/dbui/mmdocselectpage.hxx                                 |    2 
 sw/source/ui/dbui/mmgreetingspage.cxx                                 |   10 
 sw/source/ui/dbui/mmgreetingspage.hxx                                 |    6 
 sw/source/ui/dbui/mmlayoutpage.cxx                                    |    2 
 sw/source/ui/dbui/mmlayoutpage.hxx                                    |    2 
 sw/source/ui/dbui/mmoutputtypepage.cxx                                |    4 
 sw/source/ui/dbui/mmoutputtypepage.hxx                                |    2 
 sw/source/ui/dbui/mmresultdialogs.cxx                                 |   14 
 sw/source/ui/dialog/ascfldlg.cxx                                      |    2 
 sw/source/ui/dialog/uiregionsw.cxx                                    |   28 -
 sw/source/ui/envelp/envlop1.cxx                                       |    2 
 sw/source/ui/envelp/envprt.cxx                                        |    6 
 sw/source/ui/envelp/envprt.hxx                                        |    6 
 sw/source/ui/envelp/label1.cxx                                        |    4 
 sw/source/ui/envelp/labprt.cxx                                        |    4 
 sw/source/ui/envelp/labprt.hxx                                        |    2 
 sw/source/ui/envelp/mailmrge.cxx                                      |    6 
 sw/source/ui/envelp/swuilabimp.hxx                                    |    4 
 sw/source/ui/fldui/javaedit.cxx                                       |    4 
 sw/source/ui/frmdlg/column.cxx                                        |    2 
 sw/source/ui/frmdlg/frmpage.cxx                                       |   16 -
 sw/source/ui/frmdlg/wrap.cxx                                          |    6 
 sw/source/ui/inc/mmresultdialogs.hxx                                  |    8 
 sw/source/ui/index/cnttab.cxx                                         |   16 -
 sw/source/ui/index/swuiidxmrk.cxx                                     |    8 
 sw/source/ui/misc/bookmark.cxx                                        |    2 
 sw/source/ui/misc/docfnote.cxx                                        |    2 
 sw/source/ui/misc/glossary.cxx                                        |    4 
 sw/source/ui/misc/impfnote.hxx                                        |    2 
 sw/source/ui/misc/insfnote.cxx                                        |    2 
 sw/source/ui/misc/linenum.cxx                                         |    2 
 sw/source/ui/misc/num.cxx                                             |    2 
 sw/source/ui/misc/outline.cxx                                         |    2 
 sw/source/ui/misc/pgfnote.cxx                                         |    4 
 sw/source/ui/misc/pggrid.cxx                                          |    8 
 sw/source/ui/misc/srtdlg.cxx                                          |    6 
 sw/source/ui/misc/titlepage.cxx                                       |    8 
 sw/source/ui/table/convert.cxx                                        |    8 
 sw/source/ui/table/instable.cxx                                       |    4 
 sw/source/ui/table/tabledlg.cxx                                       |   24 -
 sw/source/ui/table/tautofmt.cxx                                       |    4 
 sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx                    |    6 
 sw/source/uibase/docvw/AnnotationMenuButton.cxx                       |    2 
 sw/source/uibase/docvw/PageBreakWin.cxx                               |    2 
 sw/source/uibase/inc/PageBreakWin.hxx                                 |    2 
 sw/source/uibase/inc/ascfldlg.hxx                                     |    2 
 sw/source/uibase/inc/bookmark.hxx                                     |    2 
 sw/source/uibase/inc/break.hxx                                        |    4 
 sw/source/uibase/inc/column.hxx                                       |    2 
 sw/source/uibase/inc/convert.hxx                                      |    6 
 sw/source/uibase/inc/dbinsdlg.hxx                                     |    6 
 sw/source/uibase/inc/drpcps.hxx                                       |    4 
 sw/source/uibase/inc/envlop.hxx                                       |    2 
 sw/source/uibase/inc/frmpage.hxx                                      |   14 
 sw/source/uibase/inc/glossary.hxx                                     |    4 
 sw/source/uibase/inc/insfnote.hxx                                     |    2 
 sw/source/uibase/inc/instable.hxx                                     |    4 
 sw/source/uibase/inc/javaedit.hxx                                     |    2 
 sw/source/uibase/inc/linenum.hxx                                      |    2 
 sw/source/uibase/inc/mailconfigpage.hxx                               |    4 
 sw/source/uibase/inc/mailmrge.hxx                                     |    6 
 sw/source/uibase/inc/num.hxx                                          |    2 
 sw/source/uibase/inc/numpara.hxx                                      |    4 
 sw/source/uibase/inc/optload.hxx                                      |    2 
 sw/source/uibase/inc/optpage.hxx                                      |   14 
 sw/source/uibase/inc/outline.hxx                                      |    2 
 sw/source/uibase/inc/pgfnote.hxx                                      |    4 
 sw/source/uibase/inc/pggrid.hxx                                       |    6 
 sw/source/uibase/inc/regionsw.hxx                                     |   26 -
 sw/source/uibase/inc/srtdlg.hxx                                       |    4 
 sw/source/uibase/inc/swuicnttab.hxx                                   |   14 
 sw/source/uibase/inc/swuiidxmrk.hxx                                   |    4 
 sw/source/uibase/inc/tautofmt.hxx                                     |    2 
 sw/source/uibase/inc/titlepage.hxx                                    |    6 
 sw/source/uibase/inc/wrap.hxx                                         |    4 
 sw/source/uibase/sidebar/PageFooterPanel.cxx                          |    2 
 sw/source/uibase/sidebar/PageFooterPanel.hxx                          |    2 
 sw/source/uibase/sidebar/PageHeaderPanel.cxx                          |    2 
 sw/source/uibase/sidebar/PageHeaderPanel.hxx                          |    2 
 sw/source/uibase/table/tablepg.hxx                                    |   20 -
 uui/source/logindlg.cxx                                               |    2 
 uui/source/logindlg.hxx                                               |    2 
 uui/source/secmacrowarnings.cxx                                       |    2 
 uui/source/secmacrowarnings.hxx                                       |    2 
 vcl/inc/printdlg.hxx                                                  |    6 
 vcl/inc/salvtables.hxx                                                |   17 -
 vcl/jsdialog/executor.cxx                                             |    6 
 vcl/source/app/salvtables.cxx                                         |    2 
 vcl/source/app/weldutils.cxx                                          |    2 
 vcl/source/window/printdlg.cxx                                        |    6 
 vcl/unx/generic/print/prtsetup.cxx                                    |    4 
 vcl/unx/generic/print/prtsetup.hxx                                    |    2 
 vcl/unx/gtk3/gtkinst.cxx                                              |  158 ++++++----
 xmlsecurity/inc/digitalsignaturesdialog.hxx                           |    2 
 xmlsecurity/inc/macrosecurity.hxx                                     |    2 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                |    2 
 xmlsecurity/source/dialogs/macrosecurity.cxx                          |    2 
 468 files changed, 1218 insertions(+), 1161 deletions(-)

New commits:
commit 9940f077fdfc0c271aa66ad64578ae2236a2ca81
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 20 17:27:49 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 21 18:19:58 2021 +0200

    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 at redhat.com>

diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 74d5be8542ca..6a79d0e1da54 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -138,7 +138,7 @@ void BreakPointDialog::CheckButtons()
     }
 }
 
-IMPL_LINK(BreakPointDialog, CheckBoxHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(BreakPointDialog, CheckBoxHdl, weld::Toggleable&, rButton, void)
 {
     BreakPoint* pBrk = GetSelectedBreakPoint();
     if (pBrk)
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index d3674c371a55..89406d2c0c67 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -37,7 +37,7 @@ class BreakPointDialog final : public weld::GenericDialogController
     std::unique_ptr<weld::SpinButton> m_xNumericField;
 
     void CheckButtons();
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(EditModifyHdl, weld::ComboBox&, void);
     DECL_LINK(FieldModifyHdl, weld::SpinButton&, void);
     DECL_LINK(ButtonHdl, weld::Button&, void);
diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
index 9ab5dff70f20..bc1ccc81e7c9 100644
--- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx
+++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
@@ -75,7 +75,7 @@ void Dim3DLookResourceGroup::fillParameter(ChartTypeParameter& rParameter)
     }
 }
 
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, weld::Toggleable&, void)
 {
     if (m_pChangeListener)
         m_pChangeListener->stateChanged();
@@ -110,7 +110,7 @@ void SortByXValuesResourceGroup::fillParameter(ChartTypeParameter& rParameter)
     rParameter.bSortByXValues = m_xCB_XValueSorting->get_active();
 }
 
-IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, weld::Toggleable&, void)
 {
     if (m_pChangeListener)
         m_pChangeListener->stateChanged();
@@ -184,7 +184,7 @@ void StackingResourceGroup::fillParameter(ChartTypeParameter& rParameter)
         rParameter.eStackMode = GlobalStackMode_STACK_Z;
 }
 
-IMPL_LINK(StackingResourceGroup, StackingChangeHdl, weld::ToggleButton&, rRadio, void)
+IMPL_LINK(StackingResourceGroup, StackingChangeHdl, weld::Toggleable&, rRadio, void)
 {
     //for each radio click there are coming two change events
     //first uncheck of previous button -> ignore that call
@@ -193,7 +193,7 @@ IMPL_LINK(StackingResourceGroup, StackingChangeHdl, weld::ToggleButton&, rRadio,
         m_pChangeListener->stateChanged();
 }
 
-IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::Toggleable&, void)
 {
     if (m_pChangeListener)
         m_pChangeListener->stateChanged();
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 857d2b5295db..841b75d2f9ef 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -221,7 +221,7 @@ IMPL_LINK(DataLabelResources, NumberFormatDialogHdl, weld::Button&, rButton, voi
     }
 }
 
-IMPL_LINK_NOARG(DataLabelResources, CheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(DataLabelResources, CheckHdl, weld::Toggleable&, void)
 {
     EnableControls();
 }
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index dde594b620d6..094291dc9a23 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -84,7 +84,7 @@ private:
     std::unique_ptr<weld::CheckButton> m_xCBCustomLeaderLines;
 
     DECL_LINK(NumberFormatDialogHdl, weld::Button&, void );
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK(CheckHdl, weld::Toggleable&, void );
     void EnableControls();
 };
 
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index aaa1c6eedb8b..39ee44909e61 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -339,7 +339,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2, weld::ComboBox&, void )
    CategoryChosen(*m_xRbConst);
 }
 
-IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, weld::Toggleable&, void )
 {
     m_bErrorKindUnique = true;
     SvxChartKindError eOldError = m_eErrorKind;
@@ -392,7 +392,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, weld::ToggleButton&, void )
     UpdateControlStates();
 }
 
-IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg, weld::Toggleable&, void)
 {
     UpdateControlStates();
     PosValueChanged( *m_xMfPositive );
@@ -412,7 +412,7 @@ IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged, weld::MetricSpinButton&, voi
     }
 }
 
-IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, weld::Toggleable&, void)
 {
     m_bIndicatorUnique = true;
     if( m_xRbBoth->get_active())
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 50ac0602baef..5ad9fe1ac63d 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -158,7 +158,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
     }
 }
 
-IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, weld::Toggleable&, void)
 {
     bool bEnable = !m_xCbxShow || m_xCbxShow->get_active();
 
@@ -218,7 +218,7 @@ void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const
     rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, !m_xCbxShow || m_xCbxShow->get_active()) );
 }
 
-IMPL_LINK (LegendPositionResources, PositionChangeHdl, weld::ToggleButton&, rRadio, void)
+IMPL_LINK (LegendPositionResources, PositionChangeHdl, weld::Toggleable&, rRadio, void)
 {
     //for each radio click there are coming two change events
     //first uncheck of previous button -> ignore that call
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index e1ccd666414c..8fc5e63ee2be 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -83,7 +83,7 @@ TrendlineResources::TrendlineResources(weld::Builder& rBuilder, const SfxItemSet
     rInterceptFormatter.ClearMinValue();
     rInterceptFormatter.ClearMaxValue();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, TrendlineResources, SelectTrendLine);
+    Link<weld::Toggleable&,void> aLink = LINK(this, TrendlineResources, SelectTrendLine);
     m_xRB_Linear->connect_toggled( aLink );
     m_xRB_Logarithmic->connect_toggled( aLink );
     m_xRB_Exponential->connect_toggled( aLink );
@@ -105,7 +105,7 @@ TrendlineResources::TrendlineResources(weld::Builder& rBuilder, const SfxItemSet
 TrendlineResources::~TrendlineResources()
 {}
 
-IMPL_LINK_NOARG(TrendlineResources, SelectTrendLine, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TrendlineResources, SelectTrendLine, weld::Toggleable&, void)
 {
     if (m_xRB_Linear->get_active())
         m_eTrendLineType = SvxChartRegress::Linear;
@@ -427,7 +427,7 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
     UpdateControlStates();
 }
 
-IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::Toggleable&, void)
 {
     m_xEE_XName->set_sensitive(m_xCB_ShowEquation->get_active());
     m_xEE_YName->set_sensitive(m_xCB_ShowEquation->get_active());
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 2327b05c355d..e520d6da3bc8 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -30,7 +30,7 @@ namespace weld { class FormattedSpinButton; }
 namespace weld { class Image; }
 namespace weld { class RadioButton; }
 namespace weld { class SpinButton; }
-namespace weld { class ToggleButton; }
+namespace weld { class Toggleable; }
 
 class SvNumberFormatter;
 
@@ -87,10 +87,10 @@ private:
     std::unique_ptr<weld::ComboBox> m_xCB_RegressionMovingType;
 
     void UpdateControlStates();
-    DECL_LINK(SelectTrendLine, weld::ToggleButton&, void);
+    DECL_LINK(SelectTrendLine, weld::Toggleable&, void);
     DECL_LINK(ChangeSpinValue, weld::SpinButton&, void);
     DECL_LINK(ChangeFormattedValue, weld::FormattedSpinButton&, void);
-    DECL_LINK(ShowEquation, weld::ToggleButton&, void);
+    DECL_LINK(ShowEquation, weld::Toggleable&, void);
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 2ca07dd15676..707c0eff3617 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, weld::ComboBox&
     initControlsFromModel();
 }
 
-IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, weld::Toggleable&, void)
 {
     if( !m_bUpdateOtherControls )
         return;
@@ -297,7 +297,7 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, weld::ToggleButto
     updateScheme();
 }
 
-IMPL_LINK(ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, weld::ToggleButton&, rCheckBox, void)
+IMPL_LINK(ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, weld::Toggleable&, rCheckBox, void)
 {
     if( !m_bUpdateOtherControls )
         return;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 305c895c0e46..1f13240b0015 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -38,8 +38,8 @@ public:
 
 private:
     DECL_LINK( SelectSchemeHdl, weld::ComboBox&, void );
-    DECL_LINK( SelectShading, weld::ToggleButton&, void );
-    DECL_LINK( SelectRoundedEdgeOrObjectLines, weld::ToggleButton&, void );
+    DECL_LINK( SelectShading, weld::Toggleable&, void );
+    DECL_LINK( SelectRoundedEdgeOrObjectLines, weld::Toggleable&, void );
 
     void initControlsFromModel();
     void applyShadeModeToModel();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 238df9a00787..fca47ad13d45 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -209,13 +209,13 @@ IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Timer *, void)
     applyPerspectiveToModel();
 }
 
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, weld::Toggleable&, void)
 {
     m_xMFPerspective->set_sensitive(m_xCbxPerspective->get_active());
     applyPerspectiveToModel();
 }
 
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, weld::Toggleable&, void)
 {
     ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index e0ccfd4f8fd3..ca7f75ebea0d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -47,8 +47,8 @@ public:
     DECL_LINK( PerspectiveChanged, Timer *, void);
     // is called immediately when a field changes
     DECL_LINK( PerspectiveEdited, weld::MetricSpinButton&, void );
-    DECL_LINK( PerspectiveToggled, weld::ToggleButton&, void );
-    DECL_LINK( RightAngledAxesToggled, weld::ToggleButton&, void );
+    DECL_LINK( PerspectiveToggled, weld::Toggleable&, void );
+    DECL_LINK( RightAngledAxesToggled, weld::Toggleable&, void );
 
 private:
     void applyAnglesToModel();
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index de028152e386..9871bfa4187a 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -270,7 +270,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
 
 // event handling routines
 
-IMPL_LINK_NOARG(SchAxisLabelTabPage, StackedToggleHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchAxisLabelTabPage, StackedToggleHdl, weld::Toggleable&, void)
 {
     bool bActive = m_xCbStacked->get_active() && m_xCbStacked->get_sensitive();
     m_xNfRotate->set_sensitive(!bActive);
@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SchAxisLabelTabPage, StackedToggleHdl, weld::ToggleButton&, void
     m_xFtRotate->set_sensitive(!bActive);
 }
 
-IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel, weld::Toggleable&, void)
 {
     bool bEnable = ( m_xCbShowDescription->get_state() != TRISTATE_FALSE );
 
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 0923c91118d5..a94a030fe9a1 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -65,8 +65,8 @@ private:
     std::unique_ptr<svx::DialControl> m_xCtrlDial;
     std::unique_ptr<weld::CustomWeld> m_xCtrlDialWin;
 
-    DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
-    DECL_LINK(ToggleShowLabel, weld::ToggleButton&, void);
+    DECL_LINK(StackedToggleHdl, weld::Toggleable&, void);
+    DECL_LINK(ToggleShowLabel, weld::Toggleable&, void);
 
 public:
     SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 8821fe6b5ece..e0ceccec2fe0 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -316,12 +316,12 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, weld::Entry&, void)
     isValid();
 }
 
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, weld::Toggleable&, void)
 {
     ControlChangedHdl(*m_xED_Range);
 }
 
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, weld::Toggleable&, void)
 {
     ControlChangedHdl(*m_xED_Range);
 }
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 3af72bf86258..7d4e1a4183c2 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -64,8 +64,8 @@ private:
 
     DECL_LINK( ChooseRangeHdl, weld::Button&, void );
     DECL_LINK( ControlChangedHdl, weld::Entry&, void );
-    DECL_LINK( ControlChangedCheckBoxHdl, weld::ToggleButton&, void );
-    DECL_LINK( ControlChangedRadioHdl, weld::ToggleButton&, void );
+    DECL_LINK( ControlChangedCheckBoxHdl, weld::Toggleable&, void );
+    DECL_LINK( ControlChangedRadioHdl, weld::Toggleable&, void );
     DECL_LINK( ControlEditedHdl, weld::Entry&, void );
 
     sal_Int32       m_nChangingControlCalls;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index b9b31019803d..db2ba248ee8e 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -168,7 +168,7 @@ void ScaleTabPage::EnableControls()
     EnableValueHdl(*m_xCbx_AutoTimeResolution);
 }
 
-IMPL_LINK( ScaleTabPage, EnableValueHdl, weld::ToggleButton&, rCbx, void )
+IMPL_LINK( ScaleTabPage, EnableValueHdl, weld::Toggleable&, rCbx, void )
 {
     bool bEnable = !rCbx.get_active() && rCbx.get_sensitive();
     if (&rCbx == m_xCbxAutoMin.get())
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 98814e2560c3..101e6df1cede 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -83,7 +83,7 @@ private:
     void EnableControls();
 
     DECL_LINK(SelectAxisTypeHdl, weld::ComboBox&, void);
-    DECL_LINK(EnableValueHdl, weld::ToggleButton&, void);
+    DECL_LINK(EnableValueHdl, weld::Toggleable&, void);
 
     /** shows a warning window due to an invalid input.
 
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 36d86c4873ef..15976e89fea8 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -60,7 +60,7 @@ SchOptionTabPage::~SchOptionTabPage()
 {
 }
 
-IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::Toggleable&, void)
 {
     if( m_nAllSeriesAxisIndex == 0 )
         m_xCBAxisSideBySide->set_sensitive( m_xRbtAxis2->get_active());
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 011e88a4f045..6b163f3c8815 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -47,7 +47,7 @@ private: //methods
     void AdaptControlPositionsAndVisibility();
 
 private: //member
-    DECL_LINK(EnableHdl, weld::ToggleButton&, void );
+    DECL_LINK(EnableHdl, weld::Toggleable&, void );
 
     sal_Int32   m_nAllSeriesAxisIndex;
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index ede27edbac9d..8ff1c926d091 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -60,7 +60,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(weld::Container* pPage, weld::DialogCon
     }
 }
 
-IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::Toggleable&, void)
 {
     bool bActive = m_xCbStacked->get_active();
     m_xNfRotate->set_sensitive(!bActive);
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 0ae3c2ddbc26..b303e4d3596c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -45,7 +45,7 @@ private:
     std::unique_ptr<svx::DialControl> m_xCtrlDial;
     std::unique_ptr<weld::CustomWeld> m_xCtrlDialWin;
 
-    DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(StackedToggleHdl, weld::Toggleable&, void);
 
 public:
     SchAlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs, bool bWithRotation = true);
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 66301e2cd606..f99fd203b231 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -132,7 +132,7 @@ void TitlesAndObjectsTabPage::commitToModel()
     }
 }
 
-IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, weld::Toggleable&, void)
 {
     ChangeHdl(nullptr);
 }
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index ede45464e9d5..b31231633a21 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -49,7 +49,7 @@ private:
     void commitToModel();
     DECL_LINK( ChangeHdl, LinkParamNone*, void );
     DECL_LINK( ChangeEditHdl, weld::Entry&, void );
-    DECL_LINK( ChangeCheckBoxHdl, weld::ToggleButton&, void );
+    DECL_LINK( ChangeCheckBoxHdl, weld::Toggleable&, void );
 
     std::unique_ptr< TitleResources >            m_xTitleResources;
     std::unique_ptr< LegendPositionResources >   m_xLegendPositionResources;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 00a75e9204ed..09380c921d3c 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -36,7 +36,7 @@ namespace weld { class Image; }
 namespace weld { class Label; }
 namespace weld { class MetricSpinButton; }
 namespace weld { class RadioButton; }
-namespace weld { class ToggleButton; }
+namespace weld { class Toggleable; }
 namespace weld { class Widget; }
 
 namespace chart
@@ -124,11 +124,11 @@ private:
     std::unique_ptr<weld::Label> m_xUIStringNeg;
     std::unique_ptr<weld::Label> m_xUIStringRbRange;
 
-    DECL_LINK( CategoryChosen, weld::ToggleButton&, void );
+    DECL_LINK( CategoryChosen, weld::Toggleable&, void );
     DECL_LINK( CategoryChosen2, weld::ComboBox&, void );
-    DECL_LINK( SynchronizePosAndNeg, weld::ToggleButton&, void );
+    DECL_LINK( SynchronizePosAndNeg, weld::Toggleable&, void );
     DECL_LINK( PosValueChanged, weld::MetricSpinButton&, void );
-    DECL_LINK( IndicatorChanged, weld::ToggleButton&, void );
+    DECL_LINK( IndicatorChanged, weld::Toggleable&, void );
     DECL_LINK( ChooseRange, weld::Button&, void );
     DECL_LINK( RangeChanged, weld::Entry&, void );
 
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index cfe3a12435fe..87b96ab558fc 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -26,7 +26,7 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace weld { class Builder; }
 namespace weld { class CheckButton; }
 namespace weld { class RadioButton; }
-namespace weld { class ToggleButton; }
+namespace weld { class Toggleable; }
 
 namespace chart
 {
@@ -50,8 +50,8 @@ public:
 
     void SetChangeHdl( const Link<LinkParamNone*,void>& rLink );
 
-    DECL_LINK( PositionEnableHdl, weld::ToggleButton&, void );
-    DECL_LINK( PositionChangeHdl, weld::ToggleButton&, void );
+    DECL_LINK( PositionEnableHdl, weld::Toggleable&, void );
+    DECL_LINK( PositionChangeHdl, weld::Toggleable&, void );
 
 private:
     void impl_setRadioButtonToggleHdl();
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index ccab43770b8f..c5e4d91c54e2 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -244,7 +244,7 @@ void ChartAxisPanel::Initialize()
 
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl);
     mxCBShowLabel->connect_toggled(aLink);
     mxCBReverse->connect_toggled(aLink);
 
@@ -345,7 +345,7 @@ void ChartAxisPanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-IMPL_LINK(ChartAxisPanel, CheckBoxHdl, weld::ToggleButton&, rCheckbox, void)
+IMPL_LINK(ChartAxisPanel, CheckBoxHdl, weld::Toggleable&, rCheckbox, void)
 {
     OUString aCID = getCID(mxModel);
     bool bChecked = rCheckbox.get_active();
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 4134b76c20dd..0185f4b9431f 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -83,7 +83,7 @@ private:
     void Initialize();
     void doUpdateModel(css::uno::Reference<css::frame::XModel> xModel);
 
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(ListBoxHdl, weld::ComboBox&, void);
     DECL_LINK(TextRotationHdl, weld::MetricSpinButton&, void);
 };
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 59afe8cbb7d4..7bf6663243f7 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -378,7 +378,7 @@ void ChartElementsPanel::Initialize()
     xBroadcaster->addModifyListener(mxListener);
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl);
     mxCBTitle->connect_toggled(aLink);
     mxCBSubtitle->connect_toggled(aLink);
     mxCBXAxis->connect_toggled(aLink);
@@ -586,7 +586,7 @@ void ChartElementsPanel::updateModel(css::uno::Reference<css::frame::XModel> xMo
     doUpdateModel(xModel);
 }
 
-IMPL_LINK(ChartElementsPanel, CheckBoxHdl, weld::ToggleButton&, rCheckBox, void)
+IMPL_LINK(ChartElementsPanel, CheckBoxHdl, weld::Toggleable&, rCheckBox, void)
 {
     bool bChecked = rCheckBox.get_active();
     if (&rCheckBox == mxCBTitle.get())
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index b53aa715f583..ff8516e3e4c8 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -106,7 +106,7 @@ private:
 
     void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible);
 
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(EditHdl, weld::Entry&, void);
     DECL_LINK(LegendPosHdl, weld::ComboBox&, void);
 };
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 1b3f35551382..0cb228bc1222 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -273,7 +273,7 @@ void ChartErrorBarPanel::Initialize()
 
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartErrorBarPanel, RadioBtnHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartErrorBarPanel, RadioBtnHdl);
     mxRBPosAndNeg->connect_toggled(aLink);
     mxRBPos->connect_toggled(aLink);
     mxRBNeg->connect_toggled(aLink);
@@ -393,7 +393,7 @@ void ChartErrorBarPanel::updateModel(css::uno::Reference<css::frame::XModel> xMo
     doUpdateModel(xModel);
 }
 
-IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, weld::Toggleable&, void)
 {
     OUString aCID = getCID(mxModel);
     bool bPos = mxRBPosAndNeg->get_active() || mxRBPos->get_active();
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index e87a65d845b9..c1bb6b4f8b94 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -80,7 +80,7 @@ private:
     void Initialize();
     void doUpdateModel(css::uno::Reference<css::frame::XModel> xModel);
 
-    DECL_LINK(RadioBtnHdl, weld::ToggleButton&, void);
+    DECL_LINK(RadioBtnHdl, weld::Toggleable&, void);
     DECL_LINK(ListBoxHdl, weld::ComboBox&, void);
     DECL_LINK(NumericFieldHdl, weld::SpinButton&, void);
 };
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index fe2452572985..0550463e4d3c 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -327,13 +327,13 @@ void ChartSeriesPanel::Initialize()
 
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl);
     mxCBLabel->connect_toggled(aLink);
     mxCBTrendline->connect_toggled(aLink);
     mxCBXError->connect_toggled(aLink);
     mxCBYError->connect_toggled(aLink);
 
-    Link<weld::ToggleButton&,void> aLink2 = LINK(this, ChartSeriesPanel, RadioBtnHdl);
+    Link<weld::Toggleable&,void> aLink2 = LINK(this, ChartSeriesPanel, RadioBtnHdl);
     mxRBPrimaryAxis->connect_toggled(aLink2);
     mxRBSecondaryAxis->connect_toggled(aLink2);
 
@@ -444,7 +444,7 @@ void ChartSeriesPanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, weld::ToggleButton&, rCheckBox, void)
+IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, weld::Toggleable&, rCheckBox, void)
 {
     bool bChecked = rCheckBox.get_active();
     OUString aCID = getCID(mxModel);
@@ -458,7 +458,7 @@ IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, weld::ToggleButton&, rCheckBox, void)
         setErrorBarVisible(mxModel, aCID, true, bChecked);
 }
 
-IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl, weld::Toggleable&, void)
 {
     OUString aCID = getCID(mxModel);
     bool bChecked = mxRBPrimaryAxis->get_active();
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index 64bc5315bfaa..3c573d91464c 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -100,8 +100,8 @@ private:
     void Initialize();
     void doUpdateModel(css::uno::Reference<css::frame::XModel> xModel);
 
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
-    DECL_LINK(RadioBtnHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
+    DECL_LINK(RadioBtnHdl, weld::Toggleable&, void);
     DECL_LINK(ListBoxHdl, weld::ComboBox&, void);
 };
 
diff --git a/chart2/source/inc/ChartResourceGroups.hxx b/chart2/source/inc/ChartResourceGroups.hxx
index 62857fdbf724..2a81b5cfd3cc 100644
--- a/chart2/source/inc/ChartResourceGroups.hxx
+++ b/chart2/source/inc/ChartResourceGroups.hxx
@@ -49,7 +49,7 @@ public:
     void fillParameter(ChartTypeParameter& rParameter);
 
 private:
-    DECL_LINK(Dim3DLookCheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(Dim3DLookCheckHdl, weld::Toggleable&, void);
     DECL_LINK(SelectSchemeHdl, weld::ComboBox&, void);
 
 private:
@@ -68,7 +68,7 @@ public:
     void fillParameter(ChartTypeParameter& rParameter);
 
 private:
-    DECL_LINK(SortByXValuesCheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(SortByXValuesCheckHdl, weld::Toggleable&, void);
 
 private:
     std::unique_ptr<weld::CheckButton> m_xCB_XValueSorting;
@@ -85,8 +85,8 @@ public:
     void fillParameter(ChartTypeParameter& rParameter);
 
 private:
-    DECL_LINK(StackingChangeHdl, weld::ToggleButton&, void);
-    DECL_LINK(StackingEnableHdl, weld::ToggleButton&, void);
+    DECL_LINK(StackingChangeHdl, weld::Toggleable&, void);
+    DECL_LINK(StackingEnableHdl, weld::Toggleable&, void);
 
 private:
     std::unique_ptr<weld::CheckButton> m_xCB_Stacked;
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 4666aeac49ce..2e24ac9a4727 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1253,7 +1253,7 @@ IMPL_LINK(SfxAcceleratorConfigPage, SelectHdl, weld::TreeView&, rListBox, void)
     }
 }
 
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, weld::Toggleable&, void)
 {
     uno::Reference<ui::XAcceleratorConfiguration> xOld = m_xAct;
 
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 04255cb13a6b..aaa9eb86136a 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -126,7 +126,7 @@ int FontFeaturesDialog::fillGrid(std::vector<vcl::font::Feature> const& rFontFea
 
         Link<weld::ComboBox&, void> aComboBoxSelectHandler
             = LINK(this, FontFeaturesDialog, ComboBoxSelectedHdl);
-        Link<weld::ToggleButton&, void> aCheckBoxToggleHandler
+        Link<weld::Toggleable&, void> aCheckBoxToggleHandler
             = LINK(this, FontFeaturesDialog, CheckBoxToggledHdl);
 
         if (aDefinition.getType() == vcl::font::FeatureParameterType::ENUM)
@@ -172,7 +172,7 @@ void FontFeaturesDialog::updateFontPreview()
     m_aPreviewWindow.SetFont(rPreviewFont, rPreviewFontCJK, rPreviewFontCTL);
 }
 
-IMPL_LINK_NOARG(FontFeaturesDialog, CheckBoxToggledHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(FontFeaturesDialog, CheckBoxToggledHdl, weld::Toggleable&, void)
 {
     updateFontPreview();
 }
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a8e20608d285..338990b31628 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -448,7 +448,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, weld::Button&, rBtn, void )
     }
 }
 
-IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::Toggleable&, void)
 {
     rParent.SetGrammarChecking(m_xCheckGrammarCB->get_active());
     Impl_Restore(true);
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index a341c193c890..3f1bb0e8c53d 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -773,7 +773,7 @@ public:
     DECL_LINK(ColorModifyMetricHdl, weld::MetricSpinButton&, void);
     DECL_LINK(ColorModifySpinHdl, weld::SpinButton&, void);
     DECL_LINK(ColorModifyEditHdl, weld::Entry&, void);
-    DECL_LINK(ModeModifyHdl, weld::ToggleButton&, void);
+    DECL_LINK(ModeModifyHdl, weld::Toggleable&, void);
 
     Color GetColor() const;
 
@@ -840,7 +840,7 @@ ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_In
 
     m_xEDHex->connect_changed(LINK(this, ColorPickerDialog, ColorModifyEditHdl));
 
-    Link<weld::ToggleButton&,void> aLink2 = LINK( this, ColorPickerDialog, ModeModifyHdl );
+    Link<weld::Toggleable&,void> aLink2 = LINK( this, ColorPickerDialog, ModeModifyHdl );
     m_xRBRed->connect_toggled( aLink2 );
     m_xRBGreen->connect_toggled( aLink2 );
     m_xRBBlue->connect_toggled( aLink2 );
@@ -1120,7 +1120,7 @@ IMPL_LINK(ColorPickerDialog, ColorModifySpinHdl, weld::SpinButton&, rEdit, void)
 }
 
 
-IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl, weld::Toggleable&, void)
 {
     ColorMode eMode = HUE;
 
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 2433d0d8445d..050dc31dc14b 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -240,14 +240,14 @@ short FmSearchDialog::run()
     return nRet;
 }
 
-IMPL_LINK(FmSearchDialog, OnToggledSearchRadio, weld::ToggleButton&, rButton, void)
+IMPL_LINK(FmSearchDialog, OnToggledSearchRadio, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
     EnableSearchForDependees(true);
 }
 
-IMPL_LINK(FmSearchDialog, OnToggledFieldRadios, weld::ToggleButton&, rButton, void)
+IMPL_LINK(FmSearchDialog, OnToggledFieldRadios, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -369,7 +369,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnFieldSelected, weld::ComboBox&, void)
         m_arrContextFields[nCurrentContext] = m_plbField->get_active_text();
 }
 
-IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, weld::ToggleButton&, rBox, void)
+IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, weld::Toggleable&, rBox, void)
 {
     bool bChecked = rBox.get_active();
 
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index f39aa3b32ea7..aa764baff52d 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -857,7 +857,7 @@ void TPGalleryThemeProperties::TakeFiles()
     }
 }
 
-IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, weld::Toggleable&, void)
 {
     if ( !bInputAllowed )
         return;
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index e5597dae8265..4f86d6e1a186 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -175,7 +175,7 @@ GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& r
     mxMtrWidth->grab_focus();
 }
 
-IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, weld::Toggleable&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
@@ -276,7 +276,7 @@ GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const Graphi
     mxCbxInvert->connect_toggled(LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl));
 }
 
-IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, weld::Toggleable&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 049a14b448ed..05d921dca867 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -205,7 +205,7 @@ namespace svx
         void set_active(bool active) { m_xControl->set_active(active); }
         bool get_active() const { return m_xControl->get_active(); }
 
-        void connect_toggled(const Link<weld::ToggleButton&, void>& rLink) { m_xControl->connect_toggled(rLink); }
+        void connect_toggled(const Link<weld::Toggleable&, void>& rLink) { m_xControl->connect_toggled(rLink); }
 
     private:
         Size GetOptimalSize() const;
@@ -527,7 +527,7 @@ namespace svx
         m_xFind->connect_clicked(rHdl);
     }
 
-    void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<weld::ToggleButton&,void>& rHdl )
+    void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<weld::Toggleable&,void>& rHdl )
     {
         m_xSimpleConversion->connect_toggled( rHdl );
         m_xHangulBracketed->connect_toggled( rHdl );
@@ -538,7 +538,7 @@ namespace svx
         m_xHangulBelow->connect_toggled( rHdl );
     }
 
-    void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& _rHdl )
+    void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& _rHdl )
     {
         m_aClickByCharacterLink = _rHdl;
     }
@@ -558,14 +558,14 @@ namespace svx
         m_xReplaceAll->set_sensitive( m_bDocumentMode && bSameLen );
     }
 
-    IMPL_LINK(HangulHanjaConversionDialog, ClickByCharacterHdl, weld::ToggleButton&, rBox, void)
+    IMPL_LINK(HangulHanjaConversionDialog, ClickByCharacterHdl, weld::Toggleable&, rBox, void)
     {
         m_aClickByCharacterLink.Call(rBox);
         bool bByCharacter = rBox.get_active();
         m_xSuggestions->DisplayListBox( !bByCharacter );
     }
 
-    IMPL_LINK(HangulHanjaConversionDialog, OnConversionDirectionClicked, weld::ToggleButton&, rBox, void)
+    IMPL_LINK(HangulHanjaConversionDialog, OnConversionDirectionClicked, weld::Toggleable&, rBox, void)
     {
         weld::CheckButton* pOtherBox = nullptr;
         if (&rBox == m_xHangulOnly.get())
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 21762ec0c5e1..afa7b3e4e602 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -67,7 +67,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp(weld::Container* pParent,
     m_xRbtLinktypInternet->set_active(true);
 
     // set handlers
-    Link<weld::ToggleButton&, void> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
+    Link<weld::Toggleable&, void> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
     m_xRbtLinktypInternet->connect_toggled( aLink );
     m_xRbtLinktypFTP->connect_toggled( aLink );
     m_xCbAnonymous->connect_toggled( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
@@ -314,7 +314,7 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
 |* Click on Radiobutton : Internet or FTP
 |*
 |************************************************************************/
-IMPL_LINK(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -327,7 +327,7 @@ IMPL_LINK(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, weld::ToggleButton&,
 |* Click on Checkbox : Anonymous user
 |*
 |************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, weld::Toggleable&, void)
 {
     // disable login-editfields if checked
     if ( m_xCbAnonymous->get_active() )
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 266710a83e4c..29c8d7cfb081 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -105,7 +105,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, weld::Button&, void)
     }
 }
 
-IMPL_LINK(SvInsertOleDlg, RadioHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvInsertOleDlg, RadioHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -140,7 +140,7 @@ SvInsertOleDlg::SvInsertOleDlg(weld::Window* pParent, const Reference<embed::XSt
                                       m_xLbObjecttype->get_height_rows(6));
     m_xLbObjecttype->connect_row_activated(LINK(this, SvInsertOleDlg, DoubleClickHdl));
     m_xBtnFilepath->connect_clicked(LINK( this, SvInsertOleDlg, BrowseHdl));
-    Link<weld::ToggleButton&,void> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
+    Link<weld::Toggleable&,void> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
     m_xRbNewObject->connect_toggled( aLink );
     m_xRbObjectFromfile->connect_toggled( aLink );
     m_xRbNewObject->set_active(true);
@@ -361,7 +361,7 @@ void SfxInsertFloatingFrameDialog::Init()
     m_xNMMarginHeight = m_xBuilder->weld_spin_button("height");
     m_xCBMarginHeightDefault = m_xBuilder->weld_check_button("defaultheight");
 
-    Link<weld::ToggleButton&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl));
+    Link<weld::Toggleable&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl));
     m_xCBMarginWidthDefault->connect_toggled(aLink);
     m_xCBMarginHeightDefault->connect_toggled(aLink);
 
@@ -548,7 +548,7 @@ short SfxInsertFloatingFrameDialog::run()
     return nRet;
 }
 
-IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::Toggleable&, rButton, void)
 {
     weld::CheckButton& rCB = dynamic_cast<weld::CheckButton&>(rButton);
     if (&rCB == m_xCBMarginWidthDefault.get())
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index b452526e8376..dedac54049d7 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -221,7 +221,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl, weld::TreeView&, bool )
     return true;
 }
 
-IMPL_LINK(SvBaseLinksDlg, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvBaseLinksDlg, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 9f7986482596..d84595ac89a7 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -159,7 +159,7 @@ bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const
     return m_xOpenReadonlyCB->get_active();
 }
 
-IMPL_LINK_NOARG(PasswordToOpenModifyDialog, ReadonlyOnOffHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(PasswordToOpenModifyDialog, ReadonlyOnOffHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xOpenReadonlyCB->get_active();
     m_xPasswdToModifyED->set_sensitive(bEnable);
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 45511a59b794..14146b44c373 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -50,7 +50,7 @@ SvxSplitTableDlg::SvxSplitTableDlg(weld::Window *pParent, bool bIsTableVertical,
     }
 }
 
-IMPL_LINK(SvxSplitTableDlg, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvxSplitTableDlg, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/cui/source/dialogs/toolbarmodedlg.cxx b/cui/source/dialogs/toolbarmodedlg.cxx
index 4f5df939e948..e3064451cae3 100644
--- a/cui/source/dialogs/toolbarmodedlg.cxx
+++ b/cui/source/dialogs/toolbarmodedlg.cxx
@@ -98,7 +98,7 @@ ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent)
 {
     static_assert(SAL_N_ELEMENTS(m_pRadioButtons) == SAL_N_ELEMENTS(TOOLBARMODES_ARRAY));
 
-    Link<weld::ToggleButton&, void> aLink = LINK(this, ToolbarmodeDialog, SelectToolbarmode);
+    Link<weld::Toggleable&, void> aLink = LINK(this, ToolbarmodeDialog, SelectToolbarmode);
 
     const OUString sCurrentMode = GetCurrentMode();
     for (tools::ULong i = 0; i < SAL_N_ELEMENTS(m_pRadioButtons); i++)
@@ -161,7 +161,7 @@ void ToolbarmodeDialog::UpdateImage(std::u16string_view sFileName)
     }
 }
 
-IMPL_LINK_NOARG(ToolbarmodeDialog, SelectToolbarmode, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ToolbarmodeDialog, SelectToolbarmode, weld::Toggleable&, void)
 {
     const int i = GetActiveRadioButton();
     if (i > -1)
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 54b40e55857f..90999d96798a 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -138,14 +138,14 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet)
     , m_xBookModeChk(m_xBuilder->weld_check_button("bookmode"))
     , m_xOKBtn(m_xBuilder->weld_button("ok"))
 {
-    Link<weld::ToggleButton&, void> aLink = LINK(this, SvxZoomDialog, UserHdl);
+    Link<weld::Toggleable&, void> aLink = LINK(this, SvxZoomDialog, UserHdl);
     m_x100Btn->connect_toggled(aLink);
     m_xOptimalBtn->connect_toggled(aLink);
     m_xPageWidthBtn->connect_toggled(aLink);
     m_xWholePageBtn->connect_toggled(aLink);
     m_xUserBtn->connect_toggled(aLink);
 
-    Link<weld::ToggleButton&, void> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
+    Link<weld::Toggleable&, void> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
     m_xAutomaticBtn->connect_toggled(aViewLayoutLink);
     m_xSingleBtn->connect_toggled(aViewLayoutLink);
     m_xColumnsBtn->connect_toggled(aViewLayoutLink);
@@ -154,7 +154,7 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet)
         = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
     m_xColumnsEdit->connect_value_changed(aViewLayoutSpinLink);
 
-    Link<weld::ToggleButton&, void> aViewLayoutCheckLink
+    Link<weld::Toggleable&, void> aViewLayoutCheckLink
         = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
     m_xBookModeChk->connect_toggled(aViewLayoutCheckLink);
 
@@ -273,7 +273,7 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet)
     }
 }
 
-IMPL_LINK_NOARG(SvxZoomDialog, UserHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxZoomDialog, UserHdl, weld::Toggleable&, void)
 {
     m_bModified = true;
 
@@ -296,7 +296,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl, weld::MetricSpinButton&, void)
     m_bModified = true;
 }
 
-IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutUserHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutUserHdl, weld::Toggleable&, void)
 {
     m_bModified = true;
 
@@ -332,7 +332,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutSpinHdl, weld::SpinButton&, void)
     m_bModified = true;
 }
 
-IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutCheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutCheckHdl, weld::Toggleable&, void)
 {
     if (!m_xColumnsBtn->get_active())
         return;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 52ab08fb3a42..ebfd9bfb0ea5 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -458,12 +458,12 @@ void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<weld:
     m_xDlg->SetChangeAllHdl(rHdl);
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& _rHdl )
 {
     m_xDlg->SetClickByCharacterHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const Link<weld::ToggleButton&,void>& rHdl)
+void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const Link<weld::Toggleable&,void>& rHdl)
 {
     m_xDlg->SetConversionFormatChangedHdl(rHdl);
 }
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 452bd08feba4..1e16414f3b85 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -192,8 +192,8 @@ public:
     virtual void      SetIgnoreAllHdl( const Link<weld::Button&,void>& _rHdl ) override ;
     virtual void      SetChangeHdl( const Link<weld::Button&,void>& _rHdl ) override ;
     virtual void      SetChangeAllHdl( const Link<weld::Button&,void>& rHdl ) override ;
-    virtual void      SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& rHdl ) override ;
-    virtual void      SetConversionFormatChangedHdl( const Link<weld::ToggleButton&,void>& _rHdl ) override ;
+    virtual void      SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& rHdl ) override ;
+    virtual void      SetConversionFormatChangedHdl( const Link<weld::Toggleable&,void>& _rHdl ) override ;
     virtual void      SetFindHdl( const Link<weld::Button&,void>& _rHdl ) override;
     virtual bool      GetUseBothDirections( ) const override;
     virtual editeng::HangulHanjaConversion::ConversionDirection
diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx
index 337014bd8c0d..aee4da9f3c72 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -59,7 +59,7 @@ private:
     int fillGrid(std::vector<vcl::font::Feature> const& rFontFeatures);
 
     DECL_LINK(ComboBoxSelectedHdl, weld::ComboBox&, void);
-    DECL_LINK(CheckBoxToggledHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxToggledHdl, weld::Toggleable&, void);
 
 public:
     FontFeaturesDialog(weld::Window* pParent, OUString const& rFontName);
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 678f09729e3e..69f491fc6586 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -172,7 +172,7 @@ private:
     DECL_LINK(ChangeAllHdl, weld::Button&, void);
     DECL_LINK(IgnoreAllHdl, weld::Button&, void);
     DECL_LINK(IgnoreHdl, weld::Button&, void);
-    DECL_LINK(CheckGrammarHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckGrammarHdl, weld::Toggleable&, void);
     DECL_LINK(ExtClickHdl, weld::Button&, void);
     DECL_LINK(CancelHdl, weld::Button&, void);
     DECL_LINK(ModifyHdl, LinkParamNone*, void);
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index f4b72bed8585..ee9e56222113 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -122,7 +122,7 @@ private:
     DECL_LINK(Save, weld::Button&, void);
     DECL_LINK(Load, weld::Button&, void);
     DECL_LINK(Default, weld::Button&, void);
-    DECL_LINK(RadioHdl, weld::ToggleButton&, void);
+    DECL_LINK(RadioHdl, weld::Toggleable&, void);
     DECL_LINK(ImplUpdateDataHdl, Timer*, void);
     DECL_LINK(FocusOut_Impl, weld::Widget&, void);
     DECL_LINK(TimeOut_Impl, Timer*, void);
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index d88fc28dce29..61d31cd00a65 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -65,11 +65,11 @@ private:
     bool                HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const;
 
     DECL_LINK(UpdateEnableHdl, weld::ComboBox&, void);
-    DECL_LINK(StackedClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(AsianModeClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(WrapClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(HyphenClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(ShrinkClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(StackedClickHdl, weld::Toggleable&, void);
+    DECL_LINK(AsianModeClickHdl, weld::Toggleable&, void);
+    DECL_LINK(WrapClickHdl, weld::Toggleable&, void);
+    DECL_LINK(HyphenClickHdl, weld::Toggleable&, void);
+    DECL_LINK(ShrinkClickHdl, weld::Toggleable&, void);
 
 private:
     weld::TriStateEnabled m_aStackedState;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index b084bdbd685a..ca7d778830ea 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -340,7 +340,7 @@ private:
     std::unique_ptr<weld::TreeView> m_xLBEntries;
     std::unique_ptr<weld::Button> m_xPBEntries;
 
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckHdl, weld::Toggleable&, void);
     DECL_LINK(KeyReleaseHdl, const KeyEvent&, bool);
 
 public:
@@ -388,7 +388,7 @@ private:
         Enables/disables all controls in the tab page (except from the
         check box.
     */
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckHdl, weld::Toggleable&, void);
 
     /** Handler for the push button
 
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 8637f6e8943b..1bac9a24bfbf 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -165,8 +165,8 @@ private:
     DECL_LINK(LinesChanged_Impl, LinkParamNone*, void);
     DECL_LINK(ModifyDistanceHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ModifyWidthHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(SyncHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(RemoveAdjacentCellBorderHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(SyncHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(RemoveAdjacentCellBorderHdl_Impl, weld::Toggleable&, void);
 
     sal_uInt16          GetPresetImageId(sal_uInt16 nValueSetIdx) const;
     const char*         GetPresetStringId(sal_uInt16 nValueSetIdx) const;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index bbf227f492fe..31bf955b13ae 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -205,10 +205,10 @@ private:
 
     void SelectHdl_Impl(const weld::ComboBox*);
     DECL_LINK(SelectListBoxHdl_Impl, weld::ComboBox&, void);
-    DECL_LINK(OutlineBtnClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(ShadowBtnClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(HiddenBtnClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(CbClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(OutlineBtnClickHdl, weld::Toggleable&, void);
+    DECL_LINK(ShadowBtnClickHdl, weld::Toggleable&, void);
+    DECL_LINK(HiddenBtnClickHdl, weld::Toggleable&, void);
+    DECL_LINK(CbClickHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void);
     DECL_LINK(ModifyFontTransparencyHdl_Impl, weld::MetricSpinButton&, void);
 
@@ -272,10 +272,10 @@ private:
     void                UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
     void                SetEscapement_Impl( SvxEscapement nEsc );
 
-    DECL_LINK(PositionHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(RotationHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(AutoPositionHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(FitToLineHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(PositionHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(RotationHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(AutoPositionHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(FitToLineHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(KerningModifyHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ValueChangedHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ScaleWidthModifyHdl_Impl, weld::MetricSpinButton&, void);
@@ -317,7 +317,7 @@ private:
     void                SelectCharacter(weld::TreeView* pBox);
     void                SetBracket(sal_Unicode cBracket, bool bStart);
 
-    DECL_LINK(TwoLinesHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(TwoLinesHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void);
 
 public:
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 0aed39b1aef4..46284c6d8d4d 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -148,8 +148,8 @@ private:
     void SaveParams() const;
 
     // Handler for the Controls
-    DECL_LINK(OnToggledSearchRadio, weld::ToggleButton&, void);
-    DECL_LINK(OnToggledFieldRadios, weld::ToggleButton&, void);
+    DECL_LINK(OnToggledSearchRadio, weld::Toggleable&, void);
+    DECL_LINK(OnToggledFieldRadios, weld::Toggleable&, void);
     DECL_LINK(OnClickedSearchAgain, weld::Button&, void);
     DECL_LINK(OnClickedSpecialSettings, weld::Button&, void);
 
@@ -159,7 +159,7 @@ private:
     DECL_LINK(OnFieldSelected, weld::ComboBox&, void);
 
     DECL_LINK(OnFocusGrabbed, weld::Widget&, void);
-    DECL_LINK(OnCheckBoxToggled, weld::ToggleButton&, void);
+    DECL_LINK(OnCheckBoxToggled, weld::Toggleable&, void);
 
     DECL_LINK(OnContextSelection, weld::ComboBox&, void);
 
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 4a20724ffd81..0850cd0bcb02 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -251,7 +251,7 @@ class TPGalleryThemeProperties : public SfxTabPage
     void                DoPreview();
     void                EndSearchProgressHdl(sal_Int32 nResult);
 
-    DECL_LINK(ClickPreviewHdl, weld::ToggleButton&, void);
+    DECL_LINK(ClickPreviewHdl, weld::Toggleable&, void);
     DECL_LINK(ClickSearchHdl, weld::Button&, void);
     DECL_LINK(ClickTakeHdl, weld::Button&, void);
     DECL_LINK(ClickTakeAllHdl, weld::Button&, void);
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 05cc36292882..122ac87724da 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -101,7 +101,7 @@ private:
     std::unique_ptr<weld::MetricSpinButton> mxMtrWidth;
     std::unique_ptr<weld::MetricSpinButton> mxMtrHeight;
     std::unique_ptr<weld::CheckButton> mxCbxEdges;
-    DECL_LINK(CheckBoxModifyHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxModifyHdl, weld::Toggleable&, void);
     DECL_LINK(EditModifyHdl, weld::MetricSpinButton&, void);
 public:
 
@@ -117,7 +117,7 @@ class GraphicFilterSolarize : public GraphicFilterDialog
 private:
     std::unique_ptr<weld::MetricSpinButton> mxMtrThreshold;
     std::unique_ptr<weld::CheckButton> mxCbxInvert;
-    DECL_LINK(CheckBoxModifyHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxModifyHdl, weld::Toggleable&, void);
     DECL_LINK(EditModifyHdl, weld::MetricSpinButton&, void);
 
 public:
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 5498e19c8689..651604bb3c37 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -39,8 +39,8 @@ class ButtonBox
 {
     private:
         sal_Int32 mnCurrentButton;
-        std::vector<weld::ToggleButton*> maButtonList;
-        std::map<weld::ToggleButton*, sal_Int32 > maButtonToPos;
+        std::vector<weld::Toggleable*> maButtonList;
+        std::map<weld::Toggleable*, sal_Int32 > maButtonToPos;
         void SelectButtonImpl( sal_Int32 nPos )
         {
             if(mnCurrentButton != NO_BUTTON_SELECTED)
@@ -55,21 +55,21 @@ class ButtonBox
         {
             mnCurrentButton = NO_BUTTON_SELECTED;
         };
-        void AddButton(weld::ToggleButton* pButton)
+        void AddButton(weld::Toggleable* pButton)
         {
             maButtonList.push_back(pButton);
             maButtonToPos.insert( std::make_pair(pButton, maButtonList.size() - 1) );
         }
         sal_Int32 GetCurrentButtonPos() const { return mnCurrentButton; }
-        sal_Int32 GetButtonPos(weld::ToggleButton* pButton)
+        sal_Int32 GetButtonPos(weld::Toggleable* pButton)
         {
-            std::map<weld::ToggleButton*, sal_Int32>::const_iterator aBtnPos = maButtonToPos.find(pButton);
+            std::map<weld::Toggleable*, sal_Int32>::const_iterator aBtnPos = maButtonToPos.find(pButton);
             if(aBtnPos != maButtonToPos.end())
                 return aBtnPos->second;
             else
                 return -1;
         }
-        void SelectButton(weld::ToggleButton* pButton)
+        void SelectButton(weld::Toggleable* pButton)
         {
             sal_Int32 nPos = GetButtonPos(pButton);
             if(nPos != -1)
@@ -168,9 +168,9 @@ class SvxTransparenceTabPage : public SfxTabPage
     std::unique_ptr<weld::CustomWeld> m_xCtlBitmapPreview;
     std::unique_ptr<weld::CustomWeld> m_xCtlXRectPreview;
 
-    DECL_LINK(ClickTransOffHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(ClickTransLinearHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(ClickTransGradientHdl_Impl, weld::ToggleButton&, void );
+    DECL_LINK(ClickTransOffHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(ClickTransLinearHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(ClickTransGradientHdl_Impl, weld::Toggleable&, void );
     DECL_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ModifiedTrgrEditHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ModifiedTrgrListBoxHdl_Impl, weld::ComboBox&, void);
@@ -235,22 +235,22 @@ private:
 
 protected:
     std::unique_ptr<weld::Container> m_xFillTab;
-    std::unique_ptr<weld::ToggleButton> m_xBtnNone;
-    std::unique_ptr<weld::ToggleButton> m_xBtnColor;
-    std::unique_ptr<weld::ToggleButton> m_xBtnGradient;
-    std::unique_ptr<weld::ToggleButton> m_xBtnHatch;
-    std::unique_ptr<weld::ToggleButton> m_xBtnBitmap;
-    std::unique_ptr<weld::ToggleButton> m_xBtnPattern;
+    std::unique_ptr<weld::Toggleable> m_xBtnNone;
+    std::unique_ptr<weld::Toggleable> m_xBtnColor;
+    std::unique_ptr<weld::Toggleable> m_xBtnGradient;
+    std::unique_ptr<weld::Toggleable> m_xBtnHatch;
+    std::unique_ptr<weld::Toggleable> m_xBtnBitmap;
+    std::unique_ptr<weld::Toggleable> m_xBtnPattern;
 
     void SetOptimalSize(weld::DialogController* pController);
 
-    void SelectFillType( weld::ToggleButton& rButton, const SfxItemSet* _pSet = nullptr );
+    void SelectFillType( weld::Toggleable& rButton, const SfxItemSet* _pSet = nullptr );
     SfxTabPage* GetFillTabPage() { return m_xFillTabPage.get(); }
 
     bool IsBtnClicked() const { return m_bBtnClicked; }
 
 private:
-    DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(SelectFillTypeHdl_Impl, weld::Toggleable&, void);
 
     template< typename TabPage >
     bool FillItemSet_Impl( SfxItemSet* );
@@ -315,7 +315,7 @@ private:
     std::unique_ptr<weld::CustomWeld> m_xCtlPosition;
     std::unique_ptr<weld::CustomWeld> m_xCtlXRectPreview;
 
-    DECL_LINK(ClickShadowHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ClickShadowHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(ModifyShadowHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(SelectShadowHdl_Impl, ColorListBox&, void);
 
@@ -387,7 +387,7 @@ private:
     DECL_LINK( ModifiedMetricHdl_Impl, weld::MetricSpinButton&, void );
     DECL_LINK( ModifiedColorListBoxHdl_Impl, ColorListBox&, void );
     DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void );
-    DECL_LINK( ChangeAutoStepHdl_Impl, weld::ToggleButton&, void );
+    DECL_LINK( ChangeAutoStepHdl_Impl, weld::Toggleable&, void );
     DECL_LINK( ModifiedSliderHdl_Impl, weld::Scale&, void );
     void ModifiedHdl_Impl(void const *);
 
@@ -451,7 +451,7 @@ private:
     DECL_LINK( ModifiedEditHdl_Impl, weld::MetricSpinButton&, void );
     DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void );
     DECL_LINK( ModifiedColorListBoxHdl_Impl, ColorListBox&, void );
-    DECL_LINK( ToggleHatchBackgroundColor_Impl, weld::ToggleButton&, void );
+    DECL_LINK( ToggleHatchBackgroundColor_Impl, weld::Toggleable&, void );
     DECL_LINK( ModifiedBackgroundHdl_Impl, ColorListBox&, void );
     DECL_LINK( ModifiedSliderHdl_Impl, weld::Scale&, void );
     void ModifiedHdl_Impl(void const *);
@@ -527,7 +527,7 @@ private:
     std::unique_ptr<weld::CustomWeld> m_xBitmapLBWin;
 
     DECL_LINK( ModifyBitmapHdl, ValueSet*, void );
-    DECL_LINK( ClickScaleHdl, weld::ToggleButton&, void );
+    DECL_LINK( ClickScaleHdl, weld::Toggleable&, void );
     DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBox&, void );
     DECL_LINK( ModifyBitmapSizeHdl, weld::MetricSpinButton&, void );
     DECL_LINK( ModifyBitmapPositionHdl, weld::ComboBox&, void );
@@ -695,7 +695,7 @@ private:
 
     DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void);
     DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void );
-    DECL_LINK( SelectColorModeHdl_Impl, weld::ToggleButton&, void );
+    DECL_LINK( SelectColorModeHdl_Impl, weld::Toggleable&, void );
     void ChangeColor(const Color &rNewColor, bool bUpdatePreset = true);
     void SetColorModel(ColorModel eModel);
     void ChangeColorModel();
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 6e193acedc4a..1368425c87ff 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -171,17 +171,17 @@ private:
     // handler for gallery popup menu button + size
     DECL_LINK(GraphicHdl_Impl, const OString&, void);
     DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(MenuCreateHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(RatioHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(MenuCreateHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void);
 
     DECL_LINK(ClickInvisibleHdl_Impl, weld::ComboBox&, void);
     void ClickInvisibleHdl_Impl();
-    DECL_LINK(ChangeStartClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ChangeStartClickHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(ChangeStartListBoxHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(ChangeStartModifyHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ChangeEndListBoxHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(ChangeEndModifyHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(ChangeEndClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ChangeEndClickHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(ChangePreviewListBoxHdl_Impl, ColorListBox&, void);
     DECL_LINK(ChangePreviewModifyHdl_Impl, weld::MetricSpinButton&, void);
     void ChangePreviewHdl_Impl(const weld::MetricSpinButton*);
@@ -282,10 +282,10 @@ private:
     DECL_LINK(ChangeNumber2Hdl_Impl, weld::SpinButton&, void);
     DECL_LINK(ClickLoadHdl_Impl, weld::Button&, void);
     DECL_LINK(ClickSaveHdl_Impl, weld::Button&, void);
-    DECL_LINK(ChangeMetricHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ChangeMetricHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(SelectTypeListBoxHdl_Impl, weld::ComboBox&, void);
     void SelectTypeHdl_Impl(const weld::ComboBox*);
-    void ChangeMetricHdl_Impl(const weld::ToggleButton*);
+    void ChangeMetricHdl_Impl(const weld::Toggleable*);
 
     void CheckChanges_Impl();
 
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index f1344c800157..57c3284d61b3 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -96,7 +96,7 @@ namespace svx
         bool                       m_bDocumentMode;
 
         Link<LinkParamNone*,void> m_aOptionsChangedLink;
-        Link<weld::ToggleButton&,void> m_aClickByCharacterLink;
+        Link<weld::Toggleable&,void> m_aClickByCharacterLink;
 
         std::unique_ptr<weld::Button> m_xFind;
         std::unique_ptr<weld::Button> m_xIgnore;
@@ -128,8 +128,8 @@ namespace svx
         void    SetChangeHdl( const Link<weld::Button&,void>& _rHdl );
         void    SetChangeAllHdl( const Link<weld::Button&,void>& _rHdl );
 
-        void    SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& _rHdl );
-        void    SetConversionFormatChangedHdl( const Link<weld::ToggleButton&,void>& _rHdl );
+        void    SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& _rHdl );
+        void    SetConversionFormatChangedHdl( const Link<weld::Toggleable&,void>& _rHdl );
         void    SetFindHdl( const Link<weld::Button&,void>& _rHdl );
 
         OUString  GetCurrentString( ) const;
@@ -164,8 +164,8 @@ namespace svx
         DECL_LINK( OnOption, weld::Button&, void );
         DECL_LINK( OnSuggestionModified, weld::Entry&, void );
         DECL_LINK( OnSuggestionSelected, SuggestionDisplay&, void );
-        DECL_LINK( OnConversionDirectionClicked, weld::ToggleButton&, void );
-        DECL_LINK( ClickByCharacterHdl, weld::ToggleButton&, void );
+        DECL_LINK( OnConversionDirectionClicked, weld::Toggleable&, void );
+        DECL_LINK( ClickByCharacterHdl, weld::Toggleable&, void );
 
         /// fill the suggestion list box with suggestions for the actual input
         void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions );
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index f930bc971411..e8eb96e6883d 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -45,8 +45,8 @@ private:
     std::unique_ptr<weld::Entry> m_xEdPassword;
     std::unique_ptr<weld::CheckButton> m_xCbAnonymous;
 
-    DECL_LINK( Click_SmartProtocol_Impl, weld::ToggleButton&, void ); ///< Radiobutton toggled: Type HTTP or FTP
-    DECL_LINK( ClickAnonymousHdl_Impl, weld::ToggleButton&, void ); ///< Checkbox : Anonymous User
+    DECL_LINK( Click_SmartProtocol_Impl, weld::Toggleable&, void ); ///< Radiobutton toggled: Type HTTP or FTP
+    DECL_LINK( ClickAnonymousHdl_Impl, weld::Toggleable&, void ); ///< Checkbox : Anonymous User
     DECL_LINK( ModifiedLoginHdl_Impl, weld::Entry&,   void ); ///< Contents of editfield "Login" modified
     DECL_LINK( LostFocusTargetHdl_Impl, weld::Widget&, void ); ///< Combobox "Target" lost its focus
     DECL_LINK( ModifiedTargetHdl_Impl, weld::ComboBox&, void );    ///< Contents of editfield "Target" modified
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 87d6395dfb91..c76658470450 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -64,7 +64,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
 
     DECL_LINK(DoubleClickHdl, weld::TreeView&, bool);
     DECL_LINK(BrowseHdl, weld::Button&, void);
-    DECL_LINK(RadioHdl, weld::ToggleButton&, void);
+    DECL_LINK(RadioHdl, weld::Toggleable&, void);
     bool IsCreateNew() const override { return m_xRbNewObject->get_active(); }
 
 public:
@@ -99,7 +99,7 @@ private:
     std::unique_ptr<weld::CheckButton> m_xCBMarginHeightDefault;
 
     DECL_LINK(OpenHdl, weld::Button&, void);
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckHdl, weld::Toggleable&, void);
 
     void Init();
 
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index d55c8b8d44ec..1a5d58a8357f 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -73,7 +73,7 @@ private:
     void            SetupType_Impl( SdrCaptionType nType );
     DECL_LINK(ExtensionSelectHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(PositionSelectHdl_Impl, weld::ComboBox&, void);
-    DECL_LINK(LineOptHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(LineOptHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(SelectCaptTypeHdl_Impl, ValueSet*, void);
 
 public:
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 8a6453cbc71a..1e54954ec555 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -58,7 +58,7 @@ class SvBaseLinksDlg : public weld::GenericDialogController
 
     DECL_LINK(LinksSelectHdl, weld::TreeView&, void);
     DECL_LINK(LinksDoubleClickHdl, weld::TreeView&, bool);
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
     DECL_LINK(UpdateNowClickHdl, weld::Button&, void);
     DECL_LINK(ChangeSourceClickHdl, weld::Button&, void);
     DECL_LINK(BreakLinkClickHdl, weld::Button&, void);
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 8f8836d0b8ed..6a41fb122854 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -57,11 +57,11 @@ private:
 
     void                FillUnitLB();
 
-    DECL_LINK(ClickAutoPosHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ClickAutoPosHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(ChangeAttrEditHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ChangeAttrSpinHdl_Impl, weld::SpinButton&, void);
     DECL_LINK(ChangeAttrListBoxHdl_Impl, weld::ComboBox&, void);
-    DECL_LINK(ChangeAttrClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ChangeAttrClickHdl_Impl, weld::Toggleable&, void);
     void ChangeAttrHdl_Impl(void const *);
 
 public:
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index dbbbfa1e4b24..7a4fd4605c6b 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -135,12 +135,12 @@ private:
     DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool);
     DECL_LINK(SelFormatListBoxHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(SelFormatTreeListBoxHdl_Impl, weld::TreeView&, void);
-    DECL_LINK(SelFormatClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(SelFormatClickHdl_Impl, weld::Toggleable&, void);
     void SelFormatHdl_Impl(weld::Widget*);
     DECL_LINK(ClickHdl_Impl, weld::Button&, void);
     DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void);
     DECL_LINK(OptEditHdl_Impl, weld::SpinButton&, void);
-    DECL_LINK(OptClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(OptClickHdl_Impl, weld::Toggleable&, void);
     void EditHdl_Impl(const weld::Entry*);
     void OptHdl_Impl(const weld::Widget*);
 
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 4a00f44e6f76..c4f6961f82b0 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -265,17 +265,17 @@ class SvxNumOptionsTabPage : public SfxTabPage
     DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
     DECL_LINK(LevelHdl, void *, void);
-    DECL_LINK(PopupActivateHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(GraphicHdl_Impl, const OString&, void);
     DECL_LINK(BulletHdl_Impl, weld::Button&, void);
     DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(RatioHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(CharFmtHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void);
     DECL_LINK(SpinModifyHdl_Impl, weld::SpinButton&, void);
     DECL_LINK(AllLevelHdl_Impl, weld::SpinButton&, void);
     DECL_LINK(OrientHdl_Impl, weld::ComboBox&, void);
-    DECL_LINK(SameLevelHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(SameLevelHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(BulColorHdl_Impl, ColorListBox&, void);
     DECL_LINK(BulRelSizeHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(PreviewInvalidateHdl_Impl, Timer*, void);
@@ -354,7 +354,7 @@ class SvxNumPositionTabPage : public SfxTabPage
     DECL_LINK(LevelHdl, void *, void);
     DECL_LINK(EditModifyHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(DistanceHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(RelativeHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(RelativeHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(StandardHdl_Impl, weld::Button&, void);
 
     void InitPosAndSpaceMode();
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 8ecf942b9a13..6da4646ecc17 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -42,7 +42,7 @@ class SvxAsianLayoutPage : public SfxTabPage
     std::unique_ptr<weld::Label> m_xHintFT;
 
     DECL_LINK(LanguageHdl, weld::ComboBox&, void);
-    DECL_LINK(ChangeStandardHdl, weld::ToggleButton&, void);
+    DECL_LINK(ChangeStandardHdl, weld::Toggleable&, void);
     DECL_LINK(ModifyHdl, weld::Entry&, void);
 
 public:
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index fe43158e9424..f38283c1c61d 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -136,11 +136,11 @@ private:
     DECL_LINK(LayoutHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(GutterPositionHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(PaperBinHdl_Impl, weld::Widget&, void);
-    DECL_LINK(SwapOrientation_Impl, weld::ToggleButton&, void);
+    DECL_LINK(SwapOrientation_Impl, weld::Toggleable&, void);
     void SwapFirstValues_Impl( bool bSet );
     DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void);
     void InitHeadFoot_Impl( const SfxItemSet& rSet );
-    DECL_LINK(CenterHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(CenterHdl_Impl, weld::Toggleable&, void);
     void UpdateExample_Impl( bool bResetbackground = false );
 
     DECL_LINK(PaperSizeSelect_Impl, weld::ComboBox&, void );
@@ -153,7 +153,7 @@ private:
     void RangeHdl_Impl();
     void CalcMargin_Impl();
 
-    DECL_LINK(RegisterModify, weld::ToggleButton&, void);
+    DECL_LINK(RegisterModify, weld::Toggleable&, void);
 
     // page direction
     /** Disables vertical page direction entries in the text flow listbox. */
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index cea797707a7e..a187bba92787 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -86,7 +86,7 @@ private:
     DECL_LINK(LineDistPopupHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(LineDistHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(ModifyHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(AutoHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(AutoHdl_Impl, weld::Toggleable&, void);
 
     bool m_bLineDistToggled = false;
 
@@ -148,7 +148,7 @@ class SvxParaAlignTabPage : public SfxTabPage
     std::unique_ptr<weld::Widget> m_xPropertiesFL;
     std::unique_ptr<svx::FrameDirectionListBox>  m_xTextDirectionLB;
 
-    DECL_LINK(AlignHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(AlignHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(LastLineHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(TextDirectionHdl_Impl, weld::ComboBox&, void);
 
@@ -264,16 +264,16 @@ private:
     void OrphanHdl();
     void WidowHdl();
 
-    DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(KeepTogetherHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(WidowHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(OrphanHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(HyphenClickHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(PageBreakHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(KeepTogetherHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(WidowHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(OrphanHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(HyphenClickHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(ApplyCollClickHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(PageBreakPosHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(PageBreakTypeHdl_Impl, weld::ComboBox&, void);
-    DECL_LINK(PageNumBoxClickHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(KeepParaBoxClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(PageNumBoxClickHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(KeepParaBoxClickHdl_Impl, weld::Toggleable&, void);
 
     virtual void            PageCreated(const SfxAllItemSet& aSet) override;
 };
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 5f94d06c0d6d..2e13cc1b616c 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -47,7 +47,7 @@ class PasswordToOpenModifyDialog : public SfxDialogController
 
 
     DECL_LINK(OkBtnClickHdl, weld::Button&, void);
-    DECL_LINK(ReadonlyOnOffHdl, weld::ToggleButton&, void);
+    DECL_LINK(ReadonlyOnOffHdl, weld::Toggleable&, void);
     DECL_LINK(ChangeHdl, weld::Entry&, void);
 
     PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) = delete;
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index 22e61e0ff7fc..ce14e0714a3e 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -35,7 +35,7 @@ private:
 public:
     SvxSplitTableDlg(weld::Window *pParent, bool bIsTableVertical, tools::Long nMaxVertical, tools::Long nMaxHorizontal);
 
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
 
     bool IsHorizontal() const;
     bool IsProportional() const;
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index d9c72495acde..18e48481a3ce 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -84,13 +84,13 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     std::unique_ptr<weld::CustomWeld> m_xExampleWN;
 
     DECL_LINK(RangeModifyHdl, weld::Widget&, void);
-    DECL_LINK(RangeModifyClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(AnchorTypeHdl, weld::ToggleButton&, void);
+    DECL_LINK(RangeModifyClickHdl, weld::Toggleable&, void);
+    DECL_LINK(AnchorTypeHdl, weld::Toggleable&, void);
     DECL_LINK(PosHdl, weld::ComboBox&, void);
     DECL_LINK(RelHdl, weld::ComboBox&, void);
-    DECL_LINK(MirrorHdl, weld::ToggleButton&, void);
+    DECL_LINK(MirrorHdl, weld::Toggleable&, void);
     DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void);
-    DECL_LINK(ProtectHdl, weld::ToggleButton&, void);
+    DECL_LINK(ProtectHdl, weld::Toggleable&, void);
 
     void            InitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel,
                             sal_uInt16 nV,  sal_uInt16 nVRel,
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index c6e7e70f748d..ddd7775b24da 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -129,8 +129,8 @@ private:
     DECL_LINK(DelHdl_Impl, weld::Button&, void);
     DECL_LINK(DelAllHdl_Impl, weld::Button&, void);
 
-    DECL_LINK(FillTypeCheckHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(TabTypeCheckHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(FillTypeCheckHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(TabTypeCheckHdl_Impl, weld::Toggleable&, void);
 
     DECL_LINK(SelectHdl_Impl, weld::TreeView&, bool);
     DECL_LINK(ModifyHdl_Impl, weld::ComboBox&, void);
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index bef4a90e7f57..4f7785887a6c 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -67,9 +67,9 @@ private:
     std::unique_ptr<weld::MetricSpinButton> m_xMtrFldDelay;
 
     DECL_LINK( SelectEffectHdl_Impl, weld::ComboBox&, void );
-    DECL_LINK( ClickEndlessHdl_Impl, weld::ToggleButton&, void );
-    DECL_LINK( ClickAutoHdl_Impl, weld::ToggleButton&, void );
-    DECL_LINK( ClickPixelHdl_Impl, weld::ToggleButton&, void );
+    DECL_LINK( ClickEndlessHdl_Impl, weld::Toggleable&, void );
+    DECL_LINK( ClickAutoHdl_Impl, weld::Toggleable&, void );
+    DECL_LINK( ClickPixelHdl_Impl, weld::Toggleable&, void );
     DECL_LINK( ClickDirectionHdl_Impl, weld::Button&, void );
 
     void SelectDirection( SdrTextAniDirection nValue );
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 17a479af3e93..fe00b6302c3f 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -63,8 +63,8 @@ private:
     std::unique_ptr<weld::CustomWeld> m_xCtlPosition;
     std::unique_ptr<weld::CheckButton> m_xTsbFullWidth;
 
-    DECL_LINK(ClickFullWidthHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(ClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ClickFullWidthHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(ClickHdl_Impl, weld::Toggleable&, void);
 
     /** Return whether the text direction is from left to right (</sal_True>) or
         top to bottom (</sal_False>).
diff --git a/cui/source/inc/toolbarmodedlg.hxx b/cui/source/inc/toolbarmodedlg.hxx
index 8d0216734a75..5965aa7598d6 100644
--- a/cui/source/inc/toolbarmodedlg.hxx
+++ b/cui/source/inc/toolbarmodedlg.hxx
@@ -30,7 +30,7 @@ private:
 
     void UpdateImage(std::u16string_view sFileName);
     int GetActiveRadioButton();
-    DECL_LINK(SelectToolbarmode, weld::ToggleButton&, void);
+    DECL_LINK(SelectToolbarmode, weld::Toggleable&, void);
     DECL_LINK(OnApplyClick, weld::Button&, void);
 };
 
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 33d984ff8b26..f3a6ba0a0e21 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -116,16 +116,16 @@ private:
     std::unique_ptr<weld::CheckButton> m_xTsbAutoGrowWidth;
     std::unique_ptr<weld::CheckButton> m_xTsbAutoGrowHeight;
 
-    DECL_LINK(ChangePosProtectHdl, weld::ToggleButton&, void);
-    DECL_LINK(ChangeSizeProtectHdl, weld::ToggleButton&, void);
+    DECL_LINK(ChangePosProtectHdl, weld::Toggleable&, void);
+    DECL_LINK(ChangeSizeProtectHdl, weld::Toggleable&, void);
 
     void SetMinMaxPosition();
     void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange);
 
     DECL_LINK( ChangeWidthHdl, weld::MetricSpinButton&, void );
     DECL_LINK( ChangeHeightHdl, weld::MetricSpinButton&, void );
-    DECL_LINK( ClickSizeProtectHdl, weld::ToggleButton&, void );
-    DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void );
+    DECL_LINK( ClickSizeProtectHdl, weld::Toggleable&, void );
+    DECL_LINK( ClickAutoHdl, weld::Toggleable&, void );
 
 public:
     SvxPositionSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index f338e313305d..f44998378d73 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -45,11 +45,11 @@ private:
     std::unique_ptr<weld::CheckButton>        m_xBookModeChk;
     std::unique_ptr<weld::Button>             m_xOKBtn;
 
-    DECL_LINK(UserHdl, weld::ToggleButton&, void);
+    DECL_LINK(UserHdl, weld::Toggleable&, void);
     DECL_LINK(SpinHdl, weld::MetricSpinButton&, void);
-    DECL_LINK(ViewLayoutUserHdl, weld::ToggleButton&, void);
+    DECL_LINK(ViewLayoutUserHdl, weld::Toggleable&, void);
     DECL_LINK(ViewLayoutSpinHdl, weld::SpinButton&, void);
-    DECL_LINK(ViewLayoutCheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(ViewLayoutCheckHdl, weld::Toggleable&, void);
     DECL_LINK(OKHdl, weld::Button&, void);
 
 public:
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index a118b38a47cf..a478d9a652c3 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -221,7 +221,7 @@ namespace offapp
         updateCurrentRow();
     }
 
-    IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, weld::ToggleButton&, rCheckBox, void )
+    IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, weld::Toggleable&, rCheckBox, void )
     {
         bool bGloballyEnabled = m_xEnablePooling->get_active();
         bool bLocalDriverChanged = m_xDriverPoolingEnabled.get() == &rCheckBox;
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 39b5814cddda..549448e21ff6 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -57,7 +57,7 @@ namespace offapp
         bool isModifiedDriverList() const;
         void saveDriverList() { m_aSavedSettings = m_aSettings; }
 
-        DECL_LINK(OnEnabledDisabled, weld::ToggleButton&, void);
+        DECL_LINK(OnEnabledDisabled, weld::Toggleable&, void);
         DECL_LINK(OnSpinValueChanged, weld::SpinButton&, void);
         DECL_LINK(OnDriverRowChanged, weld::TreeView&, void);
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index fcf658a88b32..c438061bea90 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -249,7 +249,7 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
     m_xFontHeightLB->save_value();
 }
 
-IMPL_LINK(SvxFontSubstTabPage, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvxFontSubstTabPage, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     SelectHdl(&rButton);
 }
@@ -362,7 +362,7 @@ void SvxFontSubstTabPage::SelectHdl(const weld::Widget* pWin)
     CheckEnable();
 }
 
-IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, weld::Toggleable&, rBox, void)
 {
     OUString sFontName = m_xFontNameLB->get_active_text();
     bool bNonPropOnly = rBox.get_active();
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index e1b4269c012c..600af4cf4fa1 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -39,10 +39,10 @@ class SvxFontSubstTabPage : public SfxTabPage
     std::unique_ptr<weld::ComboBox> m_xFontHeightLB;
 
     DECL_LINK(SelectComboBoxHdl, weld::ComboBox&, void);
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
     DECL_LINK(ClickHdl, weld::Button&, void);
     DECL_LINK(TreeListBoxSelectHdl, weld::TreeView&, void);
-    DECL_LINK(NonPropFontsHdl, weld::ToggleButton&, void);
+    DECL_LINK(NonPropFontsHdl, weld::Toggleable&, void);
     DECL_LINK(HeaderBarClick, int, void);
     DECL_LINK(ResizeHdl, const Size&, void);
 
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 962cf1fc2e0a..a5294c0b4b70 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -335,7 +335,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, weld::ComboBox&, void)
     m_xEndED->set_text(sEnd);
 }
 
-IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, weld::Toggleable&, rBox, void)
 {
     bool bCheck = rBox.get_active();
     m_xStartED->set_sensitive(!bCheck);
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 8567189e6cc4..0296e9a0d132 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -165,12 +165,12 @@ public:
     explicit ColorConfigWindow_Impl(weld::Window* pTopLevel, weld::Container* pParent);
 
 public:
-    void SetLinks(Link<weld::ToggleButton&,void> const&,
+    void SetLinks(Link<weld::Toggleable&,void> const&,
                   Link<ColorListBox&,void> const&,
                   Link<weld::Widget&,void> const&,
                   weld::ScrolledWindow& rScroll);
     void Update(EditableColorConfig const*, EditableExtendedColorConfig const*);
-    void ClickHdl(EditableColorConfig*, weld::ToggleButton&);
+    void ClickHdl(EditableColorConfig*, weld::Toggleable&);
     void ColorHdl(EditableColorConfig*, EditableExtendedColorConfig*, const ColorListBox*);
 
     weld::Widget& GetWidget1()
@@ -218,7 +218,7 @@ private:
         }
         void Hide ();
     public:
-        void SetLinks(Link<weld::ToggleButton&,void> const&,
+        void SetLinks(Link<weld::Toggleable&,void> const&,
                       Link<ColorListBox&,void> const&,
                       Link<weld::Widget&,void> const&);
         void Update (ColorConfigValue const&);
@@ -226,7 +226,7 @@ private:
         void ColorChanged (ColorConfigValue&);
         void ColorChanged (ExtendedColorConfigValue&);
     public:
-        bool Is(const weld::ToggleButton* pBox) const { return m_xText.get() == pBox; }
+        bool Is(const weld::Toggleable* pBox) const { return m_xText.get() == pBox; }
         bool Is(const ColorListBox* pBox) const { return m_xColorList.get() == pBox; }
     private:
         // checkbox (CheckBox) or simple text (FixedText)
@@ -310,13 +310,13 @@ void ColorConfigWindow_Impl::Entry::Hide()
 }
 
 // SetLinks()
-void ColorConfigWindow_Impl::Entry::SetLinks(Link<weld::ToggleButton&,void> const& rCheckLink,
+void ColorConfigWindow_Impl::Entry::SetLinks(Link<weld::Toggleable&,void> const& rCheckLink,
                                              Link<ColorListBox&,void> const& rColorLink,
                                              Link<weld::Widget&,void> const& rGetFocusLink)
 {
     m_xColorList->SetSelectHdl(rColorLink);
     m_xColorList->connect_focus_in(rGetFocusLink);
-    if (weld::ToggleButton* pCheckBox = dynamic_cast<weld::ToggleButton*>(m_xText.get()))
+    if (weld::Toggleable* pCheckBox = dynamic_cast<weld::Toggleable*>(m_xText.get()))
     {
         pCheckBox->connect_toggled(rCheckLink);
         pCheckBox->connect_focus_in(rGetFocusLink);
@@ -328,7 +328,7 @@ void ColorConfigWindow_Impl::Entry::Update(ColorConfigValue const& rValue)
 {
     Color aColor(rValue.nColor);
     m_xColorList->SelectEntry(aColor);
-    if (weld::ToggleButton* pCheckBox = dynamic_cast<weld::ToggleButton*>(m_xText.get()))
+    if (weld::Toggleable* pCheckBox = dynamic_cast<weld::Toggleable*>(m_xText.get()))
         pCheckBox->set_active(rValue.bIsVisible);
 }
 
@@ -461,7 +461,7 @@ void ColorConfigWindow_Impl::AdjustExtraWidths(int nTextWidth)
 }
 
 // SetLinks()
-void ColorConfigWindow_Impl::SetLinks(Link<weld::ToggleButton&,void> const& aCheckLink,
+void ColorConfigWindow_Impl::SetLinks(Link<weld::Toggleable&,void> const& aCheckLink,
                                       Link<ColorListBox&,void> const& aColorLink,
                                       Link<weld::Widget&,void> const& rGetFocusLink,
                                       weld::ScrolledWindow& rScroll)
@@ -503,7 +503,7 @@ void ColorConfigWindow_Impl::Update (
 }
 
 // ClickHdl()
-void ColorConfigWindow_Impl::ClickHdl(EditableColorConfig* pConfig, weld::ToggleButton& rBox)
+void ColorConfigWindow_Impl::ClickHdl(EditableColorConfig* pConfig, weld::Toggleable& rBox)
 {
     for (unsigned i = 0; i != ColorConfigEntryCount; ++i)
     {
@@ -591,7 +591,7 @@ class ColorConfigCtrl_Impl
     EditableColorConfig*            pColorConfig;
     EditableExtendedColorConfig*    pExtColorConfig;
 
-    DECL_LINK(ClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(ClickHdl, weld::Toggleable&, void);
     DECL_LINK(ColorHdl, ColorListBox&, void);
     DECL_LINK(ControlFocusHdl, weld::Widget&, void);
 
@@ -629,7 +629,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(weld::Window* pTopLevel, weld::Builde
 {
     m_xBody->set_stack_background();
 
-    Link<weld::ToggleButton&,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
+    Link<weld::Toggleable&,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
     Link<ColorListBox&,void> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
     Link<weld::Widget&,void> const& aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
     m_xScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink, *m_xVScroll);
@@ -641,7 +641,7 @@ void ColorConfigCtrl_Impl::Update ()
     m_xScrollWindow->Update(pColorConfig, pExtColorConfig);
 }
 
-IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, weld::Toggleable&, rBox, void)
 {
     DBG_ASSERT(pColorConfig, "Configuration not set");
     m_xScrollWindow->ClickHdl(pColorConfig, rBox);
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index ab5542c37566..52bd18fc8788 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -24,7 +24,7 @@
 
 // class SvxCTLOptionsPage -----------------------------------------------------
 
-IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::Toggleable&, void)
 {
     bool bIsSequenceChecking = m_xSequenceCheckingCB->get_active();
     m_xRestrictedCB->set_sensitive( bIsSequenceChecking );
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 40df4014c874..0cc24951b54b 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -32,7 +32,7 @@ private:
     std::unique_ptr<weld::RadioButton> m_xMovementVisualRB;
     std::unique_ptr<weld::ComboBox> m_xNumeralsLB;
 
-    DECL_LINK( SequenceCheckingCB_Hdl, weld::ToggleButton&, void );
+    DECL_LINK( SequenceCheckingCB_Hdl, weld::Toggleable&, void );
 
 public:
     SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 344f288f96d9..8624675f0b26 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -55,12 +55,12 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage()
 {
 }
 
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, weld::Toggleable&, void)
 {
     m_xWBasicWbctblCB->set_sensitive(m_xWBasicCodeCB->get_active());
 }
 
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::ToggleButton&, void)

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list