diff options
26 files changed, 35 insertions, 30 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 2e8622b6becc..6170ee8d991b 100644 --- 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> diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 6a187de91602..d4d2ba885a25 100644 --- 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" diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index f29399834330..c4c5754a05df 100644 --- 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" diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 2b4054f5a1d5..798b3e29305f 100644 --- 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> diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index a6e1e837ef7a..d35816f11701 100644 --- 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" diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index 44956731e267..f283278c46bf 100644 --- 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; diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index 6af79d7f4002..1f4857714b71 100644 --- 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" diff --git a/vcl/inc/outfont.hxx b/vcl/inc/fontentry.hxx index 5049cadbaf3e..2768423d97dd 100644 --- a/vcl/inc/outfont.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: */ diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index a14d8f03ae9d..e0513583540b 100644 --- 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" diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index a3c50e6697d9..13ee4ecc7ec0 100644 --- 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> diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index 5814b7c449e9..88a7f5c382e8 100644 --- 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; diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index b2908a11c093..45c5dc6fa54b 100644 --- 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> diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index d128950c1942..506895c1fe60 100644 --- 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" diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 26b6c2fc9eda..c6dbd60a0aa7 100644 --- 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" diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index cceecd805aee..d516d76ea7a9 100644 --- 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" diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index ce44f6003387..5eeaf9922df2 100644 --- 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" diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index f8f4c725d111..fbe484fd5cf3 100644 --- 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" diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index a322aeba7380..de031139af5c 100644 --- 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" diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx index cfa9eaedc985..6f52df9ae4a1 100644 --- 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" diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index ab0381c55622..58ecc0aa2843 100644 --- 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" diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index f99bed10dc11..ade5b851e180 100644 --- 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> diff --git a/vcl/source/gdi/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx index 68ede0bd676e..8aa0ad24e607 100644 --- 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" diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 2138c0d11599..ab9d69e2d215 100644 --- 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> diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index ffb418823758..40e12c908e40 100644 --- 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" diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 87af1209a5e4..c8e2d88ab466 100644 --- 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" diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index d39810a8f44a..3740e77cb07f 100644 --- 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> |