diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-17 15:13:14 +1000 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-21 07:11:24 +0200 |
commit | 5c98fcffb23a9da8459e35bdd9946422fec8a320 (patch) | |
tree | 2d8fc94aa0554c330c61e009b3283ebfa69edddc | |
parent | use MSVC's /Zc:inline option to reduce binary size (diff) | |
download | core-5c98fcffb23a9da8459e35bdd9946422fec8a320.tar.gz core-5c98fcffb23a9da8459e35bdd9946422fec8a320.zip |
vcl: add sal/config.h in preparation for patch
The convention is that we need to add sal/config.h to the start of
files.
This patch is created in preparation of a patch I have queued to test
and move PhysicalFontFace to vcl::font namespace.
Change-Id: I15dd24d7f01e077d407ac192a0413d796517eb72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122228
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
40 files changed, 77 insertions, 0 deletions
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 7ca5d3f31c78..3b6254869f1b 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/log.hxx> + #include <basegfx/polygon/b2dpolypolygon.hxx> #include <tools/gen.hxx> #include <tools/degree.hxx> diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index 20f9b626474f..e2a98f00ac77 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include "fontselect.hxx" #include "impfontmetricdata.hxx" diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index b0cebef83240..3f3b89f0e969 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <rtl/ustring.hxx> #include <tools/color.hxx> #include <tools/fontenum.hxx> diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx index ab6ae3af5c04..f3d8736add41 100644 --- a/vcl/inc/impfontcache.hxx +++ b/vcl/inc/impfontcache.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <rtl/ref.hxx> #include <o3tl/lru_map.hxx> #include <o3tl/hash_combine.hxx> diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index 0c523dc2c88d..fb493e99eed3 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <vcl/dllapi.h> #include <tools/long.hxx> #include <tools/ref.hxx> diff --git a/vcl/inc/pdf/pdfbuildin_fonts.hxx b/vcl/inc/pdf/pdfbuildin_fonts.hxx index 9369c058072b..0ca4f9bdc492 100644 --- a/vcl/inc/pdf/pdfbuildin_fonts.hxx +++ b/vcl/inc/pdf/pdfbuildin_fonts.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <PhysicalFontFace.hxx> #include <fontinstance.hxx> diff --git a/vcl/inc/pdf/pdffontcache.hxx b/vcl/inc/pdf/pdffontcache.hxx index b3eca45d4002..094652fefe89 100644 --- a/vcl/inc/pdf/pdffontcache.hxx +++ b/vcl/inc/pdf/pdffontcache.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <typeinfo> #include <sal/types.h> diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx index 3accc4d4488e..598c124f36b9 100644 --- a/vcl/inc/pdf/pdfwriter_impl.hxx +++ b/vcl/inc/pdf/pdfwriter_impl.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <map> #include <list> #include <unordered_map> diff --git a/vcl/inc/qt5/Qt5Font.hxx b/vcl/inc/qt5/Qt5Font.hxx index 0720be93112b..33243538fcaf 100644 --- a/vcl/inc/qt5/Qt5Font.hxx +++ b/vcl/inc/qt5/Qt5Font.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <fontinstance.hxx> #include <QtGui/QFont> diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx index e5b05e5b6f50..4c2b654a8442 100644 --- a/vcl/inc/qt5/Qt5FontFace.hxx +++ b/vcl/inc/qt5/Qt5FontFace.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <vclpluginapi.h> #include <PhysicalFontFace.hxx> diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx index 011d3384e804..c58ccbaa4e21 100644 --- a/vcl/inc/qt5/Qt5Graphics.hxx +++ b/vcl/inc/qt5/Qt5Graphics.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <salgdi.hxx> #include <memory> diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index c97d814267e5..270c6dd6a426 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <vector> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 4e55b6737c86..24ea4b3ebda7 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <vcl/outdev.hxx> #include "impfontmetricdata.hxx" diff --git a/vcl/inc/skia/win/font.hxx b/vcl/inc/skia/win/font.hxx index ea19535adb74..2a746dc48e37 100644 --- a/vcl/inc/skia/win/font.hxx +++ b/vcl/inc/skia/win/font.hxx @@ -10,6 +10,8 @@ #pragma once +#include <sal/config.h> + #include <win/winlayout.hxx> #include <SkTypeface.h> diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index e9839320497a..bd960f11109f 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -19,7 +19,9 @@ #pragma once +#include <sal/config.h> #include <config_options.h> + #include <tools/fontenum.hxx> #include <vcl/dllapi.h> #include <vcl/glyphitem.hxx> diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index b13945b349a6..0f18d63091a9 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <unx/glyphcache.hxx> #include <PhysicalFontFace.hxx> #include <fontinstance.hxx> diff --git a/vcl/inc/unx/freetypetextrender.hxx b/vcl/inc/unx/freetypetextrender.hxx index fd5048a8b6e3..7866f966a196 100644 --- a/vcl/inc/unx/freetypetextrender.hxx +++ b/vcl/inc/unx/freetypetextrender.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <textrender.hxx> class FreetypeFontInstance; diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index 1a3c42657d75..cc8c346b862c 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <vcl/vclenum.hxx> #include <config_cairo_canvas.h> diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index dff4235e82fe..40f2d4636e1f 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <memory> #include <freetype/config/ftheader.h> #include FT_FREETYPE_H diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 9571c634d659..af6642010546 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/Xrender.h> diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index b44fe42ca5e1..3e1cac3a5634 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <sallayout.hxx> #include <salgeom.hxx> #include <salgdi.hxx> diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx index c6460a1c92ef..57e25134a2c7 100644 --- a/vcl/inc/win/winlayout.hxx +++ b/vcl/inc/win/winlayout.hxx @@ -19,6 +19,8 @@ #pragma once +#include <sal/config.h> + #include <rtl/ustring.hxx> #include <sallayout.hxx> diff --git a/vcl/qt5/Qt5Font.cxx b/vcl/qt5/Qt5Font.cxx index 2ab614043639..83d290bb7ff1 100644 --- a/vcl/qt5/Qt5Font.cxx +++ b/vcl/qt5/Qt5Font.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <Qt5Font.hxx> #include <Qt5Tools.hxx> diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx index b42948515ac9..9e3065b70fe8 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/Qt5Graphics_Text.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <Qt5Graphics.hxx> #include <Qt5FontFace.hxx> #include <Qt5Font.hxx> diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx index 43fe07d5391a..6a6e3b10d4f3 100644 --- a/vcl/skia/osx/gdiimpl.cxx +++ b/vcl/skia/osx/gdiimpl.cxx @@ -16,6 +16,8 @@ * */ +#include <sal/config.h> + #include <skia/osx/gdiimpl.hxx> #include <skia/utils.hxx> diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx index 1dacc71bdf3d..d65ad2a1b3f5 100644 --- a/vcl/skia/win/gdiimpl.cxx +++ b/vcl/skia/win/gdiimpl.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <sal/config.h> + #include <skia/win/gdiimpl.hxx> #include <win/saldata.hxx> diff --git a/vcl/skia/x11/textrender.cxx b/vcl/skia/x11/textrender.cxx index 01587233247a..9592260cdba3 100644 --- a/vcl/skia/x11/textrender.cxx +++ b/vcl/skia/x11/textrender.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <skia/x11/textrender.hxx> #include <unx/fc_fontoptions.hxx> diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx index 48e4c291c350..6b084b12125e 100644 --- a/vcl/source/font/fontinstance.cxx +++ b/vcl/source/font/fontinstance.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <hb-ot.h> #include <hb-graphite2.h> diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index fbfacdee6b02..871bac2bf0f3 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <sal/log.hxx> #include <unotools/configmgr.hxx> #include <o3tl/temporary.hxx> diff --git a/vcl/source/gdi/pdfbuildin_fonts.cxx b/vcl/source/gdi/pdfbuildin_fonts.cxx index a821b7cb253c..ab747d024c80 100644 --- a/vcl/source/gdi/pdfbuildin_fonts.cxx +++ b/vcl/source/gdi/pdfbuildin_fonts.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <rtl/strbuf.hxx> #include <pdf/pdfbuildin_fonts.hxx> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 8d650d993565..858f73f9d057 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <config_crypto.h> #include <sal/types.h> diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 403779382afc..9a327dd5312f 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <memory> #include <config_features.h> #include <sal/log.hxx> diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 45d59517b79a..1ee3dfa46591 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <iostream> #include <iomanip> diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 9ae5004d5256..527cea29b627 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -24,6 +24,8 @@ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif +#include <sal/config.h> + #include <memory> #include <string_view> diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx index 7e71a96c35e9..6a363fd79f53 100644 --- a/vcl/unx/generic/fontmanager/fontsubst.cxx +++ b/vcl/unx/generic/fontmanager/fontsubst.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <unx/geninst.h> #include <outdev.h> #include <unx/fontmanager.hxx> diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 4828a49a967a..bcb78b08804d 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <unx/cairotextrender.hxx> #include <unx/fc_fontoptions.hxx> diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx index d744dc28effc..36618829279c 100644 --- a/vcl/unx/generic/gdi/font.cxx +++ b/vcl/unx/generic/gdi/font.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <vcl/sysdata.hxx> #include <vcl/fontcharmap.hxx> diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx index b32b34c2051a..9f66c5f5f536 100644 --- a/vcl/unx/generic/gdi/freetypetextrender.cxx +++ b/vcl/unx/generic/gdi/freetypetextrender.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <unx/freetypetextrender.hxx> #include <unotools/configmgr.hxx> diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx index f5f6116f4494..20bfca32488d 100644 --- a/vcl/unx/generic/glyphs/glyphcache.cxx +++ b/vcl/unx/generic/glyphs/glyphcache.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include <stdlib.h> #include <unx/freetype_glyphcache.hxx> #include <unx/gendata.hxx> diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 9c82ba88a279..9633de9d4cca 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -18,6 +18,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <config_features.h> #include <memory> |