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

[Caolán McNamara (via logerrit)]

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

New commits:
commit c213e05d04f100199052ba7c781823101e3f8aa6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 21 20:22:13 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 22 12:24:46 2020 +0200

    move PatternField to toolkit headers
    
    Change-Id: Ib75cefc6ca6a289113bac2903eb807f5d43ff3df
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99175
    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 ac72ac78b3c4..7ff847f15e0a 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -83,36 +83,6 @@ public:
     bool                    IsEmptyFieldValueEnabled() const        { return mbEmptyFieldValueEnabled; }
 };
 
-#define PATTERN_FORMAT_EMPTYLITERALS    (sal_uInt16(0x0001))
-
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PatternFormatter : public FormatterBase
-{
-private:
-    OString                m_aEditMask;
-    OUString               maLiteralMask;
-    bool                   mbSameMask;
-    bool                   mbInPattKeyInput;
-
-protected:
-                            PatternFormatter(Edit* pEdit);
-
-    SAL_DLLPRIVATE bool     ImplIsSameMask() const { return mbSameMask; }
-    SAL_DLLPRIVATE bool&    ImplGetInPattKeyInput() { return mbInPattKeyInput; }
-
-public:
-    virtual                 ~PatternFormatter() override;
-
-    virtual void            Reformat() override;
-
-    void SetMask(const OString& rEditMask, const OUString& rLiteralMask );
-    const OString& GetEditMask() const { return m_aEditMask; }
-    const OUString&        GetLiteralMask() const  { return maLiteralMask; }
-
-    void                    SetString( const OUString& rStr );
-    OUString                GetString() const;
-};
-
-
 class VCL_DLLPUBLIC NumericFormatter : public FormatterBase
 {
 public:
@@ -184,18 +154,6 @@ private:
 
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PatternField final : public SpinField, public PatternFormatter
-{
-public:
-    explicit                PatternField( vcl::Window* pParent, WinBits nWinStyle );
-
-    virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
-    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
-    virtual void            Modify() override;
-    virtual void            dispose() override;
-};
-
-
 class UNLESS_MERGELIBS(VCL_DLLPUBLIC) NumericField : public SpinField, public NumericFormatter
 {
 public:
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 6316c5698933..8b869033b32e 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -390,6 +390,46 @@ public:
     virtual void            dispose() override;
 };
 
+#define PATTERN_FORMAT_EMPTYLITERALS    (sal_uInt16(0x0001))
+
+class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PatternFormatter : public FormatterBase
+{
+private:
+    OString                m_aEditMask;
+    OUString               maLiteralMask;
+    bool                   mbSameMask;
+    bool                   mbInPattKeyInput;
+
+protected:
+                            PatternFormatter(Edit* pEdit);
+
+    SAL_DLLPRIVATE bool     ImplIsSameMask() const { return mbSameMask; }
+    SAL_DLLPRIVATE bool&    ImplGetInPattKeyInput() { return mbInPattKeyInput; }
+
+public:
+    virtual                 ~PatternFormatter() override;
+
+    virtual void            Reformat() override;
+
+    void SetMask(const OString& rEditMask, const OUString& rLiteralMask );
+    const OString& GetEditMask() const { return m_aEditMask; }
+    const OUString&        GetLiteralMask() const  { return maLiteralMask; }
+
+    void                    SetString( const OUString& rStr );
+    OUString                GetString() const;
+};
+
+class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PatternField final : public SpinField, public PatternFormatter
+{
+public:
+    explicit                PatternField( vcl::Window* pParent, WinBits nWinStyle );
+
+    virtual bool            PreNotify( NotifyEvent& rNEvt ) override;
+    virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
+    virtual void            Modify() override;
+    virtual void            dispose() override;
+};
+
 class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PatternBox final : public ComboBox, public PatternFormatter
 {
 public: