From 4dd6af856d574ad66ebb4b822a36ba70af9945e2 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Fri, 3 Sep 2021 02:19:33 +1000 Subject: vcl: rename OutDevState to Stack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I have moved the header file to include/vcl/rendercontext as this will eventually be part of the RenderContext split from OutputDevice. State and associated enums have also been moved to the vcl namespace. I have also moved ComplexTextLayoutFlags into the vcl::text namespace. Change-Id: I0abbf560e75b45a272854b267e948c240cd69091 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- oox/inc/pch/precompiled_oox.hxx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'oox') diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 660545e19dfe..691c0fc5c226 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.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 2021-05-14 22:15:59 using: + Generated on 2021-09-28 05:37:38 using: ./bin/update_pch oox oox --cutoff=6 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -36,13 +36,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include @@ -76,9 +76,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -90,7 +90,6 @@ #include #include #include -#include #include #include #include @@ -101,7 +100,10 @@ #include #include #include +#include #include +#include +#include #include #include #include @@ -122,9 +124,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -198,6 +202,7 @@ #include #include #include +#include #include #include #include @@ -226,6 +231,8 @@ #include #include #include +#include +#include #include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 @@ -242,10 +249,11 @@ #include #include #include +#include #include -#include #include #include +#include #include #include #include @@ -263,7 +271,6 @@ #include #include #include -#include #include #include #include -- cgit