[Libreoffice-commits] core.git: cui/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 20 10:39:02 UTC 2021
cui/source/dialogs/SpellDialog.cxx | 4 ++--
cui/source/dialogs/insdlg.cxx | 8 ++++----
cui/source/inc/SpellDialog.hxx | 2 +-
cui/source/inc/insdlg.hxx | 2 +-
cui/source/inc/numfmt.hxx | 4 ++--
cui/source/inc/textanim.hxx | 6 +++---
cui/source/inc/textattr.hxx | 4 ++--
cui/source/options/connpooloptions.cxx | 6 +++---
cui/source/options/connpooloptions.hxx | 2 +-
cui/source/options/fontsubs.cxx | 7 ++++++-
cui/source/options/fontsubs.hxx | 1 +
cui/source/options/optctl.cxx | 4 ++--
cui/source/options/optctl.hxx | 2 +-
cui/source/options/optfltr.cxx | 8 ++++----
cui/source/options/optfltr.hxx | 4 ++--
cui/source/options/optinet2.cxx | 8 ++++----
cui/source/options/optinet2.hxx | 4 ++--
cui/source/options/optjava.cxx | 4 ++--
cui/source/options/optjava.hxx | 2 +-
cui/source/options/optsave.cxx | 4 ++--
cui/source/options/optsave.hxx | 2 +-
cui/source/options/optupdt.cxx | 4 ++--
cui/source/options/optupdt.hxx | 2 +-
cui/source/tabpages/numfmt.cxx | 12 ++++++------
cui/source/tabpages/textanim.cxx | 12 ++++++------
cui/source/tabpages/textattr.cxx | 20 ++++++++++----------
26 files changed, 72 insertions(+), 66 deletions(-)
New commits:
commit 5792b08d3762117dfa28ea08638d79a5b01957ad
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 20 09:31:05 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu May 20 12:38:17 2021 +0200
use toggle instead of click for CheckButton
Change-Id: I73ffd66a6e5eed1f95882e874d9319ecad5550f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115853
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 5ad37af93487..a8e20608d285 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -246,7 +246,7 @@ void SpellDialog::Init_Impl()
m_xUndoPB->connect_clicked(LINK( this, SpellDialog, UndoHdl ) );
m_xAutoCorrPB->connect_clicked( LINK( this, SpellDialog, ExtClickHdl ) );
- m_xCheckGrammarCB->connect_clicked( LINK( this, SpellDialog, CheckGrammarHdl ));
+ m_xCheckGrammarCB->connect_toggled( LINK( this, SpellDialog, CheckGrammarHdl ));
m_xOptionsPB->connect_clicked( LINK( this, SpellDialog, ExtClickHdl ) );
m_xSuggestionLB->connect_row_activated( LINK( this, SpellDialog, DoubleClickChangeHdl ) );
@@ -448,7 +448,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, weld::Button&, rBtn, void )
}
}
-IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::ToggleButton&, void)
{
rParent.SetGrammarChecking(m_xCheckGrammarCB->get_active());
Impl_Restore(true);
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index d22837c7b4eb..4f1662a45e61 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -358,9 +358,9 @@ void SfxInsertFloatingFrameDialog::Init()
m_xNMMarginHeight = m_xBuilder->weld_spin_button("height");
m_xCBMarginHeightDefault = m_xBuilder->weld_check_button("defaultheight");
- Link<weld::Button&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl));
- m_xCBMarginWidthDefault->connect_clicked(aLink);
- m_xCBMarginHeightDefault->connect_clicked(aLink);
+ Link<weld::ToggleButton&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl));
+ m_xCBMarginWidthDefault->connect_toggled(aLink);
+ m_xCBMarginHeightDefault->connect_toggled(aLink);
m_xCBMarginWidthDefault->set_active(true);
m_xCBMarginHeightDefault->set_active(true);
@@ -545,7 +545,7 @@ short SfxInsertFloatingFrameDialog::run()
return nRet;
}
-IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::Button&, rButton, void)
+IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::ToggleButton&, rButton, void)
{
weld::CheckButton& rCB = dynamic_cast<weld::CheckButton&>(rButton);
if (&rCB == m_xCBMarginWidthDefault.get())
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index f184f8e78ad2..678f09729e3e 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::Button&, void);
+ DECL_LINK(CheckGrammarHdl, weld::ToggleButton&, void);
DECL_LINK(ExtClickHdl, weld::Button&, void);
DECL_LINK(CancelHdl, weld::Button&, void);
DECL_LINK(ModifyHdl, LinkParamNone*, void);
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index d6bd30ed395d..4134128fcdd8 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -99,7 +99,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xCBMarginHeightDefault;
DECL_LINK(OpenHdl, weld::Button&, void);
- DECL_LINK(CheckHdl, weld::Button&, void);
+ DECL_LINK(CheckHdl, weld::ToggleButton&, void);
void Init();
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 5d525282a9ca..dbbbfa1e4b24 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::Button&, void);
+ DECL_LINK(SelFormatClickHdl_Impl, weld::ToggleButton&, 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::Button&, void);
+ DECL_LINK(OptClickHdl_Impl, weld::ToggleButton&, void);
void EditHdl_Impl(const weld::Entry*);
void OptHdl_Impl(const weld::Widget*);
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 04306a7b69db..bef4a90e7f57 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::Button&, void );
- DECL_LINK( ClickAutoHdl_Impl, weld::Button&, void );
- DECL_LINK( ClickPixelHdl_Impl, weld::Button&, void );
+ DECL_LINK( ClickEndlessHdl_Impl, weld::ToggleButton&, void );
+ DECL_LINK( ClickAutoHdl_Impl, weld::ToggleButton&, void );
+ DECL_LINK( ClickPixelHdl_Impl, weld::ToggleButton&, 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 c2abee744b40..17a479af3e93 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::Button&, void);
- DECL_LINK(ClickHdl_Impl, weld::Button&, void);
+ DECL_LINK(ClickFullWidthHdl_Impl, weld::ToggleButton&, void);
+ DECL_LINK(ClickHdl_Impl, weld::ToggleButton&, void);
/** Return whether the text direction is from left to right (</sal_True>) or
top to bottom (</sal_False>).
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 7ceaf5803cfa..a118b38a47cf 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -65,8 +65,8 @@ namespace offapp
aWidths.push_back(m_xDriverList->get_approximate_digit_width() * 8);
m_xDriverList->set_column_fixed_widths(aWidths);
- m_xEnablePooling->connect_clicked( LINK(this, ConnectionPoolOptionsPage, OnEnabledDisabled) );
- m_xDriverPoolingEnabled->connect_clicked( LINK(this, ConnectionPoolOptionsPage, OnEnabledDisabled) );
+ m_xEnablePooling->connect_toggled( LINK(this, ConnectionPoolOptionsPage, OnEnabledDisabled) );
+ m_xDriverPoolingEnabled->connect_toggled( LINK(this, ConnectionPoolOptionsPage, OnEnabledDisabled) );
m_xDriverList->connect_changed(LINK(this, ConnectionPoolOptionsPage, OnDriverRowChanged));
m_xTimeout->connect_value_changed(LINK(this, ConnectionPoolOptionsPage, OnSpinValueChanged));
@@ -221,7 +221,7 @@ namespace offapp
updateCurrentRow();
}
- IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, weld::Button&, rCheckBox, void )
+ IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, weld::ToggleButton&, 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 570ec66abda6..39b5814cddda 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::Button&, void);
+ DECL_LINK(OnEnabledDisabled, weld::ToggleButton&, 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 fa05481d0663..fcf658a88b32 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -69,7 +69,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage(weld::Container* pPage, weld::DialogCon
m_xCheckLB->connect_changed(LINK(this, SvxFontSubstTabPage, TreeListBoxSelectHdl));
m_xCheckLB->connect_column_clicked(LINK(this, SvxFontSubstTabPage, HeaderBarClick));
- m_xUseTableCB->connect_clicked(aClickLink);
+ m_xUseTableCB->connect_toggled(LINK(this, SvxFontSubstTabPage, ToggleHdl));
m_xFont1CB->connect_changed(aLink2);
m_xFont2CB->connect_changed(aLink2);
m_xApply->connect_clicked(aClickLink);
@@ -249,6 +249,11 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* )
m_xFontHeightLB->save_value();
}
+IMPL_LINK(SvxFontSubstTabPage, ToggleHdl, weld::ToggleButton&, rButton, void)
+{
+ SelectHdl(&rButton);
+}
+
IMPL_LINK(SvxFontSubstTabPage, ClickHdl, weld::Button&, rButton, void)
{
SelectHdl(&rButton);
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 7af81e211b7c..e1b4269c012c 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -39,6 +39,7 @@ 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(ClickHdl, weld::Button&, void);
DECL_LINK(TreeListBoxSelectHdl, weld::TreeView&, void);
DECL_LINK(NonPropFontsHdl, weld::ToggleButton&, void);
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 983f077e7ff8..ab5542c37566 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::Button&, void)
+IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::ToggleButton&, void)
{
bool bIsSequenceChecking = m_xSequenceCheckingCB->get_active();
m_xRestrictedCB->set_sensitive( bIsSequenceChecking );
@@ -46,7 +46,7 @@ SvxCTLOptionsPage::SvxCTLOptionsPage(weld::Container* pPage, weld::DialogControl
, m_xMovementVisualRB(m_xBuilder->weld_radio_button("movementvisual"))
, m_xNumeralsLB(m_xBuilder->weld_combo_box("numerals"))
{
- m_xSequenceCheckingCB->connect_clicked(LINK(this, SvxCTLOptionsPage, SequenceCheckingCB_Hdl));
+ m_xSequenceCheckingCB->connect_toggled(LINK(this, SvxCTLOptionsPage, SequenceCheckingCB_Hdl));
}
SvxCTLOptionsPage::~SvxCTLOptionsPage()
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index e81d24beaa19..40df4014c874 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::Button&, void );
+ DECL_LINK( SequenceCheckingCB_Hdl, weld::ToggleButton&, 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 aadb46f9520d..344f288f96d9 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -47,20 +47,20 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(weld::Container* pPage, weld::DialogContr
, m_xPBasicCodeCB(m_xBuilder->weld_check_button("pp_basic"))
, m_xPBasicStgCB(m_xBuilder->weld_check_button("pp_saveorig"))
{
- m_xWBasicCodeCB->connect_clicked( LINK( this, OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl ) );
- m_xEBasicCodeCB->connect_clicked( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) );
+ m_xWBasicCodeCB->connect_toggled( LINK( this, OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl ) );
+ m_xEBasicCodeCB->connect_toggled( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) );
}
OfaMSFilterTabPage::~OfaMSFilterTabPage()
{
}
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, weld::ToggleButton&, void)
{
m_xWBasicWbctblCB->set_sensitive(m_xWBasicCodeCB->get_active());
}
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::ToggleButton&, void)
{
m_xEBasicExectblCB->set_sensitive(m_xEBasicCodeCB->get_active());
}
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 061636295848..07c07680b957 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -31,8 +31,8 @@ class OfaMSFilterTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xPBasicCodeCB;
std::unique_ptr<weld::CheckButton> m_xPBasicStgCB;
- DECL_LINK(LoadWordBasicCheckHdl_Impl, weld::Button&, void);
- DECL_LINK(LoadExcelBasicCheckHdl_Impl, weld::Button&, void);
+ DECL_LINK(LoadWordBasicCheckHdl_Impl, weld::ToggleButton&, void);
+ DECL_LINK(LoadExcelBasicCheckHdl_Impl, weld::ToggleButton&, void);
public:
OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
virtual ~OfaMSFilterTabPage() override;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 8f33c6a96700..a39a7f13a192 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -505,9 +505,9 @@ SvxSecurityTabPage::SvxSecurityTabPage(weld::Container* pPage, weld::DialogContr
InitControls();
m_xSecurityOptionsPB->connect_clicked( LINK( this, SvxSecurityTabPage, SecurityOptionsHdl ) );
- m_xSavePasswordsCB->connect_clicked( LINK( this, SvxSecurityTabPage, SavePasswordHdl ) );
+ m_xSavePasswordsCB->connect_toggled( LINK( this, SvxSecurityTabPage, SavePasswordHdl ) );
m_xMasterPasswordPB->connect_clicked( LINK( this, SvxSecurityTabPage, MasterPasswordHdl ) );
- m_xMasterPasswordCB->connect_clicked( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) );
+ m_xMasterPasswordCB->connect_toggled( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) );
m_xShowConnectionsPB->connect_clicked( LINK( this, SvxSecurityTabPage, ShowPasswordsHdl ) );
m_xMacroSecPB->connect_clicked( LINK( this, SvxSecurityTabPage, MacroSecPBHdl ) );
m_xCertPathPB->connect_clicked( LINK( this, SvxSecurityTabPage, CertPathPBHdl ) );
@@ -527,7 +527,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, weld::Button&, void)
m_xSecOptDlg->run();
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, weld::ToggleButton&, void)
{
try
{
@@ -606,7 +606,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl, weld::Button&, void)
{}
}
-IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, weld::ToggleButton&, void)
{
try
{
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 25facb94f76f..f4dd0940eb59 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -107,9 +107,9 @@ private:
std::unique_ptr<weld::Label> m_xNoPasswordSaveFT;
DECL_LINK(SecurityOptionsHdl, weld::Button&, void);
- DECL_LINK(SavePasswordHdl, weld::Button&, void);
+ DECL_LINK(SavePasswordHdl, weld::ToggleButton&, void);
DECL_LINK(MasterPasswordHdl, weld::Button&, void);
- DECL_LINK(MasterPasswordCBHdl, weld::Button&, void);
+ DECL_LINK(MasterPasswordCBHdl, weld::ToggleButton&, void);
DECL_LINK(ShowPasswordsHdl, weld::Button&, void);
DECL_LINK(MacroSecPBHdl, weld::Button&, void );
DECL_LINK(CertPathPBHdl, weld::Button&, void );
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 81bb4e30450a..4994b4aef1ed 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -96,7 +96,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage(weld::Container* pPage, weld::DialogContr
aWidths.push_back(m_xJavaList->get_pixel_size("Sun Microsystems Inc.").Width());
m_xJavaList->set_column_fixed_widths(aWidths);
- m_xJavaEnableCB->connect_clicked( LINK( this, SvxJavaOptionsPage, EnableHdl_Impl ) );
+ m_xJavaEnableCB->connect_toggled( LINK( this, SvxJavaOptionsPage, EnableHdl_Impl ) );
m_xAddBtn->connect_clicked( LINK( this, SvxJavaOptionsPage, AddHdl_Impl ) );
m_xParameterBtn->connect_clicked( LINK( this, SvxJavaOptionsPage, ParameterHdl_Impl ) );
m_xClassPathBtn->connect_clicked( LINK( this, SvxJavaOptionsPage, ClassPathHdl_Impl ) );
@@ -132,7 +132,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
#endif
}
-IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, weld::ToggleButton&, void)
{
bool bEnable = m_xJavaFrame->get_sensitive() && m_xJavaEnableCB->get_active();
m_xJavaList->set_sensitive(bEnable);
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index a3af9aaf71b1..1d96450155bb 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -81,7 +81,7 @@ private:
std::unique_ptr<weld::Widget> m_xJavaFrame;
- DECL_LINK(EnableHdl_Impl, weld::Button&, void);
+ DECL_LINK(EnableHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(CheckHdl_Impl, const weld::TreeView::iter_col&, void);
DECL_LINK(SelectHdl_Impl, weld::TreeView&, void);
DECL_LINK(AddHdl_Impl, weld::Button&, void);
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index f2d54205db5c..9571e56d5697 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -106,7 +106,7 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* p
m_xDocTypeLB->set_id(5, OUString::number(APP_DRAW) );
m_xDocTypeLB->set_id(6, OUString::number(APP_MATH) );
- m_xAutoSaveCB->connect_clicked( LINK( this, SvxSaveTabPage, AutoClickHdl_Impl ) );
+ m_xAutoSaveCB->connect_toggled( LINK( this, SvxSaveTabPage, AutoClickHdl_Impl ) );
SvtModuleOptions aModuleOpt;
if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) )
@@ -470,7 +470,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
m_xODFVersionLB->save_value();
}
-IMPL_LINK(SvxSaveTabPage, AutoClickHdl_Impl, weld::Button&, rBox, void)
+IMPL_LINK(SvxSaveTabPage, AutoClickHdl_Impl, weld::ToggleButton&, rBox, void)
{
if (&rBox != m_xAutoSaveCB.get())
return;
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index f916963e4eb8..75ba1149c764 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -59,7 +59,7 @@ private:
std::unique_ptr<weld::Widget> m_xODFWarningFI;
std::unique_ptr<weld::Label> m_xODFWarningFT;
- DECL_LINK( AutoClickHdl_Impl, weld::Button&, void );
+ DECL_LINK( AutoClickHdl_Impl, weld::ToggleButton&, void );
DECL_LINK( FilterHdl_Impl, weld::ComboBox&, void );
DECL_LINK(ODFVersionHdl_Impl, weld::ComboBox&, void );
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 897f92505603..b89fbda027f4 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -62,7 +62,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(weld::Container* pPage, weld::Dia
m_aNeverChecked = m_xNeverChecked->get_label();
m_xAutoCheckCheckBox->connect_toggled( LINK( this, SvxOnlineUpdateTabPage, AutoCheckHdl_Impl ) );
- m_xExtrasCheckBox->connect_clicked( LINK( this, SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl ) );
+ m_xExtrasCheckBox->connect_toggled( LINK( this, SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl ) );
m_xCheckNowButton->connect_clicked( LINK( this, SvxOnlineUpdateTabPage, CheckNowHdl_Impl ) );
m_xChangePathButton->connect_clicked( LINK( this, SvxOnlineUpdateTabPage, FileDialogHdl_Impl ) );
@@ -320,7 +320,7 @@ IMPL_LINK(SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, weld::ToggleButton&, rBox,
m_xEveryMonthButton->set_sensitive(bEnabled && !bReadOnly);
}
-IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, weld::ToggleButton&, void)
{
UpdateUserAgent();
}
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 3f189a336e18..c5939429ea2c 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -51,7 +51,7 @@ private:
DECL_LINK(FileDialogHdl_Impl, weld::Button&, void);
DECL_LINK(CheckNowHdl_Impl, weld::Button&, void);
DECL_LINK(AutoCheckHdl_Impl, weld::ToggleButton&, void);
- DECL_LINK(ExtrasCheckHdl_Impl, weld::Button&, void);
+ DECL_LINK(ExtrasCheckHdl_Impl, weld::ToggleButton&, void);
void UpdateLastCheckedText();
void UpdateUserAgent();
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index f51adcae2813..ec43ed08aca3 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -276,7 +276,7 @@ void SvxNumberFormatTabPage::Init_Impl()
m_xLbLanguage->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl));
m_xLbCurrency->connect_changed(aLink3);
m_xLbCurrency->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl));
- m_xCbSourceFormat->connect_clicked(LINK(this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl));
+ m_xCbSourceFormat->connect_toggled(LINK(this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl));
m_xCbSourceFormat->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl));
Link<weld::SpinButton&,void> aLink = LINK( this, SvxNumberFormatTabPage, OptEditHdl_Impl );
@@ -288,11 +288,11 @@ void SvxNumberFormatTabPage::Init_Impl()
m_xEdLeadZeroes->connect_value_changed(aLink);
m_xEdLeadZeroes->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl));
- m_xBtnNegRed->connect_clicked(LINK(this, SvxNumberFormatTabPage, OptClickHdl_Impl));
+ m_xBtnNegRed->connect_toggled(LINK(this, SvxNumberFormatTabPage, OptClickHdl_Impl));
m_xBtnNegRed->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl));
- m_xBtnThousand->connect_clicked(LINK(this, SvxNumberFormatTabPage, OptClickHdl_Impl));
+ m_xBtnThousand->connect_toggled(LINK(this, SvxNumberFormatTabPage, OptClickHdl_Impl));
m_xBtnThousand->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl));
- m_xBtnEngineering->connect_clicked(LINK(this, SvxNumberFormatTabPage, OptClickHdl_Impl));
+ m_xBtnEngineering->connect_toggled(LINK(this, SvxNumberFormatTabPage, OptClickHdl_Impl));
m_xBtnEngineering->connect_focus_in(LINK(this, SvxNumberFormatTabPage, LostFocusHdl_Impl));
m_xLbFormat->connect_row_activated(LINK(this, SvxNumberFormatTabPage, DoubleClickHdl_Impl));
m_xEdFormat->connect_changed(LINK(this, SvxNumberFormatTabPage, EditModifyHdl_Impl));
@@ -1148,7 +1148,7 @@ IMPL_LINK(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, rLb, boo
#*
#************************************************************************/
-IMPL_LINK(SvxNumberFormatTabPage, SelFormatClickHdl_Impl, weld::Button&, rLb, void)
+IMPL_LINK(SvxNumberFormatTabPage, SelFormatClickHdl_Impl, weld::ToggleButton&, rLb, void)
{
SelFormatHdl_Impl(&rLb);
}
@@ -1540,7 +1540,7 @@ void SvxNumberFormatTabPage::EditHdl_Impl(const weld::Entry* pEdFormat)
#*
#************************************************************************/
-IMPL_LINK(SvxNumberFormatTabPage, OptClickHdl_Impl, weld::Button&, rOptCtrl, void)
+IMPL_LINK(SvxNumberFormatTabPage, OptClickHdl_Impl, weld::ToggleButton&, rOptCtrl, void)
{
OptHdl_Impl(&rOptCtrl);
}
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index a7ee4b3aade9..04f930b88f8a 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -113,9 +113,9 @@ SvxTextAnimationPage::SvxTextAnimationPage(weld::Container* pPage, weld::DialogC
eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
m_xLbEffect->connect_changed( LINK( this, SvxTextAnimationPage, SelectEffectHdl_Impl ) );
- m_xTsbEndless->connect_clicked( LINK( this, SvxTextAnimationPage, ClickEndlessHdl_Impl ) );
- m_xTsbAuto->connect_clicked( LINK( this, SvxTextAnimationPage, ClickAutoHdl_Impl ) );
- m_xTsbPixel->connect_clicked( LINK( this, SvxTextAnimationPage, ClickPixelHdl_Impl ) );
+ m_xTsbEndless->connect_toggled( LINK( this, SvxTextAnimationPage, ClickEndlessHdl_Impl ) );
+ m_xTsbAuto->connect_toggled( LINK( this, SvxTextAnimationPage, ClickAutoHdl_Impl ) );
+ m_xTsbPixel->connect_toggled( LINK( this, SvxTextAnimationPage, ClickPixelHdl_Impl ) );
Link<weld::Button&,void> aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) );
m_xBtnUp->connect_clicked( aLink );
@@ -438,7 +438,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, weld::ComboBox&, voi
}
}
-IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, weld::ToggleButton&, void)
{
if( eAniKind == SdrTextAniKind::Slide )
return;
@@ -456,7 +456,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, weld::Button&, void)
}
}
-IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, weld::ToggleButton&, void)
{
TriState eState = m_xTsbAuto->get_state();
if( eState != TRISTATE_FALSE )
@@ -471,7 +471,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, weld::Button&, void)
}
}
-IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::ToggleButton&, void)
{
TriState eState = m_xTsbPixel->get_state();
if (eState == TRISTATE_TRUE)
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 9c650d46e373..4f935f252172 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -85,14 +85,14 @@ SvxTextAttrPage::SvxTextAttrPage(weld::Container* pPage, weld::DialogController*
SetFieldUnit( *m_xMtrFldTop, eFUnit );
SetFieldUnit( *m_xMtrFldBottom, eFUnit );
- Link<weld::Button&,void> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
- m_xTsbAutoGrowWidth->connect_clicked( aLink );
- m_xTsbAutoGrowHeight->connect_clicked( aLink );
- m_xTsbAutoGrowSize->connect_clicked( aLink );
- m_xTsbFitToSize->connect_clicked( aLink );
- m_xTsbContour->connect_clicked( aLink );
-
- m_xTsbFullWidth->connect_clicked(LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) );
+ Link<weld::ToggleButton&,void> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
+ m_xTsbAutoGrowWidth->connect_toggled( aLink );
+ m_xTsbAutoGrowHeight->connect_toggled( aLink );
+ m_xTsbAutoGrowSize->connect_toggled( aLink );
+ m_xTsbFitToSize->connect_toggled( aLink );
+ m_xTsbContour->connect_toggled( aLink );
+
+ m_xTsbFullWidth->connect_toggled(LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) );
}
SvxTextAttrPage::~SvxTextAttrPage()
@@ -528,7 +528,7 @@ void SvxTextAttrPage::PointChanged(weld::DrawingArea*, RectPoint eRP)
to be moved to a valid and adjacent position. This position depends on
the current anchor position and the text writing direction.
*/
-IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, weld::ToggleButton&, void)
{
if( m_xTsbFullWidth->get_state() != TRISTATE_TRUE )
return;
@@ -585,7 +585,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, weld::Button&, void)
|*
\************************************************************************/
-IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, weld::Button&, rButton, void)
+IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, weld::ToggleButton&, rButton, void)
{
if (&rButton == m_xTsbAutoGrowSize.get())
{
More information about the Libreoffice-commits
mailing list