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

[Chris Sherlock (via logerrit)]

 include/vcl/outdev.hxx                      |   29 ---------------
 include/vcl/rendercontext/DrawTextFlags.hxx |   53 ++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 28 deletions(-)

New commits:
commit efd1d047a70a8e1b78ab75cedda688eaa8d1537f
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Sun May 2 04:06:54 2021 +1000
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon May 10 09:36:07 2021 +0200

    vcl: move DrawTextFlags to own header
    
    Change-Id: I02b40dbb901c07f8049249dbb42dae75a476dd9f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114989
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index f395dddf287a..0bd1a66985c5 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -31,6 +31,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
 #include <vcl/region.hxx>
+#include <vcl/rendercontext/DrawTextFlags.hxx>
 #include <vcl/rendercontext/SalLayoutFlags.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wall.hxx>
@@ -124,34 +125,6 @@ namespace com::sun::star::rendering {
 
 // OutputDevice-Types
 
-// Flags for DrawText()
-enum class DrawTextFlags
-{
-    NONE                  = 0x00000000,
-    Disable               = 0x00000001,
-    Mnemonic              = 0x00000002,
-    Mono                  = 0x00000004,
-    Clip                  = 0x00000008,
-    Left                  = 0x00000010,
-    Center                = 0x00000020,
-    Right                 = 0x00000040,
-    Top                   = 0x00000080,
-    VCenter               = 0x00000100,
-    Bottom                = 0x00000200,
-    EndEllipsis           = 0x00000400,
-    PathEllipsis          = 0x00000800,
-    MultiLine             = 0x00001000,
-    WordBreak             = 0x00002000,
-    NewsEllipsis          = 0x00004000,
-    WordBreakHyphenation  = 0x00008000 | WordBreak,
-    CenterEllipsis        = 0x00010000,
-    HideMnemonic          = 0x00020000,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<DrawTextFlags> : is_typed_flags<DrawTextFlags, 0x3ffff> {};
-}
-
 // Flags for DrawImage(), these must match the definitions in css::awt::ImageDrawMode
 enum class DrawImageFlags
 {
diff --git a/include/vcl/rendercontext/DrawTextFlags.hxx b/include/vcl/rendercontext/DrawTextFlags.hxx
new file mode 100644
index 000000000000..e393bcd2ceaa
--- /dev/null
+++ b/include/vcl/rendercontext/DrawTextFlags.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <o3tl/typed_flags_set.hxx>
+
+enum class DrawTextFlags
+{
+    NONE = 0x00000000,
+    Disable = 0x00000001,
+    Mnemonic = 0x00000002,
+    Mono = 0x00000004,
+    Clip = 0x00000008,
+    Left = 0x00000010,
+    Center = 0x00000020,
+    Right = 0x00000040,
+    Top = 0x00000080,
+    VCenter = 0x00000100,
+    Bottom = 0x00000200,
+    EndEllipsis = 0x00000400,
+    PathEllipsis = 0x00000800,
+    MultiLine = 0x00001000,
+    WordBreak = 0x00002000,
+    NewsEllipsis = 0x00004000,
+    WordBreakHyphenation = 0x00008000 | WordBreak,
+    CenterEllipsis = 0x00010000,
+    HideMnemonic = 0x00020000,
+};
+namespace o3tl
+{
+template <> struct typed_flags<DrawTextFlags> : is_typed_flags<DrawTextFlags, 0x3ffff>
+{
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */