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

[Chris Sherlock (via logerrit)]

 include/vcl/outdev.hxx                       |   16 ----------
 include/vcl/rendercontext/DrawImageFlags.hxx |   41 +++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 15 deletions(-)

New commits:
commit 1dc6221a237aa6960b94c322c2f947db85caa661
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Sun May 2 13:58:42 2021 +1000
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon May 10 09:36:46 2021 +0200

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0bd1a66985c5..18ea39ba8e93 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/DrawImageFlags.hxx>
 #include <vcl/rendercontext/DrawTextFlags.hxx>
 #include <vcl/rendercontext/SalLayoutFlags.hxx>
 #include <vcl/mapmod.hxx>
@@ -125,21 +126,6 @@ namespace com::sun::star::rendering {
 
 // OutputDevice-Types
 
-// Flags for DrawImage(), these must match the definitions in css::awt::ImageDrawMode
-enum class DrawImageFlags
-{
-    NONE                 = 0x0000,
-    Disable              = 0x0001,
-    Highlight            = 0x0002,
-    Deactive             = 0x0004,
-    ColorTransform       = 0x0008,
-    SemiTransparent      = 0x0010,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<DrawImageFlags> : is_typed_flags<DrawImageFlags, 0x001f> {};
-}
-
 // Flags for DrawGrid()
 enum class DrawGridFlags
 {
diff --git a/include/vcl/rendercontext/DrawImageFlags.hxx b/include/vcl/rendercontext/DrawImageFlags.hxx
new file mode 100644
index 000000000000..014b552dec15
--- /dev/null
+++ b/include/vcl/rendercontext/DrawImageFlags.hxx
@@ -0,0 +1,41 @@
+/* -*- 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>
+
+// Flags for DrawImage(), these must match the definitions in css::awt::ImageDrawMode
+enum class DrawImageFlags
+{
+    NONE = 0x0000,
+    Disable = 0x0001,
+    Highlight = 0x0002,
+    Deactive = 0x0004,
+    ColorTransform = 0x0008,
+    SemiTransparent = 0x0010,
+};
+namespace o3tl
+{
+template <> struct typed_flags<DrawImageFlags> : is_typed_flags<DrawImageFlags, 0x001f>
+{
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */