vcl: rename outfont.hxx to fontentry.hxx

Change-Id: I174a7a87d68958d0a5dd7c3e0f35294f0d020eb1 Reviewed-on: https://gerrit.libreoffice.org/21189 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-07 17:48:34 +11:00
parent f9c8d97d82
commit 2e11a3e03e
26 changed files with 35 additions and 30 deletions
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -24,7 +24,7 @@
 #include <vcl/sysdata.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/wrkwin.hxx>
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nutil/unicode.hxx>
 #include <rtl/strbuf.hxx>
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -22,7 +22,7 @@
 #include "generic/glyphcache.hxx"

 #include "vcl/sysdata.hxx"
-#include "outfont.hxx"
+#include "fontentry.hxx"

 #include "generic/printergfx.hxx"
 #include "salbmp.hxx"
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -23,7 +23,7 @@
 #include "gcach_ftyp.hxx"

 #include "vcl/svapp.hxx"
-#include <outfont.hxx>
+#include <fontentry.hxx>
 #include <impfont.hxx>
 #include "fontattributes.hxx"

--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -23,7 +23,7 @@

 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
-#include <outfont.hxx>
+#include <fontentry.hxx>
 #include <fontattributes.hxx>

 #include <config_graphite.h>
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -50,7 +50,7 @@
 #include "generic/printergfx.hxx"
 #include "impfont.hxx"
 #include "langboost.hxx"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"
 #include "PhysicalFontCollection.hxx"
 #include "PhysicalFontFace.hxx"
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -22,7 +22,7 @@

 #include <vcl/dllapi.h>

-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "PhysicalFontFamily.hxx"

 class ImplGlyphFallbackFontSubstitution;
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -22,7 +22,7 @@

 #include <vcl/dllapi.h>

-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"
 #include "fontselect.hxx"

--- a/vcl/inc/fontentry.hxx
+++ b/vcl/inc/fontentry.hxx
@@ -17,8 +17,8 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#ifndef INCLUDED_VCL_INC_OUTFONT_HXX
-#define INCLUDED_VCL_INC_OUTFONT_HXX
+#ifndef INCLUDED_VCL_INC_FONTENTRY_HXX
+#define INCLUDED_VCL_INC_FONTENTRY_HXX

 #include <sal/types.h>
 #include <vcl/dllapi.h>
@@ -67,6 +67,6 @@ private:
    UnicodeFallbackList* mpUnicodeFallbackList;
 };

-#endif // INCLUDED_VCL_INC_OUTFONT_HXX
+#endif // INCLUDED_VCL_INC_FONTENTRY_HXX

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -32,7 +32,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/metric.hxx>

-#include <outfont.hxx>
+#include <fontentry.hxx>
 #include <sallayout.hxx>
 #include "fontattributes.hxx"

--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -27,7 +27,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/vclenum.hxx>
 #include <vcl/fntstyle.hxx>
-#include <outfont.hxx>
+#include <fontentry.hxx>

 #include <boost/intrusive_ptr.hpp>

--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -27,7 +27,7 @@
 #include <tools/gen.hxx>
 #include <vcl/vclptr.hxx>

-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "PhysicalFontFace.hxx"

 class Size;
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
 manual changes will be rewritten by the next run of update_pch.sh (which presumably
 also fixes all possible problems, so it's usually better to use it).

- Generated on 2015-11-14 14:16:45 using:
+ Generated on 2016-01-07 18:28:08 using:
 ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local

 If after updating build fails, use the following command to locate conflicting headers:
@@ -22,6 +22,8 @@

 #include <algorithm>
 #include <cassert>
+#include <climits>
+#include <cmath>
 #include <config_features.h>
 #include <config_folders.h>
 #include <config_global.h>
@@ -128,12 +130,12 @@
 #include <salsys.hxx>
 #include <saltimer.hxx>
 #include <salvd.hxx>
+#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/button.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/configsettings.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/cursor.hxx>
@@ -216,6 +218,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/Locale.hpp>
@@ -257,19 +260,21 @@
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <dndlcon.hxx>
+#include <fontentry.hxx>
 #include <helpwin.hxx>
 #include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <impbmp.hxx>
+#include <impfont.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <opengl/texture.hxx>
 #include <opengl/zone.hxx>
 #include <outdata.hxx>
-#include <outfont.hxx>
 #include <rsc/rsc-vcl-shared-types.hxx>
 #include <svdata.hxx>
+#include <svl/hint.hxx>
 #include <svl/svldllapi.h>
 #include <tools/color.hxx>
 #include <tools/date.hxx>
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -38,7 +38,7 @@
 #include <vcl/fontcapabilities.hxx>
 #include <vcl/metric.hxx>

-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "PhysicalFontFace.hxx"
 #include "salgdi.hxx"

--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -23,7 +23,7 @@
 #include "sallayout.hxx"
 #include "salgeom.hxx"
 #include "salgdi.hxx"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"
 #include "PhysicalFontFace.hxx"
 #include "impfont.hxx"
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -31,7 +31,7 @@
 #include "osx/saldata.hxx"
 #include "osx/salinst.h"
 #endif
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"
 #include "PhysicalFontCollection.hxx"
 #include "quartz/salgdi.h"
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -63,7 +63,7 @@
 #include "accmgr.hxx"
 #include "idlemgr.hxx"
 #include "outdev.h"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "PhysicalFontCollection.hxx"
 #include "print.h"
 #include "salgdi.hxx"
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -32,7 +32,7 @@

 #include "magic.h"
 #include "outdev.h"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"
 #include "PhysicalFontFace.hxx"

--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -21,7 +21,7 @@

 #include <tools/fontenum.hxx>

-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"

 #include "PhysicalFontFace.hxx"
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -17,7 +17,7 @@

 #include "fontsubset.hxx"
 #include "outdev.h"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "PhysicalFontCollection.hxx"
 #include "salgdi.hxx"
 #include "sft.hxx"
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -27,7 +27,7 @@
 #include "vcl/font.hxx"

 #include "impfont.hxx"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"
 #include "sft.hxx"

--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -16,7 +16,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */
 #include <vcl/fontcharmap.hxx>
-#include <outfont.hxx>
+#include <fontentry.hxx>
 #include <impfont.hxx>

 #include <vector>
--- a/vcl/source/gdi/pdffontcache.cxx
+++ b/vcl/source/gdi/pdffontcache.cxx
@@ -21,7 +21,7 @@

 #include <sal/types.h>

-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "PhysicalFontFace.hxx"
 #include "salgdi.hxx"
 #include "sallayout.hxx"
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -20,7 +20,7 @@
 #include "vcl/ctrl.hxx"
 #include "vcl/outdev.hxx"

-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "textlayout.hxx"

 #include <com/sun/star/i18n/ScriptDirection.hpp>
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -33,7 +33,7 @@

 #include "impfont.hxx"
 #include "outdata.hxx"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "fontattributes.hxx"

 #include "outdev.h"
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -63,7 +63,7 @@
 #include "salgdi.hxx"
 #include "svdata.hxx"
 #include "dbggui.hxx"
-#include "outfont.hxx"
+#include "fontentry.hxx"
 #include "window.h"
 #include "toolbox.h"
 #include "outdev.h"
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -36,7 +36,7 @@
 #include <vcl/settings.hxx>

 #include <window.h>
-#include <outfont.hxx>
+#include <fontentry.hxx>
 #include <outdev.h>
 #include <svdata.hxx>
 #include <impbmp.hxx>