include/vcl/builder.hxx | 4 +
include/vcl/field.hxx | 7 -
include/vcl/fmtfield.hxx | 11 ++-
vcl/source/app/salvtables.cxx | 41 ++++++-----
vcl/source/control/field.cxx | 26 -------
vcl/source/control/fmtfield.cxx | 145 ++++++++++++++++++++++++++++------------
vcl/source/window/builder.cxx | 62 ++++++++++++++++-
7 files changed, 203 insertions(+), 93 deletions(-)
New commits:
commit 4ce5d39689fda418e8f2d7d9c1124190b2cbad7a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 14 13:52:06 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Nov 15 18:17:35 2018 +0100
bind SalInstanceSpinButton to FormattedField
Change-Id: I71190343739fae51b1c17d74ea1c4a548bca0b01
Reviewed-on: https://gerrit.libreoffice.org/63371
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index d795b5cdc915..1883a128f48e 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -36,6 +36,7 @@
class Button;
class ComboBox;
+class FormattedField;
class ListBox;
class MessageDialog;
class NumericFormatter;
@@ -235,6 +236,7 @@ private:
const Adjustment* get_adjustment_by_name(const OString& sID) const;
static void mungeAdjustment(NumericFormatter &rTarget, const
Adjustment &rAdjustment);
+ static void mungeAdjustment(FormattedField &rTarget, const Adjustment
&rAdjustment);
static void mungeAdjustment(DateField &rTarget, const Adjustment
&rAdjustment);
static void mungeAdjustment(TimeField &rTarget, const Adjustment
&rAdjustment);
static void mungeAdjustment(ScrollBar &rTarget, const Adjustment
&rAdjustment);
@@ -271,6 +273,7 @@ private:
std::map<OString, TextBuffer> m_aTextBuffers;
std::vector<WidgetAdjustmentMap> m_aNumericFormatterAdjustmentMaps;
+ std::vector<WidgetAdjustmentMap> m_aFormattedFormatterAdjustmentMaps;
std::vector<WidgetAdjustmentMap> m_aTimeFormatterAdjustmentMaps;
std::vector<WidgetAdjustmentMap> m_aDateFormatterAdjustmentMaps;
std::vector<WidgetAdjustmentMap> m_aScrollAdjustmentMaps;
@@ -342,6 +345,7 @@ private:
stringmap &rVec);
void connectNumericFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
+ void connectFormattedFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
void connectTimeFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
void connectDateFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 0c0abcd9df55..aeb31c85664c 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -146,8 +146,6 @@ public:
void SetShowTrailingZeros( bool bShowTrailingZeros );
bool IsShowTrailingZeros() const { return
mbShowTrailingZeros; }
- void DisableRemainderFactor();
-
void SetUserValue( sal_Int64 nNewValue );
virtual void SetValue( sal_Int64 nNewValue );
sal_Int64 GetValue() const;
@@ -157,8 +155,6 @@ public:
sal_Int64 Normalize( sal_Int64 nValue ) const;
sal_Int64 Denormalize( sal_Int64 nValue ) const;
- void SetInputHdl(const Link<sal_Int64*,TriState>& rLink) { m_aInputHdl =
rLink; }
- void SetOutputHdl(const Link<Edit&, bool>& rLink) { m_aOutputHdl = rLink;
}
protected:
sal_Int64 mnFieldValue;
sal_Int64 mnLastValue;
@@ -166,7 +162,6 @@ protected:
sal_Int64 mnMax;
bool mbWrapOnLimits;
bool mbFormatting;
- bool mbDisableRemainderFactor;
// the members below are used in all derivatives of NumericFormatter
// not in NumericFormatter itself.
@@ -191,8 +186,6 @@ protected:
private:
SAL_DLLPRIVATE void ImplInit();
- Link<sal_Int64*, TriState> m_aInputHdl;
- Link<Edit&, bool> m_aOutputHdl;
sal_uInt16 mnDecimalDigits;
bool mbThousandSep;
bool mbShowTrailingZeros;
diff --git a/include/vcl/fmtfield.hxx b/include/vcl/fmtfield.hxx
index 16b01dd3c1e5..de1a090036f7 100644
--- a/include/vcl/fmtfield.hxx
+++ b/include/vcl/fmtfield.hxx
@@ -70,6 +70,7 @@ protected:
bool m_bEnableEmptyField : 1;
bool m_bAutoColor : 1;
bool m_bEnableNaN : 1;
+ bool m_bDisableRemainderFactor : 1;
enum valueState { valueDirty, valueString, valueDouble };
valueState m_ValueState;
double m_dCurrentValue;
@@ -138,6 +139,8 @@ public:
void SetThousandsSep(bool _bUseSeparator);
// the is no check if the current format is numeric, so be cautious
when calling these functions
+ void DisableRemainderFactor();
+
sal_uInt16 GetDecimalDigits() const;
void SetDecimalDigits(sal_uInt16 _nPrecision);
// There is no check if the current format is numeric, so be cautious
when calling these functions
@@ -162,6 +165,8 @@ public:
virtual void Last() override;
// Default Implementation: Current double is set to the first or last value
+ virtual bool set_property(const OString &rKey, const OUString &rValue)
override;
+
void SetSpinSize(double dStep) { m_dSpinSize = dStep; }
double GetSpinSize() const { return m_dSpinSize; }
@@ -174,6 +179,8 @@ public:
bool TreatingAsNumber() const { return m_bTreatAsNumber; }
void TreatAsNumber(bool bDoSo) { m_bTreatAsNumber = bDoSo; }
+ void SetOutputHdl(const Link<Edit&, bool>& rLink) { m_aOutputHdl =
rLink; }
+ void SetInputHdl(const Link<sal_Int64*,TriState>& rLink) { m_aInputHdl
= rLink; }
public:
virtual void SetText( const OUString& rStr ) override;
virtual void SetText( const OUString& rStr, const Selection& rNewSelection
) override;
@@ -250,9 +257,11 @@ protected:
bool PreNotify(NotifyEvent& rNEvt) override;
void ReFormat();
+private:
+ Link<Edit&, bool> m_aOutputHdl;
+ Link<sal_Int64*, TriState> m_aInputHdl;
};
-
class VCL_DLLPUBLIC DoubleNumericField final : public FormattedField
{
public:
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index d3d776278632..cd6f0fc39417 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -38,6 +38,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
+#include <vcl/fmtfield.hxx>
#include <vcl/layout.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/prgsbar.hxx>
@@ -1963,19 +1964,29 @@ IMPL_LINK_NOARG(SalInstanceTreeView, DoubleClickHdl,
SvTreeListBox*, bool)
class SalInstanceSpinButton : public SalInstanceEntry, public virtual
weld::SpinButton
{
private:
- VclPtr<NumericField> m_xButton;
+ VclPtr<FormattedField> m_xButton;
DECL_LINK(UpDownHdl, SpinField&, void);
DECL_LINK(LoseFocusHdl, Control&, void);
DECL_LINK(OutputHdl, Edit&, bool);
DECL_LINK(InputHdl, sal_Int64*, TriState);
+ double toField(int nValue) const
+ {
+ return static_cast<double>(nValue) / Power10(get_digits());
+ }
+
+ int fromField(double fValue) const
+ {
+ return FRound(fValue * Power10(get_digits()));
+ }
+
public:
- SalInstanceSpinButton(NumericField* pButton, bool bTakeOwnership)
+ SalInstanceSpinButton(FormattedField* pButton, bool bTakeOwnership)
: SalInstanceEntry(pButton, bTakeOwnership)
, m_xButton(pButton)
{
- m_xButton->SetUseThousandSep(false); //off by default,
MetricSpinButton enables it
+ m_xButton->SetThousandsSep(false); //off by default, MetricSpinButton
enables it
m_xButton->SetUpHdl(LINK(this, SalInstanceSpinButton, UpDownHdl));
m_xButton->SetDownHdl(LINK(this, SalInstanceSpinButton, UpDownHdl));
m_xButton->SetLoseFocusHdl(LINK(this, SalInstanceSpinButton,
LoseFocusHdl));
@@ -1985,37 +1996,35 @@ public:
virtual int get_value() const override
{
- return m_xButton->GetValue();
+ return fromField(m_xButton->GetValue());
}
virtual void set_value(int value) override
{
- m_xButton->SetValue(value);
+ m_xButton->SetValue(toField(value));
}
virtual void set_range(int min, int max) override
{
- m_xButton->SetMin(min);
- m_xButton->SetFirst(min);
- m_xButton->SetMax(max);
- m_xButton->SetLast(max);
+ m_xButton->SetMinValue(toField(min));
+ m_xButton->SetMaxValue(toField(max));
}
virtual void get_range(int& min, int& max) const override
{
- min = m_xButton->GetMin();
- max = m_xButton->GetMax();
+ min = fromField(m_xButton->GetMinValue());
+ max = fromField(m_xButton->GetMaxValue());
}
virtual void set_increments(int step, int /*page*/) override
{
- m_xButton->SetSpinSize(step);
+ m_xButton->SetSpinSize(toField(step));
}
virtual void get_increments(int& step, int& page) const override
{
- step = m_xButton->GetSpinSize();
- page = m_xButton->GetSpinSize();
+ step = fromField(m_xButton->GetSpinSize());
+ page = fromField(m_xButton->GetSpinSize());
}
virtual void set_digits(unsigned int digits) override
@@ -2032,7 +2041,7 @@ public:
//off by default for direct SpinButtons, MetricSpinButton enables it
void SetUseThousandSep()
{
- m_xButton->SetUseThousandSep(true);
+ m_xButton->SetThousandsSep(true);
}
virtual unsigned int get_digits() const override
@@ -2915,7 +2924,7 @@ public:
virtual std::unique_ptr<weld::SpinButton> weld_spin_button(const OString
&id, bool bTakeOwnership) override
{
- NumericField* pSpinButton = m_xBuilder->get<NumericField>(id);
+ FormattedField* pSpinButton = m_xBuilder->get<FormattedField>(id);
return pSpinButton ?
o3tl::make_unique<SalInstanceSpinButton>(pSpinButton, bTakeOwnership) : nullptr;
}
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8cf40c6e7682..519eb8aa5a49 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -454,8 +454,7 @@ bool FormatterBase::IsEmptyFieldValue() const
void NumericFormatter::FormatValue(Selection const * pNewSelection)
{
mbFormatting = true;
- if (!m_aOutputHdl.IsSet() || !m_aOutputHdl.Call(*GetField()))
- ImplSetText(CreateFieldText(mnLastValue), pNewSelection);
+ ImplSetText(CreateFieldText(mnLastValue), pNewSelection);
mbFormatting = false;
}
@@ -478,7 +477,6 @@ void NumericFormatter::ImplInit()
mbShowTrailingZeros = true;
mbWrapOnLimits = false;
mbFormatting = false;
- mbDisableRemainderFactor = false;
// for fields
mnSpinSize = 1;
@@ -578,19 +576,6 @@ sal_Int64 NumericFormatter::GetValue() const
if (mbFormatting) //don't parse the entry if we're currently formatting
what to put in it
return mnLastValue;
- if (m_aInputHdl.IsSet())
- {
- sal_Int64 nResult;
- TriState eState = m_aInputHdl.Call(&nResult);
- if (eState != TRISTATE_INDET)
- {
- if (eState == TRISTATE_TRUE)
- return ClipAgainstMinMax(nResult);
- else
- return mnLastValue;
- }
- }
-
return GetField() ? GetValueFromString(GetField()->GetText()) : 0;
}
@@ -642,15 +627,10 @@ void NumericFormatter::Reformat()
ImplNumericReformat();
}
-void NumericFormatter::DisableRemainderFactor()
-{
- mbDisableRemainderFactor = true;
-}
-
void NumericFormatter::FieldUp()
{
sal_Int64 nValue = GetValue();
- sal_Int64 nRemainder = mbDisableRemainderFactor ? 0 : (nValue %
mnSpinSize);
+ sal_Int64 nRemainder = nValue % mnSpinSize;
if (nValue >= 0)
nValue = (nRemainder == 0) ? nValue + mnSpinSize : nValue + mnSpinSize
- nRemainder;
else
@@ -664,7 +644,7 @@ void NumericFormatter::FieldUp()
void NumericFormatter::FieldDown()
{
sal_Int64 nValue = GetValue();
- sal_Int64 nRemainder = mbDisableRemainderFactor ? 0 : (nValue %
mnSpinSize);
+ sal_Int64 nRemainder = nValue % mnSpinSize;
if (nValue >= 0)
nValue = (nRemainder == 0) ? nValue - mnSpinSize : nValue - nRemainder;
else
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index d443f2c1a8e3..280bf06649f5 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -26,6 +26,7 @@
#include <vcl/settings.hxx>
#include <svl/zformat.hxx>
#include <vcl/fmtfield.hxx>
+#include <vcl/weld.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/util/SearchOptions.hpp>
@@ -304,6 +305,7 @@ FormattedField::FormattedField(vcl::Window* pParent,
WinBits nStyle)
,m_bEnableEmptyField(true)
,m_bAutoColor(false)
,m_bEnableNaN(false)
+ ,m_bDisableRemainderFactor(false)
,m_ValueState(valueDirty)
,m_dCurrentValue(0)
,m_dDefaultValue(0)
@@ -859,35 +861,37 @@ void FormattedField::ImplSetValue(double dVal, bool
bForce)
m_ValueState = valueDouble;
m_dCurrentValue = dVal;
- OUString sNewText;
- if (ImplGetFormatter()->IsTextFormat(m_nFormatKey))
+ if (!m_aOutputHdl.IsSet() || !m_aOutputHdl.Call(*this))
{
- // first convert the number as string in standard format
- OUString sTemp;
- ImplGetFormatter()->GetOutputString(dVal, 0, sTemp,
&m_pLastOutputColor);
- // then encode the string in the corresponding text format
- ImplGetFormatter()->GetOutputString(sTemp, m_nFormatKey, sNewText,
&m_pLastOutputColor);
- }
- else
- {
- if( IsUsingInputStringForFormatting())
+ OUString sNewText;
+ if (ImplGetFormatter()->IsTextFormat(m_nFormatKey))
{
- ImplGetFormatter()->GetInputLineString(dVal, m_nFormatKey,
sNewText);
+ // first convert the number as string in standard format
+ OUString sTemp;
+ ImplGetFormatter()->GetOutputString(dVal, 0, sTemp,
&m_pLastOutputColor);
+ // then encode the string in the corresponding text format
+ ImplGetFormatter()->GetOutputString(sTemp, m_nFormatKey, sNewText,
&m_pLastOutputColor);
}
else
{
- ImplGetFormatter()->GetOutputString(dVal, m_nFormatKey, sNewText,
&m_pLastOutputColor);
+ if( IsUsingInputStringForFormatting())
+ {
+ ImplGetFormatter()->GetInputLineString(dVal, m_nFormatKey,
sNewText);
+ }
+ else
+ {
+ ImplGetFormatter()->GetOutputString(dVal, m_nFormatKey,
sNewText, &m_pLastOutputColor);
+ }
}
+ ImplSetTextImpl(sNewText, nullptr);
+ DBG_ASSERT(CheckText(sNewText), "FormattedField::ImplSetValue :
formatted string doesn't match the criteria !");
}
- ImplSetTextImpl(sNewText, nullptr);
m_ValueState = valueDouble;
- DBG_ASSERT(CheckText(sNewText), "FormattedField::ImplSetValue : formatted
string doesn't match the criteria !");
}
bool FormattedField::ImplGetValue(double& dNewVal)
{
-
dNewVal = m_dCurrentValue;
if (m_ValueState == valueDouble)
return true;
@@ -897,34 +901,55 @@ bool FormattedField::ImplGetValue(double& dNewVal)
if (sText.isEmpty())
return true;
- DBG_ASSERT(ImplGetFormatter() != nullptr, "FormattedField::ImplGetValue :
can't give you a current value without a formatter !");
+ bool bUseExternalFormatterValue = false;
+ if (m_aInputHdl.IsSet())
+ {
+ sal_Int64 nResult;
+ auto eState = m_aInputHdl.Call(&nResult);
+ bUseExternalFormatterValue = eState != TRISTATE_INDET;
+ if (bUseExternalFormatterValue)
+ {
+ if (eState == TRISTATE_TRUE)
+ {
+ dNewVal = nResult;
+ dNewVal /= weld::SpinButton::Power10(GetDecimalDigits());
+ }
+ else
+ dNewVal = m_dCurrentValue;
+ }
+ }
+
+ if (!bUseExternalFormatterValue)
+ {
+ DBG_ASSERT(ImplGetFormatter() != nullptr,
"FormattedField::ImplGetValue : can't give you a current value without a
formatter !");
- sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat changes the
FormatKey!
+ sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat changes the
FormatKey!
- if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber)
- // for detection of values like "1,1" in fields that are formatted as
text
- nFormatKey = 0;
+ if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber)
+ // for detection of values like "1,1" in fields that are formatted
as text
+ nFormatKey = 0;
- // special treatment for percentage formatting
- if (ImplGetFormatter()->GetType(m_nFormatKey) == SvNumFormatType::PERCENT)
- {
- // the language of our format
- LanguageType eLanguage =
m_pFormatter->GetEntry(m_nFormatKey)->GetLanguage();
- // the default number format for this language
- sal_uLong nStandardNumericFormat =
m_pFormatter->GetStandardFormat(SvNumFormatType::NUMBER, eLanguage);
-
- sal_uInt32 nTempFormat = nStandardNumericFormat;
- double dTemp;
- if (m_pFormatter->IsNumberFormat(sText, nTempFormat, dTemp) &&
- SvNumFormatType::NUMBER == m_pFormatter->GetType(nTempFormat))
- // the string is equivalent to a number formatted one (has no %
sign) -> append it
- sText += "%";
- // (with this, a input of '3' becomes '3%', which then by the
formatter is translated
- // into 0.03. Without this, the formatter would give us the double 3
for an input '3',
- // which equals 300 percent.
+ // special treatment for percentage formatting
+ if (ImplGetFormatter()->GetType(m_nFormatKey) ==
SvNumFormatType::PERCENT)
+ {
+ // the language of our format
+ LanguageType eLanguage =
m_pFormatter->GetEntry(m_nFormatKey)->GetLanguage();
+ // the default number format for this language
+ sal_uLong nStandardNumericFormat =
m_pFormatter->GetStandardFormat(SvNumFormatType::NUMBER, eLanguage);
+
+ sal_uInt32 nTempFormat = nStandardNumericFormat;
+ double dTemp;
+ if (m_pFormatter->IsNumberFormat(sText, nTempFormat, dTemp) &&
+ SvNumFormatType::NUMBER == m_pFormatter->GetType(nTempFormat))
+ // the string is equivalent to a number formatted one (has no
% sign) -> append it
+ sText += "%";
+ // (with this, a input of '3' becomes '3%', which then by the
formatter is translated
+ // into 0.03. Without this, the formatter would give us the double
3 for an input '3',
+ // which equals 300 percent.
+ }
+ if (!ImplGetFormatter()->IsNumberFormat(sText, nFormatKey, dNewVal))
+ return false;
}
- if (!ImplGetFormatter()->IsNumberFormat(sText, nFormatKey, dNewVal))
- return false;
if (m_bHasMin && (dNewVal<m_dMinValue))
dNewVal = m_dMinValue;
@@ -953,10 +978,34 @@ double FormattedField::GetValue()
return m_dCurrentValue;
}
+void FormattedField::DisableRemainderFactor()
+{
+ m_bDisableRemainderFactor = true;
+}
+
+bool FormattedField::set_property(const OString &rKey, const OUString &rValue)
+{
+ if (rKey == "digits")
+ SetDecimalDigits(rValue.toInt32());
+ else
+ return SpinField::set_property(rKey, rValue);
+ return true;
+}
+
void FormattedField::Up()
{
+ auto nScale = weld::SpinButton::Power10(GetDecimalDigits());
+
+ sal_Int64 nValue = std::round(GetValue() * nScale);
+ sal_Int64 nSpinSize = std::round(m_dSpinSize * nScale);
+ sal_Int64 nRemainder = m_bDisableRemainderFactor ? 0 : nValue % nSpinSize;
+ if (nValue >= 0)
+ nValue = (nRemainder == 0) ? nValue + nSpinSize : nValue + nSpinSize -
nRemainder;
+ else
+ nValue = (nRemainder == 0) ? nValue + nSpinSize : nValue - nRemainder;
+
// setValue handles under- and overflows (min/max) automatically
- SetValue(GetValue() + m_dSpinSize);
+ SetValue(static_cast<double>(nValue) / nScale);
SetModifyFlag();
Modify();
@@ -965,7 +1014,18 @@ void FormattedField::Up()
void FormattedField::Down()
{
- SetValue(GetValue() - m_dSpinSize);
+ auto nScale = weld::SpinButton::Power10(GetDecimalDigits());
+
+ sal_Int64 nValue = std::round(GetValue() * nScale);
+ sal_Int64 nSpinSize = std::round(m_dSpinSize * nScale);
+ sal_Int64 nRemainder = m_bDisableRemainderFactor ? 0 : nValue % nSpinSize;
+ if (nValue >= 0)
+ nValue = (nRemainder == 0) ? nValue - nSpinSize : nValue - nRemainder;
+ else
+ nValue = (nRemainder == 0) ? nValue - nSpinSize : nValue - nSpinSize -
nRemainder;
+
+ // setValue handles under- and overflows (min/max) automatically
+ SetValue(static_cast<double>(nValue) / nScale);
SetModifyFlag();
Modify();
@@ -1001,7 +1061,6 @@ void FormattedField::UseInputStringForFormatting()
m_bUseInputStringForFormatting = true;
}
-
DoubleNumericField::DoubleNumericField(vcl::Window* pParent, WinBits nStyle)
: FormattedField(pParent, nStyle)
{
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e022ab0d7ef1..5f14f9cc0dc5 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -25,6 +25,7 @@
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
+#include <vcl/fmtfield.hxx>
#include <vcl/fixed.hxx>
#include <vcl/fixedhyper.hxx>
#include <vcl/IPrioritable.hxx>
@@ -546,6 +547,16 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const
OUString& sUIDir, const OUStr
mungeAdjustment(*pTarget, *pAdjustment);
}
+ for (auto const& elem :
m_pParserState->m_aFormattedFormatterAdjustmentMaps)
+ {
+ FormattedField *pTarget =
dynamic_cast<FormattedField*>(get<vcl::Window>(elem.m_sID));
+ const Adjustment *pAdjustment =
get_adjustment_by_name(elem.m_sValue.toUtf8());
+ SAL_WARN_IF(!pTarget, "vcl", "missing FormattedField element of
spinbutton/adjustment");
+ SAL_WARN_IF(!pAdjustment, "vcl", "missing Adjustment element of
spinbutton/adjustment");
+ if (pTarget && pAdjustment)
+ mungeAdjustment(*pTarget, *pAdjustment);
+ }
+
for (auto const& elem : m_pParserState->m_aTimeFormatterAdjustmentMaps)
{
TimeField *pTarget =
dynamic_cast<TimeField*>(get<vcl::Window>(elem.m_sID));
@@ -1312,6 +1323,12 @@ void VclBuilder::connectNumericFormatterAdjustment(const
OString &id, const OUSt
m_pParserState->m_aNumericFormatterAdjustmentMaps.emplace_back(id,
rAdjustment);
}
+void VclBuilder::connectFormattedFormatterAdjustment(const OString &id, const
OUString &rAdjustment)
+{
+ if (!rAdjustment.isEmpty())
+ m_pParserState->m_aFormattedFormatterAdjustmentMaps.emplace_back(id,
rAdjustment);
+}
+
void VclBuilder::connectTimeFormatterAdjustment(const OString &id, const
OUString &rAdjustment)
{
if (!rAdjustment.isEmpty())
@@ -1721,9 +1738,19 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window
*pParent, const OString &
if (sPattern.isEmpty())
{
- connectNumericFormatterAdjustment(id, sAdjustment);
SAL_INFO("vcl.layout", "making numeric field for " << name << " "
<< sUnit);
- xWindow = VclPtr<NumericField>::Create(pParent, nBits);
+ if (m_bLegacy)
+ {
+ connectNumericFormatterAdjustment(id, sAdjustment);
+ xWindow = VclPtr<NumericField>::Create(pParent, nBits);
+ }
+ else
+ {
+ connectFormattedFormatterAdjustment(id, sAdjustment);
+ VclPtrInstance<FormattedField> xField(pParent, nBits);
+ xField->SetMinValue(0);
+ xWindow = xField;
+ }
}
else
{
@@ -4075,7 +4102,6 @@ void VclBuilder::mungeModel(SvTreeListBox &rTarget, const
ListStore &rStore, sal
}
}
-
void VclBuilder::mungeAdjustment(NumericFormatter &rTarget, const Adjustment
&rAdjustment)
{
int nMul = rtl_math_pow10Exp(1, rTarget.GetDecimalDigits());
@@ -4114,6 +4140,36 @@ void VclBuilder::mungeAdjustment(NumericFormatter
&rTarget, const Adjustment &rA
}
}
+void VclBuilder::mungeAdjustment(FormattedField &rTarget, const Adjustment
&rAdjustment)
+{
+ for (auto const& elem : rAdjustment)
+ {
+ const OString &rKey = elem.first;
+ const OUString &rValue = elem.second;
+
+ if (rKey == "upper")
+ {
+ rTarget.SetMaxValue(rValue.toDouble());
+ }
+ else if (rKey == "lower")
+ {
+ rTarget.SetMinValue(rValue.toDouble());
+ }
+ else if (rKey == "value")
+ {
+ rTarget.SetValue(rValue.toDouble());
+ }
+ else if (rKey == "step-increment")
+ {
+ rTarget.SetSpinSize(rValue.toDouble());
+ }
+ else
+ {
+ SAL_INFO("vcl.layout", "unhandled property :" << rKey);
+ }
+ }
+}
+
void VclBuilder::mungeAdjustment(TimeField &rTarget, const Adjustment
&rAdjustment)
{
for (auto const& elem : rAdjustment)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
