vcl/inc/fontmanager.hxx | 1
vcl/inc/impfont.hxx | 37 ----------------
vcl/inc/unx/fc_fontoptions.hxx | 70 ++++++++++++++++++++++++++++++++
vcl/quartz/salgdi.cxx | 1
vcl/unx/generic/gdi/cairotextrender.cxx | 1
5 files changed, 72 insertions(+), 38 deletions(-)
New commits:
commit 56534cb1271562fa26faabda6a7257bec43a8c00
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Jan 11 19:07:24 2016 +1100
vcl: put FontConfigFontOptions into Unix header
Change-Id: I7b326d8fc8d2b6ecd9642ba958015285d0929a44
Reviewed-on: https://gerrit.libreoffice.org/21341
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index d2d9c59..a281eb3 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -31,6 +31,7 @@
#include <vcl/vclenum.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include "salglyphid.hxx"
+#include "unx/fc_fontoptions.hxx"
#include <vector>
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 77b90a4..ad3d5ea 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -125,43 +125,6 @@ public:
bool operator==( const ImplFontMetric& ) const;
};
-typedef struct _FcPattern FcPattern;
-class FontConfigFontOptions
-{
-public:
- FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps
should be used
- FontAntiAlias meAntiAlias; // whether the font should be
antialiased
- FontAutoHint meAutoHint; // whether the font should be
autohinted
- FontHinting meHinting; // whether the font should be hinted
- FontHintStyle meHintStyle; // type of font hinting to be used
-
- FontConfigFontOptions() :
- meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
- meAntiAlias(ANTIALIAS_DONTKNOW),
- meAutoHint(AUTOHINT_DONTKNOW),
- meHinting(HINTING_DONTKNOW),
- meHintStyle(HINT_SLIGHT),
- mpPattern(nullptr) {}
- FontConfigFontOptions(FcPattern* pPattern) :
- meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
- meAntiAlias(ANTIALIAS_DONTKNOW),
- meAutoHint(AUTOHINT_DONTKNOW),
- meHinting(HINTING_DONTKNOW),
- meHintStyle(HINT_SLIGHT),
- mpPattern(pPattern) {}
- ~FontConfigFontOptions();
-
- FontAutoHint GetUseAutoHint() const { return meAutoHint; }
- FontHintStyle GetHintStyle() const { return meHintStyle; }
- bool DontUseEmbeddedBitmaps() const { return
meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
- bool DontUseAntiAlias() const { return meAntiAlias ==
ANTIALIAS_FALSE; }
- bool DontUseHinting() const { return (meHinting ==
HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
- void* GetPattern(void * /*pFace*/, bool /*bEmbolden*/) const;
-private:
- FcPattern* mpPattern;
-};
-
-
#endif // INCLUDED_VCL_INC_IMPFONT_HXX
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
new file mode 100644
index 0000000..4fc96a0
--- /dev/null
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
+#ifndef INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
+#define INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
+
+#include <rtl/ustring.hxx>
+#include <tools/gen.hxx>
+#include <tools/color.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/vclenum.hxx>
+#include <vcl/fntstyle.hxx>
+
+typedef struct _FcPattern FcPattern;
+class FontConfigFontOptions
+{
+public:
+ FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps
should be used
+ FontAntiAlias meAntiAlias; // whether the font should be
antialiased
+ FontAutoHint meAutoHint; // whether the font should be
autohinted
+ FontHinting meHinting; // whether the font should be hinted
+ FontHintStyle meHintStyle; // type of font hinting to be used
+
+ FontConfigFontOptions() :
+ meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
+ meAntiAlias(ANTIALIAS_DONTKNOW),
+ meAutoHint(AUTOHINT_DONTKNOW),
+ meHinting(HINTING_DONTKNOW),
+ meHintStyle(HINT_SLIGHT),
+ mpPattern(nullptr) {}
+ FontConfigFontOptions(FcPattern* pPattern) :
+ meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
+ meAntiAlias(ANTIALIAS_DONTKNOW),
+ meAutoHint(AUTOHINT_DONTKNOW),
+ meHinting(HINTING_DONTKNOW),
+ meHintStyle(HINT_SLIGHT),
+ mpPattern(pPattern) {}
+ ~FontConfigFontOptions();
+
+ FontAutoHint GetUseAutoHint() const { return meAutoHint; }
+ FontHintStyle GetHintStyle() const { return meHintStyle; }
+ bool DontUseEmbeddedBitmaps() const { return
meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
+ bool DontUseAntiAlias() const { return meAntiAlias ==
ANTIALIAS_FALSE; }
+ bool DontUseHinting() const { return (meHinting ==
HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
+ void* GetPattern(void * /*pFace*/, bool /*bEmbolden*/) const;
+private:
+ FcPattern* mpPattern;
+};
+
+
+
+#endif // INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index ad10cc8..9785126 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -44,7 +44,6 @@
#ifdef MACOSX
#include "osx/salframe.h"
#endif
-#include "quartz/salgdi.h"
#include "quartz/utils.h"
#ifdef IOS
#include "saldatabasic.hxx"
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 929055a..6808193 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -29,6 +29,7 @@
#include "unx/genpspgraphics.h"
#include "unx/geninst.h"
#include "unx/glyphcache.hxx"
+#include "unx/fc_fontoptions.hxx"
#include "PhysicalFontFace.hxx"
#include "impfont.hxx"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
