[Libreoffice-commits] core.git: 2 commits - extras/source sc/source sc/uiconfig solenv/bin
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 29 18:28:45 UTC 2019
extras/source/glade/libreoffice-catalog.xml.in | 4
sc/source/ui/cctrl/editfield.cxx | 32 ---
sc/source/ui/inc/editfield.hxx | 11 -
sc/source/ui/inc/tpcalc.hxx | 54 +++---
sc/source/ui/optdlg/tpcalc.cxx | 211 ++++++++++---------------
sc/uiconfig/scalc/ui/optcalculatepage.ui | 21 +-
solenv/bin/native-code.py | 1
7 files changed, 128 insertions(+), 206 deletions(-)
New commits:
commit a26c59ddccc527239f53dadd1db04d34231b310d
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 29 12:00:33 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 29 20:27:56 2019 +0200
drop newly unused ScDoubleField
Change-Id: I2105306d1d865512a5fa2f8c862e7a21c384ee39
Reviewed-on: https://gerrit.libreoffice.org/76545
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 0e6b55747e3b..4066ec4b5e3a 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -24,7 +24,6 @@
#include <comphelper/string.hxx>
#include <rtl/math.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <vcl/builder.hxx>
#include <global.hxx>
namespace {
@@ -36,37 +35,6 @@ sal_Unicode lclGetDecSep()
} // namespace
-ScDoubleField::ScDoubleField( vcl::Window* pParent, WinBits nStyle ) :
- Edit( pParent, nStyle )
-{
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void makeScDoubleField(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
-{
- BuilderUtils::ensureDefaultWidthChars(rMap);
- rRet = VclPtr<ScDoubleField>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
-}
-
-bool ScDoubleField::GetValue( double& rfValue ) const
-{
- OUString aStr(comphelper::string::strip(GetText(), ' '));
- bool bOk = !aStr.isEmpty();
- if( bOk )
- {
- rtl_math_ConversionStatus eStatus;
- sal_Int32 nEnd;
- rfValue = ScGlobal::GetpLocaleData()->stringToDouble( aStr, true, &eStatus, &nEnd );
- bOk = (eStatus == rtl_math_ConversionStatus_Ok) && (nEnd == aStr.getLength() );
- }
- return bOk;
-}
-
-void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces )
-{
- SetText( ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G,
- nDecPlaces, lclGetDecSep(), true/*bEraseTrailingDecZeros*/ ) );
-}
-
DoubleField::DoubleField(std::unique_ptr<weld::Entry> xEntry)
: m_xEntry(std::move(xEntry))
{
diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index e64b79e305ef..ce6e9a9ac027 100644
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -24,16 +24,6 @@
#include <vcl/weld.hxx>
/** An edit control that contains a double precision floating-point value. */
-class ScDoubleField : public Edit
-{
-public:
- explicit ScDoubleField( vcl::Window* pParent, WinBits nStyle );
-
- bool GetValue( double& rfValue ) const;
- void SetValue( double fValue,
- sal_Int32 nDecPlaces = 12 );
-};
-
class DoubleField
{
private:
commit b4550772ca34b752bd68a5fe2fc0971741c79ee3
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 29 11:59:09 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 29 20:27:45 2019 +0200
weld ScTpCalcOptions
Change-Id: I4b5bd08a9ed04b9bceb08640a275dee02d6e9b36
Reviewed-on: https://gerrit.libreoffice.org/76544
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index dff39e5a6c9d..c76f9de0ca50 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -239,10 +239,6 @@
</properties>
</glade-widget-class>
- <glade-widget-class title="Double Field" name="scuilo-ScDoubleField"
- generic-name="Double Field" parent="GtkEntry"
- icon-name="widget-gtk-textentry"/>
-
<glade-widget-class title="Open Document ListBox" name="dbulo-OpenDocumentListBox"
generic-name="Open Document ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index a1edbf6baead..e64b79e305ef 100644
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -48,6 +48,7 @@ public:
void grab_focus() { m_xEntry->grab_focus(); }
bool get_sensitive() const { return m_xEntry->get_sensitive(); }
+ void set_sensitive(bool bSensitive) { m_xEntry->set_sensitive(bSensitive); }
};
#endif
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 31d5d6f3c62e..6d1fb5d06bea 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -40,46 +40,44 @@ public:
virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override;
private:
- ScTpCalcOptions( vcl::Window* pParent,
- const SfxItemSet& rCoreSet );
- virtual ~ScTpCalcOptions() override;
- virtual void dispose() override;
+ ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
+ virtual ~ScTpCalcOptions() override;
private:
- VclPtr<CheckBox> m_pBtnIterate;
- VclPtr<FixedText> m_pFtSteps;
- VclPtr<NumericField> m_pEdSteps;
- VclPtr<FixedText> m_pFtEps;
- VclPtr<ScDoubleField> m_pEdEps;
+ std::unique_ptr<ScDocOptions> pOldOptions;
+ std::unique_ptr<ScDocOptions> pLocalOptions;
+ sal_uInt16 const nWhichCalc;
- VclPtr<RadioButton> m_pBtnDateStd;
- VclPtr<RadioButton> m_pBtnDateSc10;
- VclPtr<RadioButton> m_pBtnDate1904;
+ std::unique_ptr<weld::CheckButton> m_xBtnIterate;
+ std::unique_ptr<weld::Label> m_xFtSteps;
+ std::unique_ptr<weld::SpinButton> m_xEdSteps;
+ std::unique_ptr<weld::Label> m_xFtEps;
+ std::unique_ptr<DoubleField> m_xEdEps;
- VclPtr<CheckBox> m_pBtnCase;
- VclPtr<CheckBox> m_pBtnCalc;
- VclPtr<CheckBox> m_pBtnMatch;
- VclPtr<RadioButton> m_pBtnWildcards;
- VclPtr<RadioButton> m_pBtnRegex;
- VclPtr<RadioButton> m_pBtnLiteral;
- VclPtr<CheckBox> m_pBtnLookUp;
- VclPtr<CheckBox> m_pBtnGeneralPrec;
+ std::unique_ptr<weld::RadioButton> m_xBtnDateStd;
+ std::unique_ptr<weld::RadioButton> m_xBtnDateSc10;
+ std::unique_ptr<weld::RadioButton> m_xBtnDate1904;
- VclPtr<FixedText> m_pFtPrec;
- VclPtr<NumericField> m_pEdPrec;
+ std::unique_ptr<weld::CheckButton> m_xBtnCase;
+ std::unique_ptr<weld::CheckButton> m_xBtnCalc;
+ std::unique_ptr<weld::CheckButton> m_xBtnMatch;
+ std::unique_ptr<weld::RadioButton> m_xBtnWildcards;
+ std::unique_ptr<weld::RadioButton> m_xBtnRegex;
+ std::unique_ptr<weld::RadioButton> m_xBtnLiteral;
+ std::unique_ptr<weld::CheckButton> m_xBtnLookUp;
+ std::unique_ptr<weld::CheckButton> m_xBtnGeneralPrec;
- VclPtr<CheckBox> m_pBtnThread;
+ std::unique_ptr<weld::Label> m_xFtPrec;
+ std::unique_ptr<weld::SpinButton> m_xEdPrec;
- std::unique_ptr<ScDocOptions> pOldOptions;
- std::unique_ptr<ScDocOptions> pLocalOptions;
- sal_uInt16 const nWhichCalc;
+ std::unique_ptr<weld::CheckButton> m_xBtnThread;
private:
void Init();
// Handler:
- DECL_LINK( RadioClickHdl, Button*, void );
- DECL_LINK( CheckClickHdl, Button*, void );
+ DECL_LINK( RadioClickHdl, weld::Button&, void );
+ DECL_LINK( CheckClickHdl, weld::ToggleButton&, void );
};
#endif
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 54734705d66f..aea5a6f15e2f 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -32,82 +32,54 @@
#include <tpcalc.hxx>
-ScTpCalcOptions::ScTpCalcOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "OptCalculatePage",
- "modules/scalc/ui/optcalculatepage.ui", &rCoreAttrs)
+ScTpCalcOptions::ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
+ : SfxTabPage(pParent, "modules/scalc/ui/optcalculatepage.ui", "OptCalculatePage", &rCoreAttrs)
, pOldOptions(new ScDocOptions(
static_cast<const ScTpCalcItem&>(rCoreAttrs.Get(
GetWhich(SID_SCDOCOPTIONS))).GetDocOptions()))
, pLocalOptions(new ScDocOptions)
, nWhichCalc(GetWhich(SID_SCDOCOPTIONS))
+ , m_xBtnIterate(m_xBuilder->weld_check_button("iterate"))
+ , m_xFtSteps(m_xBuilder->weld_label("stepsft"))
+ , m_xEdSteps(m_xBuilder->weld_spin_button("steps"))
+ , m_xFtEps(m_xBuilder->weld_label("minchangeft"))
+ , m_xEdEps(new DoubleField(m_xBuilder->weld_entry("minchange")))
+ , m_xBtnDateStd(m_xBuilder->weld_radio_button("datestd"))
+ , m_xBtnDateSc10(m_xBuilder->weld_radio_button("datesc10"))
+ , m_xBtnDate1904(m_xBuilder->weld_radio_button("date1904"))
+ , m_xBtnCase(m_xBuilder->weld_check_button("case"))
+ , m_xBtnCalc(m_xBuilder->weld_check_button("calc"))
+ , m_xBtnMatch(m_xBuilder->weld_check_button("match"))
+ , m_xBtnWildcards(m_xBuilder->weld_radio_button("formulawildcards"))
+ , m_xBtnRegex(m_xBuilder->weld_radio_button("formularegex"))
+ , m_xBtnLiteral(m_xBuilder->weld_radio_button("formulaliteral"))
+ , m_xBtnLookUp(m_xBuilder->weld_check_button("lookup"))
+ , m_xBtnGeneralPrec(m_xBuilder->weld_check_button("generalprec"))
+ , m_xFtPrec(m_xBuilder->weld_label("precft"))
+ , m_xEdPrec(m_xBuilder->weld_spin_button("prec"))
+ , m_xBtnThread(m_xBuilder->weld_check_button("threadingenabled"))
{
- get(m_pBtnIterate, "iterate");
- get(m_pFtSteps, "stepsft");
- get(m_pEdSteps, "steps");
- get(m_pFtEps, "minchangeft");
- get(m_pEdEps, "minchange");
- get(m_pBtnDateStd, "datestd");
- get(m_pBtnDateSc10, "datesc10");
- get(m_pBtnDate1904, "date1904");
- get(m_pBtnCase, "case");
- get(m_pBtnCalc, "calc");
- get(m_pBtnMatch, "match");
- get(m_pBtnWildcards, "formulawildcards");
- get(m_pBtnRegex, "formularegex");
- get(m_pBtnLiteral, "formulaliteral");
- get(m_pBtnLookUp, "lookup");
- get(m_pBtnGeneralPrec, "generalprec");
- get(m_pFtPrec, "precft");
- get(m_pEdPrec, "prec");
- get(m_pBtnThread, "threadingenabled");
Init();
SetExchangeSupport();
}
ScTpCalcOptions::~ScTpCalcOptions()
{
- disposeOnce();
-}
-
-void ScTpCalcOptions::dispose()
-{
- pOldOptions.reset();
- pLocalOptions.reset();
- m_pBtnIterate.clear();
- m_pFtSteps.clear();
- m_pEdSteps.clear();
- m_pFtEps.clear();
- m_pEdEps.clear();
- m_pBtnDateStd.clear();
- m_pBtnDateSc10.clear();
- m_pBtnDate1904.clear();
- m_pBtnCase.clear();
- m_pBtnCalc.clear();
- m_pBtnMatch.clear();
- m_pBtnWildcards.clear();
- m_pBtnRegex.clear();
- m_pBtnLiteral.clear();
- m_pBtnLookUp.clear();
- m_pBtnGeneralPrec.clear();
- m_pFtPrec.clear();
- m_pEdPrec.clear();
- m_pBtnThread.clear();
- SfxTabPage::dispose();
}
void ScTpCalcOptions::Init()
{
- m_pBtnIterate->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
- m_pBtnGeneralPrec->SetClickHdl( LINK(this, ScTpCalcOptions, CheckClickHdl) );
- m_pBtnDateStd->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
- m_pBtnDateSc10->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
- m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
- m_pBtnThread->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
+ m_xBtnIterate->connect_toggled( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
+ m_xBtnGeneralPrec->connect_toggled( LINK(this, ScTpCalcOptions, CheckClickHdl) );
+ m_xBtnDateStd->connect_clicked( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
+ m_xBtnDateSc10->connect_clicked( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
+ m_xBtnDate1904->connect_clicked( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
+ m_xBtnThread->connect_toggled( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
}
VclPtr<SfxTabPage> ScTpCalcOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
- return VclPtr<ScTpCalcOptions>::Create( pParent.pParent, *rAttrSet );
+ return VclPtr<ScTpCalcOptions>::Create( pParent, *rAttrSet );
}
void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
@@ -117,12 +89,12 @@ void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
*pLocalOptions = *pOldOptions;
- m_pBtnCase->Check( !pLocalOptions->IsIgnoreCase() );
- m_pBtnCase->Enable( !officecfg::Office::Calc::Calculate::Other::CaseSensitive::isReadOnly() );
- m_pBtnCalc->Check( pLocalOptions->IsCalcAsShown() );
- m_pBtnCalc->Enable( !officecfg::Office::Calc::Calculate::Other::Precision::isReadOnly() );
- m_pBtnMatch->Check( pLocalOptions->IsMatchWholeCell() );
- m_pBtnMatch->Enable( !officecfg::Office::Calc::Calculate::Other::SearchCriteria::isReadOnly() );
+ m_xBtnCase->set_active( !pLocalOptions->IsIgnoreCase() );
+ m_xBtnCase->set_sensitive( !officecfg::Office::Calc::Calculate::Other::CaseSensitive::isReadOnly() );
+ m_xBtnCalc->set_active( pLocalOptions->IsCalcAsShown() );
+ m_xBtnCalc->set_sensitive( !officecfg::Office::Calc::Calculate::Other::Precision::isReadOnly() );
+ m_xBtnMatch->set_active( pLocalOptions->IsMatchWholeCell() );
+ m_xBtnMatch->set_sensitive( !officecfg::Office::Calc::Calculate::Other::SearchCriteria::isReadOnly() );
bool bWildcards = pLocalOptions->IsFormulaWildcardsEnabled();
bool bRegex = pLocalOptions->IsFormulaRegexEnabled();
// If both, Wildcards and Regex, are set then Wildcards shall take
@@ -130,79 +102,79 @@ void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
// simultaneously couldn't be set using UI but editing the configuration.
if (bWildcards && bRegex)
bRegex = false;
- m_pBtnWildcards->Check( bWildcards );
- m_pBtnRegex->Check( bRegex );
- m_pBtnWildcards->Enable( !officecfg::Office::Calc::Calculate::Other::Wildcards::isReadOnly() );
- m_pBtnRegex->Enable( !officecfg::Office::Calc::Calculate::Other::RegularExpressions::isReadOnly() );
- m_pBtnLiteral->Check( !bWildcards && !bRegex );
- m_pBtnLiteral->Enable( m_pBtnWildcards->IsEnabled() || m_pBtnRegex->IsEnabled() );
+ m_xBtnWildcards->set_active( bWildcards );
+ m_xBtnRegex->set_active( bRegex );
+ m_xBtnWildcards->set_sensitive( !officecfg::Office::Calc::Calculate::Other::Wildcards::isReadOnly() );
+ m_xBtnRegex->set_sensitive( !officecfg::Office::Calc::Calculate::Other::RegularExpressions::isReadOnly() );
+ m_xBtnLiteral->set_active( !bWildcards && !bRegex );
+ m_xBtnLiteral->set_sensitive( m_xBtnWildcards->get_sensitive() || m_xBtnRegex->get_sensitive() );
// if either regex or wildcards radio button is set and read-only, disable all three
- if ( (!m_pBtnWildcards->IsEnabled() && bWildcards) || (!m_pBtnRegex->IsEnabled() && bRegex) )
+ if ( (!m_xBtnWildcards->get_sensitive() && bWildcards) || (!m_xBtnRegex->get_sensitive() && bRegex) )
{
- m_pBtnWildcards->Enable( false );
- m_pBtnRegex->Enable( false );
- m_pBtnLiteral->Enable( false );
+ m_xBtnWildcards->set_sensitive( false );
+ m_xBtnRegex->set_sensitive( false );
+ m_xBtnLiteral->set_sensitive( false );
}
- m_pBtnLookUp->Check( pLocalOptions->IsLookUpColRowNames() );
- m_pBtnLookUp->Enable( !officecfg::Office::Calc::Calculate::Other::FindLabel::isReadOnly() );
- m_pBtnIterate->Check( pLocalOptions->IsIter() );
- m_pEdSteps->SetValue( pLocalOptions->GetIterCount() );
- m_pEdEps->SetValue( pLocalOptions->GetIterEps(), 6 );
+ m_xBtnLookUp->set_active( pLocalOptions->IsLookUpColRowNames() );
+ m_xBtnLookUp->set_sensitive( !officecfg::Office::Calc::Calculate::Other::FindLabel::isReadOnly() );
+ m_xBtnIterate->set_active( pLocalOptions->IsIter() );
+ m_xEdSteps->set_value( pLocalOptions->GetIterCount() );
+ m_xEdEps->SetValue( pLocalOptions->GetIterEps(), 6 );
pLocalOptions->GetDate( d, m, y );
switch ( y )
{
case 1899:
- m_pBtnDateStd->Check();
+ m_xBtnDateStd->set_active(true);
break;
case 1900:
- m_pBtnDateSc10->Check();
+ m_xBtnDateSc10->set_active(true);
break;
case 1904:
- m_pBtnDate1904->Check();
+ m_xBtnDate1904->set_active(true);
break;
}
sal_uInt16 nPrec = pLocalOptions->GetStdPrecision();
if (nPrec == SvNumberFormatter::UNLIMITED_PRECISION)
{
- m_pFtPrec->Disable();
- m_pEdPrec->Disable();
- m_pBtnGeneralPrec->Check(false);
+ m_xFtPrec->set_sensitive(false);
+ m_xEdPrec->set_sensitive(false);
+ m_xBtnGeneralPrec->set_active(false);
}
else
{
- m_pBtnGeneralPrec->Check();
- m_pFtPrec->Enable();
- m_pEdPrec->Enable();
- m_pEdPrec->SetValue(nPrec);
+ m_xBtnGeneralPrec->set_active(true);
+ m_xFtPrec->set_sensitive(true);
+ m_xEdPrec->set_sensitive(true);
+ m_xEdPrec->set_value(nPrec);
}
- m_pBtnThread->Enable( !officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::isReadOnly() );
- m_pBtnThread->Check( officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get() );
+ m_xBtnThread->set_sensitive( !officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::isReadOnly() );
+ m_xBtnThread->set_active( officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get() );
- CheckClickHdl(m_pBtnIterate);
+ CheckClickHdl(*m_xBtnIterate);
}
bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs )
{
// every other options are updated in handlers
- pLocalOptions->SetIterCount( static_cast<sal_uInt16>(m_pEdSteps->GetValue()) );
- pLocalOptions->SetIgnoreCase( !m_pBtnCase->IsChecked() );
- pLocalOptions->SetCalcAsShown( m_pBtnCalc->IsChecked() );
- pLocalOptions->SetMatchWholeCell( m_pBtnMatch->IsChecked() );
- pLocalOptions->SetFormulaWildcardsEnabled( m_pBtnWildcards->IsChecked() );
- pLocalOptions->SetFormulaRegexEnabled( m_pBtnRegex->IsChecked() );
- pLocalOptions->SetLookUpColRowNames( m_pBtnLookUp->IsChecked() );
+ pLocalOptions->SetIterCount( static_cast<sal_uInt16>(m_xEdSteps->get_value()) );
+ pLocalOptions->SetIgnoreCase( !m_xBtnCase->get_active() );
+ pLocalOptions->SetCalcAsShown( m_xBtnCalc->get_active() );
+ pLocalOptions->SetMatchWholeCell( m_xBtnMatch->get_active() );
+ pLocalOptions->SetFormulaWildcardsEnabled( m_xBtnWildcards->get_active() );
+ pLocalOptions->SetFormulaRegexEnabled( m_xBtnRegex->get_active() );
+ pLocalOptions->SetLookUpColRowNames( m_xBtnLookUp->get_active() );
- if (m_pBtnGeneralPrec->IsChecked())
+ if (m_xBtnGeneralPrec->get_active())
pLocalOptions->SetStdPrecision(
- static_cast<sal_uInt16>(m_pEdPrec->GetValue()) );
+ static_cast<sal_uInt16>(m_xEdPrec->get_value()) );
else
pLocalOptions->SetStdPrecision( SvNumberFormatter::UNLIMITED_PRECISION );
- bool bShouldEnableThreading = m_pBtnThread->IsChecked();
+ bool bShouldEnableThreading = m_xBtnThread->get_active();
if (bShouldEnableThreading != officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get())
{
std::shared_ptr<comphelper::ConfigurationChanges> xBatch(comphelper::ConfigurationChanges::create());
@@ -228,7 +200,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
DeactivateRC nReturn = DeactivateRC::KeepPage;
double fEps;
- if( m_pEdEps->GetValue( fEps ) && (fEps > 0.0) )
+ if( m_xEdEps->GetValue( fEps ) && (fEps > 0.0) )
{
pLocalOptions->SetIterEps( fEps );
nReturn = DeactivateRC::LeavePage;
@@ -240,7 +212,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
VclButtonsType::Ok, ScResId(STR_INVALID_EPS)));
xBox->run();
- m_pEdEps->GrabFocus();
+ m_xEdEps->grab_focus();
}
else if ( pSetP )
FillItemSet( pSetP );
@@ -250,51 +222,50 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
// Handler:
-IMPL_LINK( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void )
+IMPL_LINK( ScTpCalcOptions, RadioClickHdl, weld::Button&, rBtn, void )
{
- if (pBtn == m_pBtnDateStd)
+ if (&rBtn == m_xBtnDateStd.get())
{
pLocalOptions->SetDate( 30, 12, 1899 );
}
- else if (pBtn == m_pBtnDateSc10)
+ else if (&rBtn == m_xBtnDateSc10.get())
{
pLocalOptions->SetDate( 1, 1, 1900 );
}
- else if (pBtn == m_pBtnDate1904)
+ else if (&rBtn == m_xBtnDate1904.get())
{
pLocalOptions->SetDate( 1, 1, 1904 );
}
}
-IMPL_LINK( ScTpCalcOptions, CheckClickHdl, Button*, p, void )
+IMPL_LINK(ScTpCalcOptions, CheckClickHdl, weld::ToggleButton&, rBtn, void)
{
- CheckBox* pBtn = static_cast<CheckBox*>(p);
- if (pBtn == m_pBtnGeneralPrec)
+ if (&rBtn == m_xBtnGeneralPrec.get())
{
- if (pBtn->IsChecked())
+ if (rBtn.get_active())
{
- m_pEdPrec->Enable();
- m_pFtPrec->Enable();
+ m_xEdPrec->set_sensitive(true);
+ m_xFtPrec->set_sensitive(true);
}
else
{
- m_pEdPrec->Disable();
- m_pFtPrec->Disable();
+ m_xEdPrec->set_sensitive(false);
+ m_xFtPrec->set_sensitive(false);
}
}
- else if (pBtn == m_pBtnIterate)
+ else if (&rBtn == m_xBtnIterate.get())
{
- if ( pBtn->IsChecked() )
+ if (rBtn.get_active())
{
pLocalOptions->SetIter( true );
- m_pFtSteps->Enable(); m_pEdSteps->Enable();
- m_pFtEps->Enable(); m_pEdEps->Enable();
+ m_xFtSteps->set_sensitive(true); m_xEdSteps->set_sensitive(true);
+ m_xFtEps->set_sensitive(true); m_xEdEps->set_sensitive(true);
}
else
{
pLocalOptions->SetIter( false );
- m_pFtSteps->Disable(); m_pEdSteps->Disable();
- m_pFtEps->Disable(); m_pEdEps->Disable();
+ m_xFtSteps->set_sensitive(false); m_xEdSteps->set_sensitive(false);
+ m_xFtEps->set_sensitive(false); m_xEdEps->set_sensitive(false);
}
}
}
diff --git a/sc/uiconfig/scalc/ui/optcalculatepage.ui b/sc/uiconfig/scalc/ui/optcalculatepage.ui
index 19298c05def9..0d99b5328296 100644
--- a/sc/uiconfig/scalc/ui/optcalculatepage.ui
+++ b/sc/uiconfig/scalc/ui/optcalculatepage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -163,7 +163,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">formularegex</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -179,9 +178,8 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">formulaliteral</property>
+ <property name="group">formulawildcards</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -197,9 +195,8 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">formulawildcard</property>
+ <property name="group">formulawildcards</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -263,6 +260,7 @@
<object class="GtkSpinButton" id="prec">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment2</property>
</object>
<packing>
@@ -338,10 +336,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="optcalculatepage|stepsft">_Steps:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">steps</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -353,10 +351,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="optcalculatepage|minchangeft">_Minimum change:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">minchange</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -367,6 +365,7 @@
<object class="GtkSpinButton" id="steps">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
@@ -375,10 +374,11 @@
</packing>
</child>
<child>
- <object class="scuilo-ScDoubleField" id="minchange">
+ <object class="GtkEntry" id="minchange">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
+ <property name="activates_default">True</property>
<property name="width_chars">12</property>
</object>
<packing>
@@ -434,7 +434,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">datesc10</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -451,7 +450,7 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="group">date1904</property>
+ <property name="group">datestd</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index fc5e2f725c21..edfbd5a8ec6f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -484,7 +484,6 @@ custom_widgets = [
'SameContentListBox',
'ScCsvTableBox',
'ScDataTableView',
- 'ScDoubleField',
'SdPageObjsTLB',
'SearchBox',
'SearchResultsBox',
More information about the Libreoffice-commits
mailing list