include/vcl/outdev.hxx | 21 ------------
include/vcl/rendercontext/SalLayoutFlags.hxx | 44 +++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 20 deletions(-)
New commits:
commit 8c756af15e967fca3b6cc08be9a57f6d249a27b7
Author: Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun May 2 01:59:08 2021 +1000
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon May 3 15:11:11 2021 +0200
vcl: move SalLayoutFlags to own header
Change-Id: Ia1cefb6e0759404cb63cf1ccf6190931047bac79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114973
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0b5ad987a060..54c39d2bf6cf 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -25,13 +25,13 @@
#include <tools/solar.h>
#include <tools/color.hxx>
#include <tools/poly.hxx>
-#include <o3tl/typed_flags_set.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/cairo.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/font.hxx>
#include <vcl/region.hxx>
+#include <vcl/rendercontext/SalLayoutFlags.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/wall.hxx>
#include <vcl/metaactiontypes.hxx>
@@ -116,25 +116,6 @@ namespace com::sun::star::awt {
#define GLYPH_FONT_HEIGHT 256
#endif
-// Text Layout options
-enum class SalLayoutFlags
-{
- NONE = 0x0000,
- BiDiRtl = 0x0001,
- BiDiStrong = 0x0002,
- RightAlign = 0x0004,
- DisableKerning = 0x0010,
- KerningAsian = 0x0020,
- Vertical = 0x0040,
- KashidaJustification = 0x0800,
- ForFallback = 0x2000,
- GlyphItemsOnly = 0x4000,
-};
-namespace o3tl
-{
- template<> struct typed_flags<SalLayoutFlags> :
is_typed_flags<SalLayoutFlags, 0x6877> {};
-}
-
typedef std::vector< tools::Rectangle > MetricVector;
// OutputDevice-Types
diff --git a/include/vcl/rendercontext/SalLayoutFlags.hxx
b/include/vcl/rendercontext/SalLayoutFlags.hxx
new file mode 100644
index 000000000000..68c26cadb48b
--- /dev/null
+++ b/include/vcl/rendercontext/SalLayoutFlags.hxx
@@ -0,0 +1,44 @@
+/* -*- 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 SalLayoutFlags
+{
+ NONE = 0x0000,
+ BiDiRtl = 0x0001,
+ BiDiStrong = 0x0002,
+ RightAlign = 0x0004,
+ DisableKerning = 0x0010,
+ KerningAsian = 0x0020,
+ Vertical = 0x0040,
+ KashidaJustification = 0x0800,
+ ForFallback = 0x2000,
+ GlyphItemsOnly = 0x4000,
+};
+namespace o3tl
+{
+template <> struct typed_flags<SalLayoutFlags> :
is_typed_flags<SalLayoutFlags, 0x6877>
+{
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
