[Libreoffice-commits] core.git: include/vcl

[Caolán McNamara (via logerrit)]

 include/vcl/field.hxx         |   21 ---------------------
 include/vcl/toolkit/field.hxx |   20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 21 deletions(-)

New commits:
commit ada37301a5c133e913cebde3fcddaee947d3dafb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 17 17:00:29 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Feb 18 09:51:34 2020 +0100

    move NumericBox to vcl/toolkit
    
    Change-Id: I3f51e917eb1979bf93f2233ec54abc31af8ef51b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88872
    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 7cb371a25e4a..e5685f493520 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -512,27 +512,6 @@ public:
     virtual void            dispose() override;
 };
 
-class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
-{
-    SAL_DLLPRIVATE void     ImplNumericReformat( const OUString& rStr, sal_Int64& rValue, OUString& rOutStr );
-public:
-    explicit                NumericBox( vcl::Window* pParent, WinBits nWinStyle );
-
-    virtual Size            CalcMinimumSize() const override;
-
-    virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
-    virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
-
-    virtual void            Modify() override;
-
-    virtual void            ReformatAll() override;
-
-    void                    InsertValue( sal_Int64 nValue, sal_Int32  nPos = COMBOBOX_APPEND );
-    virtual void            dispose() override;
-};
-
-
 class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter
 {
 public:
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 9c237710f0cd..cb6e93a436e5 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -60,6 +60,26 @@ public:
     virtual void            dispose() override;
 };
 
+class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
+{
+    SAL_DLLPRIVATE void     ImplNumericReformat( const OUString& rStr, sal_Int64& rValue, OUString& rOutStr );
+public:
+    explicit                NumericBox( vcl::Window* pParent, WinBits nWinStyle );
+
+    virtual Size            CalcMinimumSize() const override;
+
+    virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
+    virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
+
+    virtual void            Modify() override;
+
+    virtual void            ReformatAll() override;
+
+    void                    InsertValue( sal_Int64 nValue, sal_Int32  nPos = COMBOBOX_APPEND );
+    virtual void            dispose() override;
+};
+
 class VCL_DLLPUBLIC PatternBox final : public ComboBox, public PatternFormatter
 {
 public: