vcl: put FontConfigFontOptions into Unix header

Change-Id: I7b326d8fc8d2b6ecd9642ba958015285d0929a44
Reviewed-on: https://gerrit.libreoffice.org/21341Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

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>
 

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
 

vcl/inc/unx/fc_fontoptions.hxx

+/* -*- 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: */

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"

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"