[Libreoffice-commits] core.git: include/vcl solenv/clang-format toolkit/source vcl/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 23 18:46:32 UTC 2020
include/vcl/field.hxx | 154 ----------------------------------
include/vcl/toolkit/field.hxx | 165 ++++++++++++++++++++++++++++++++++---
include/vcl/toolkit/longcurr.hxx | 13 ++
solenv/clang-format/excludelist | 1
toolkit/source/awt/vclxtoolkit.cxx | 1
vcl/source/control/longcurr.cxx | 2
6 files changed, 167 insertions(+), 169 deletions(-)
New commits:
commit 7eff43375d8d1df59d4961b9e8bc5d12b3edbab6
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 23 10:40:18 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 23 20:45:43 2020 +0200
NumericFormatter can be toolkit only now
Change-Id: Ied4d45b2eadb831cef1b277d67f520859f536644
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99312
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 7ff847f15e0a..b7cf238eb0c9 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -23,160 +23,6 @@
#include <config_options.h>
#include <memory>
#include <vcl/dllapi.h>
-#include <tools/link.hxx>
-#include <tools/date.hxx>
-#include <tools/time.hxx>
-#include <vcl/spinfld.hxx>
-#include <tools/fldunit.hxx>
-
-namespace com::sun::star::lang { struct Locale; }
-
-class CalendarWrapper;
-class LocaleDataWrapper;
-class LanguageTag;
-
-
-class VCL_DLLPUBLIC FormatterBase
-{
-private:
- VclPtr<Edit> mpField;
- std::unique_ptr<LocaleDataWrapper>
- mpLocaleDataWrapper;
- bool mbReformat;
- bool mbStrictFormat;
- bool mbEmptyFieldValue;
- bool mbEmptyFieldValueEnabled;
-
-protected:
- SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection const * pNewSel = nullptr );
- SAL_DLLPRIVATE bool ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; }
-
- void SetEmptyFieldValueData( bool bValue ) { mbEmptyFieldValue = bValue; }
-
- SAL_DLLPRIVATE LocaleDataWrapper& ImplGetLocaleDataWrapper() const;
-
- Edit* GetField() const { return mpField; }
- void ClearField() { mpField.clear(); }
-
-public:
- explicit FormatterBase(Edit* pField);
- virtual ~FormatterBase();
-
- const LocaleDataWrapper& GetLocaleDataWrapper() const;
-
- bool MustBeReformatted() const { return mbReformat; }
- void MarkToBeReformatted( bool b ) { mbReformat = b; }
-
- void SetStrictFormat( bool bStrict );
- bool IsStrictFormat() const { return mbStrictFormat; }
-
- virtual void Reformat();
- virtual void ReformatAll();
-
- const css::lang::Locale& GetLocale() const;
- const LanguageTag& GetLanguageTag() const;
-
- void SetEmptyFieldValue();
- bool IsEmptyFieldValue() const;
-
- void EnableEmptyFieldValue( bool bEnable ) { mbEmptyFieldValueEnabled = bEnable; }
- bool IsEmptyFieldValueEnabled() const { return mbEmptyFieldValueEnabled; }
-};
-
-class VCL_DLLPUBLIC NumericFormatter : public FormatterBase
-{
-public:
- virtual ~NumericFormatter() override;
-
- virtual void Reformat() override;
-
- void SetMin( sal_Int64 nNewMin );
- sal_Int64 GetMin() const { return mnMin; }
- void SetMax( sal_Int64 nNewMax );
- sal_Int64 GetMax() const { return mnMax; }
-
- sal_Int64 ClipAgainstMinMax(sal_Int64 nValue) const;
-
- void SetFirst( sal_Int64 nNewFirst ) { mnFirst = nNewFirst; }
- sal_Int64 GetFirst() const { return mnFirst; }
- void SetLast( sal_Int64 nNewLast ) { mnLast = nNewLast; }
- sal_Int64 GetLast() const { return mnLast; }
- void SetSpinSize( sal_Int64 nNewSize ) { mnSpinSize = nNewSize; }
- sal_Int64 GetSpinSize() const { return mnSpinSize; }
-
- void SetDecimalDigits( sal_uInt16 nDigits );
- sal_uInt16 GetDecimalDigits() const { return mnDecimalDigits;}
-
- void SetUseThousandSep( bool b );
- bool IsUseThousandSep() const { return mbThousandSep; }
-
- void SetUserValue( sal_Int64 nNewValue );
- virtual void SetValue( sal_Int64 nNewValue );
- sal_Int64 GetValue() const;
- virtual OUString CreateFieldText( sal_Int64 nValue ) const;
-
- sal_Int64 Normalize( sal_Int64 nValue ) const;
- sal_Int64 Denormalize( sal_Int64 nValue ) const;
-
- OUString GetValueString() const;
- void SetValueFromString(const OUString& rStr);
-
-protected:
- sal_Int64 mnLastValue;
- sal_Int64 mnMin;
- sal_Int64 mnMax;
- bool mbWrapOnLimits;
- bool mbFormatting;
-
- // the members below are used in all derivatives of NumericFormatter
- // not in NumericFormatter itself.
- sal_Int64 mnSpinSize;
- sal_Int64 mnFirst;
- sal_Int64 mnLast;
-
- NumericFormatter(Edit* pEdit);
-
- void FieldUp();
- void FieldDown();
- void FieldFirst();
- void FieldLast();
- void FormatValue(Selection const * pNewSelection = nullptr);
-
- SAL_DLLPRIVATE void ImplNumericReformat();
- SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue );
- SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection const * pNewSelection = nullptr );
-
- virtual sal_Int64 GetValueFromString(const OUString& rStr) const;
-
-private:
- sal_uInt16 mnDecimalDigits;
- bool mbThousandSep;
-
-};
-
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) NumericField : public SpinField, public NumericFormatter
-{
-public:
- explicit NumericField( vcl::Window* pParent, WinBits nWinStyle );
-
- virtual bool PreNotify( NotifyEvent& rNEvt ) override;
- virtual bool EventNotify( NotifyEvent& rNEvt ) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
-
- virtual Size CalcMinimumSize() const override;
-
- virtual void Modify() override;
-
- virtual void Up() override;
- virtual void Down() override;
- virtual void First() override;
- virtual void Last() override;
- virtual bool set_property(const OString &rKey, const OUString &rValue) override;
- virtual void dispose() override;
-
- virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
-};
-
#endif // INCLUDED_VCL_FIELD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 8b869033b32e..b2831f32742c 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -24,8 +24,160 @@
#endif
#include <config_options.h>
+#include <tools/date.hxx>
+#include <tools/fldunit.hxx>
+#include <tools/time.hxx>
+#include <tools/link.hxx>
+#include <vcl/spinfld.hxx>
#include <vcl/toolkit/combobox.hxx>
-#include <vcl/toolkit/longcurr.hxx>
+
+namespace com::sun::star::lang { struct Locale; }
+
+class CalendarWrapper;
+class LocaleDataWrapper;
+class LanguageTag;
+
+class VCL_DLLPUBLIC FormatterBase
+{
+private:
+ VclPtr<Edit> mpField;
+ std::unique_ptr<LocaleDataWrapper>
+ mpLocaleDataWrapper;
+ bool mbReformat;
+ bool mbStrictFormat;
+ bool mbEmptyFieldValue;
+ bool mbEmptyFieldValueEnabled;
+
+protected:
+ SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection const * pNewSel = nullptr );
+ SAL_DLLPRIVATE bool ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; }
+
+ void SetEmptyFieldValueData( bool bValue ) { mbEmptyFieldValue = bValue; }
+
+ SAL_DLLPRIVATE LocaleDataWrapper& ImplGetLocaleDataWrapper() const;
+
+ Edit* GetField() const { return mpField; }
+ void ClearField() { mpField.clear(); }
+
+public:
+ explicit FormatterBase(Edit* pField);
+ virtual ~FormatterBase();
+
+ const LocaleDataWrapper& GetLocaleDataWrapper() const;
+
+ bool MustBeReformatted() const { return mbReformat; }
+ void MarkToBeReformatted( bool b ) { mbReformat = b; }
+
+ void SetStrictFormat( bool bStrict );
+ bool IsStrictFormat() const { return mbStrictFormat; }
+
+ virtual void Reformat();
+ virtual void ReformatAll();
+
+ const css::lang::Locale& GetLocale() const;
+ const LanguageTag& GetLanguageTag() const;
+
+ void SetEmptyFieldValue();
+ bool IsEmptyFieldValue() const;
+
+ void EnableEmptyFieldValue( bool bEnable ) { mbEmptyFieldValueEnabled = bEnable; }
+ bool IsEmptyFieldValueEnabled() const { return mbEmptyFieldValueEnabled; }
+};
+
+class VCL_DLLPUBLIC NumericFormatter : public FormatterBase
+{
+public:
+ virtual ~NumericFormatter() override;
+
+ virtual void Reformat() override;
+
+ void SetMin( sal_Int64 nNewMin );
+ sal_Int64 GetMin() const { return mnMin; }
+ void SetMax( sal_Int64 nNewMax );
+ sal_Int64 GetMax() const { return mnMax; }
+
+ sal_Int64 ClipAgainstMinMax(sal_Int64 nValue) const;
+
+ void SetFirst( sal_Int64 nNewFirst ) { mnFirst = nNewFirst; }
+ sal_Int64 GetFirst() const { return mnFirst; }
+ void SetLast( sal_Int64 nNewLast ) { mnLast = nNewLast; }
+ sal_Int64 GetLast() const { return mnLast; }
+ void SetSpinSize( sal_Int64 nNewSize ) { mnSpinSize = nNewSize; }
+ sal_Int64 GetSpinSize() const { return mnSpinSize; }
+
+ void SetDecimalDigits( sal_uInt16 nDigits );
+ sal_uInt16 GetDecimalDigits() const { return mnDecimalDigits;}
+
+ void SetUseThousandSep( bool b );
+ bool IsUseThousandSep() const { return mbThousandSep; }
+
+ void SetUserValue( sal_Int64 nNewValue );
+ virtual void SetValue( sal_Int64 nNewValue );
+ sal_Int64 GetValue() const;
+ virtual OUString CreateFieldText( sal_Int64 nValue ) const;
+
+ sal_Int64 Normalize( sal_Int64 nValue ) const;
+ sal_Int64 Denormalize( sal_Int64 nValue ) const;
+
+ OUString GetValueString() const;
+ void SetValueFromString(const OUString& rStr);
+
+protected:
+ sal_Int64 mnLastValue;
+ sal_Int64 mnMin;
+ sal_Int64 mnMax;
+ bool mbWrapOnLimits;
+ bool mbFormatting;
+
+ // the members below are used in all derivatives of NumericFormatter
+ // not in NumericFormatter itself.
+ sal_Int64 mnSpinSize;
+ sal_Int64 mnFirst;
+ sal_Int64 mnLast;
+
+ NumericFormatter(Edit* pEdit);
+
+ void FieldUp();
+ void FieldDown();
+ void FieldFirst();
+ void FieldLast();
+ void FormatValue(Selection const * pNewSelection = nullptr);
+
+ SAL_DLLPRIVATE void ImplNumericReformat();
+ SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue );
+ SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection const * pNewSelection = nullptr );
+
+ virtual sal_Int64 GetValueFromString(const OUString& rStr) const;
+
+private:
+ sal_uInt16 mnDecimalDigits;
+ bool mbThousandSep;
+
+};
+
+class UNLESS_MERGELIBS(VCL_DLLPUBLIC) NumericField : public SpinField, public NumericFormatter
+{
+public:
+ explicit NumericField( vcl::Window* pParent, WinBits nWinStyle );
+
+ virtual bool PreNotify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
+
+ virtual Size CalcMinimumSize() const override;
+
+ virtual void Modify() override;
+
+ virtual void Up() override;
+ virtual void Down() override;
+ virtual void First() override;
+ virtual void Last() override;
+ virtual bool set_property(const OString &rKey, const OUString &rValue) override;
+ virtual void dispose() override;
+
+ virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
+};
+
class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter
{
@@ -490,15 +642,4 @@ public:
virtual void dispose() override;
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) LongCurrencyBox final : public ComboBox, public LongCurrencyFormatter
-{
-public:
- LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle );
-
- virtual bool EventNotify( NotifyEvent& rNEvt ) override;
-
- void Modify() override;
- void ReformatAll() override;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/longcurr.hxx b/include/vcl/toolkit/longcurr.hxx
index a2f0d4781d72..10fd75dbed9a 100644
--- a/include/vcl/toolkit/longcurr.hxx
+++ b/include/vcl/toolkit/longcurr.hxx
@@ -26,7 +26,7 @@
#include <config_options.h>
#include <vcl/dllapi.h>
#include <tools/bigint.hxx>
-#include <vcl/field.hxx>
+#include <vcl/toolkit/field.hxx>
class LocaleDataWrapper;
@@ -64,4 +64,15 @@ private:
};
+class UNLESS_MERGELIBS(VCL_DLLPUBLIC) LongCurrencyBox final : public ComboBox, public LongCurrencyFormatter
+{
+public:
+ LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle );
+
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
+
+ void Modify() override;
+ void ReformatAll() override;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 1a1d6e3fc105..30ba78e395b0 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7341,7 +7341,6 @@ include/vcl/event.hxx
include/vcl/evntpost.hxx
include/vcl/exceptiontypes.hxx
include/vcl/extoutdevdata.hxx
-include/vcl/field.hxx
include/vcl/fixed.hxx
include/vcl/floatwin.hxx
include/vcl/formatter.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index e1faaf2f31ca..25d28ed823e1 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -97,6 +97,7 @@
#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scheduler.hxx>
#include <vcl/toolkit/lstbox.hxx>
+#include <vcl/toolkit/longcurr.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/scrbar.hxx>
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 3dabe524fa5a..42a79fffd400 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -27,7 +27,7 @@
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/toolkit/field.hxx>
+#include <vcl/toolkit/longcurr.hxx>
#include <vcl/weldutils.hxx>
#include <unotools/localedatawrapper.hxx>
More information about the Libreoffice-commits
mailing list