summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-07-29 12:02:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-07-29 20:28:10 +0200
commit741db80a08e98b7832c2e3be3b23d535037e836c (patch)
tree071723f1a85f6b2dab1473fd3338a4d7d863d857 /sc
parenta26c59ddccc527239f53dadd1db04d34231b310d (diff)
rename DoubleField back to ScDoubleField
Change-Id: I3d3923f3131e13abde145f96468ade0d0c8cc142 Reviewed-on: https://gerrit.libreoffice.org/76546 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/cctrl/editfield.cxx6
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.cxx8
-rw-r--r--sc/source/ui/inc/dpgroupdlg.hxx12
-rw-r--r--sc/source/ui/inc/editfield.hxx4
-rw-r--r--sc/source/ui/inc/tpcalc.hxx2
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx2
6 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 4066ec4b5e3a..edf9a1e49545 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -35,12 +35,12 @@ sal_Unicode lclGetDecSep()
} // namespace
-DoubleField::DoubleField(std::unique_ptr<weld::Entry> xEntry)
+ScDoubleField::ScDoubleField(std::unique_ptr<weld::Entry> xEntry)
: m_xEntry(std::move(xEntry))
{
}
-bool DoubleField::GetValue( double& rfValue ) const
+bool ScDoubleField::GetValue( double& rfValue ) const
{
OUString aStr(comphelper::string::strip(m_xEntry->get_text(), ' '));
bool bOk = !aStr.isEmpty();
@@ -54,7 +54,7 @@ bool DoubleField::GetValue( double& rfValue ) const
return bOk;
}
-void DoubleField::SetValue( double fValue, sal_Int32 nDecPlaces )
+void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces )
{
m_xEntry->set_text( ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G,
nDecPlaces, lclGetDecSep(), true/*bEraseTrailingDecZeros*/ ) );
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 1edace5962c3..adbcee0f1874 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -109,7 +109,7 @@ IMPL_LINK(ScDPGroupEditHelper, ClickHdl, weld::Button&, rButton, void)
}
ScDPNumGroupEditHelper::ScDPNumGroupEditHelper(weld::RadioButton& rRbAuto,
- weld::RadioButton& rRbMan, DoubleField& rEdValue)
+ weld::RadioButton& rRbMan, ScDoubleField& rEdValue)
: ScDPGroupEditHelper(rRbAuto, rRbMan, rEdValue.get_widget())
, mrEdValue(rEdValue)
{
@@ -150,11 +150,11 @@ ScDPNumGroupDlg::ScDPNumGroupDlg(weld::Window* pParent, const ScDPNumGroupInfo&
: GenericDialogController(pParent, "modules/scalc/ui/groupbynumber.ui", "PivotTableGroupByNumber")
, mxRbAutoStart(m_xBuilder->weld_radio_button("auto_start"))
, mxRbManStart(m_xBuilder->weld_radio_button("manual_start"))
- , mxEdStart(new DoubleField(m_xBuilder->weld_entry("edit_start")))
+ , mxEdStart(new ScDoubleField(m_xBuilder->weld_entry("edit_start")))
, mxRbAutoEnd(m_xBuilder->weld_radio_button("auto_end"))
, mxRbManEnd(m_xBuilder->weld_radio_button("manual_end"))
- , mxEdEnd(new DoubleField(m_xBuilder->weld_entry("edit_end")))
- , mxEdBy(new DoubleField(m_xBuilder->weld_entry("edit_by")))
+ , mxEdEnd(new ScDoubleField(m_xBuilder->weld_entry("edit_end")))
+ , mxEdBy(new ScDoubleField(m_xBuilder->weld_entry("edit_by")))
, maStartHelper(*mxRbAutoStart, *mxRbManStart, *mxEdStart)
, maEndHelper(*mxRbAutoEnd, *mxRbManEnd, *mxEdEnd)
{
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 0c49b97605c6..9bf99e197f23 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -23,7 +23,7 @@
#include <vcl/weld.hxx>
#include <dpnumgroupinfo.hxx>
-class DoubleField;
+class ScDoubleField;
class SvtCalendarBox;
class ScDPGroupEditHelper
@@ -57,7 +57,7 @@ class ScDPNumGroupEditHelper : public ScDPGroupEditHelper
public:
explicit ScDPNumGroupEditHelper(weld::RadioButton& rRbAuto,
weld::RadioButton& rRbMan,
- DoubleField& rEdValue);
+ ScDoubleField& rEdValue);
virtual ~ScDPNumGroupEditHelper() {}
private:
@@ -65,7 +65,7 @@ private:
virtual void ImplSetValue( double fValue ) override;
private:
- DoubleField& mrEdValue;
+ ScDoubleField& mrEdValue;
};
class ScDPDateGroupEditHelper : public ScDPGroupEditHelper
@@ -97,11 +97,11 @@ public:
private:
std::unique_ptr<weld::RadioButton> mxRbAutoStart;
std::unique_ptr<weld::RadioButton> mxRbManStart;
- std::unique_ptr<DoubleField> mxEdStart;
+ std::unique_ptr<ScDoubleField> mxEdStart;
std::unique_ptr<weld::RadioButton> mxRbAutoEnd;
std::unique_ptr<weld::RadioButton> mxRbManEnd;
- std::unique_ptr<DoubleField> mxEdEnd;
- std::unique_ptr<DoubleField> mxEdBy;
+ std::unique_ptr<ScDoubleField> mxEdEnd;
+ std::unique_ptr<ScDoubleField> mxEdBy;
ScDPNumGroupEditHelper maStartHelper;
ScDPNumGroupEditHelper maEndHelper;
};
diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index ce6e9a9ac027..359ab20549ad 100644
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -24,12 +24,12 @@
#include <vcl/weld.hxx>
/** An edit control that contains a double precision floating-point value. */
-class DoubleField
+class ScDoubleField
{
private:
std::unique_ptr<weld::Entry> m_xEntry;
public:
- explicit DoubleField(std::unique_ptr<weld::Entry> xEntry);
+ explicit ScDoubleField(std::unique_ptr<weld::Entry> xEntry);
bool GetValue(double& rfValue) const;
void SetValue(double fValue, sal_Int32 nDecPlaces = 12);
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 6d1fb5d06bea..53f3f3e480bd 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -52,7 +52,7 @@ private:
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;
+ std::unique_ptr<ScDoubleField> m_xEdEps;
std::unique_ptr<weld::RadioButton> m_xBtnDateStd;
std::unique_ptr<weld::RadioButton> m_xBtnDateSc10;
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index aea5a6f15e2f..5a6f60337911 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -43,7 +43,7 @@ ScTpCalcOptions::ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreA
, 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_xEdEps(new ScDoubleField(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"))