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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 27 08:16:48 UTC 2020


 include/vcl/decoview.hxx |   15 ---------------
 include/vcl/vclenum.hxx  |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 3636972c4ef6135ffa8de7c94412b9cdcbaaf169
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 26 17:36:38 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 27 10:16:00 2020 +0200

    move DrawFrameFlags to vclenum.hxx
    
    Change-Id: I49c4a95dc30584753724c1f824f12ce33317312d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101428
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 40dc600b87d2..4ab2fe70d314 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -42,21 +42,6 @@ namespace o3tl
     template<> struct typed_flags<DrawSymbolFlags> : is_typed_flags<DrawSymbolFlags, 0x03> {};
 }
 
-// Flags for DrawFrame()
-enum class DrawFrameFlags
-{
-    NONE                     = 0x0000,
-    Menu                     = 0x0010,
-    WindowBorder             = 0x0020,
-    BorderWindowBorder       = 0x0040,
-    Mono                     = 0x1000,
-    NoDraw                   = 0x8000,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<DrawFrameFlags> : is_typed_flags<DrawFrameFlags, 0x9070> {};
-}
-
 // Flags for DrawHighlightFrame()
 enum class DrawHighlightFrameStyle
 {
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 9ac6e79b7737..59f0cb3c9f39 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -343,6 +343,21 @@ enum class DrawFrameStyle
     NWF                      = 0x0006,
 };
 
+// Flags for DrawFrame()
+enum class DrawFrameFlags
+{
+    NONE                     = 0x0000,
+    Menu                     = 0x0010,
+    WindowBorder             = 0x0020,
+    BorderWindowBorder       = 0x0040,
+    Mono                     = 0x1000,
+    NoDraw                   = 0x8000,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<DrawFrameFlags> : is_typed_flags<DrawFrameFlags, 0x9070> {};
+}
+
 enum class TxtAlign
 {
     Left,


More information about the Libreoffice-commits mailing list