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

[Caolán McNamara (via logerrit)]

 include/vcl/longcurr.hxx        |   13 -------------
 include/vcl/toolkit/field.hxx   |   12 ++++++++++++
 vcl/source/control/longcurr.cxx |    2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 50e58a9e93424e99fa95234ab5cb07c4db9b580d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 13 10:03:39 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 13 15:00:23 2020 +0200

    move LongCurrencyBox to be toolkit only
    
    Change-Id: I70ac2d521e5a6178483e4d44f2c63f826ddea168
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94106
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index b139517dd0b8..6732a184b34b 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -23,7 +23,6 @@
 #include <config_options.h>
 #include <vcl/dllapi.h>
 #include <tools/bigint.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
 
 class LocaleDataWrapper;
@@ -98,18 +97,6 @@ public:
     const BigInt&   GetSpinSize() const { return mnSpinSize; }
 };
 
-
-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;
-};
-
 #endif // INCLUDED_VCL_LONGCURR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 76c998b22c11..ce3f1277e862 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -27,6 +27,7 @@
 #include <config_options.h>
 #include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
+#include <vcl/longcurr.hxx>
 
 class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter
 {
@@ -238,6 +239,17 @@ 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;
+};
+
 #endif // INCLUDED_VCL_FIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 6505df620c10..ab2ba50e73aa 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -26,7 +26,7 @@
 #include <sal/log.hxx>
 
 #include <vcl/event.hxx>
-#include <vcl/longcurr.hxx>
+#include <vcl/toolkit/field.hxx>
 
 #include <unotools/localedatawrapper.hxx>