From 98b47440d2f95504f6bca82d2081343bdc183cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 27 Aug 2020 16:27:32 +0100 Subject: [PATCH] remove some unused includes and update pches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I786548bef39fa711aabcff32b592b3fdc4a6f9fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101486 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- chart2/inc/pch/precompiled_chartcore.hxx | 4 +- connectivity/inc/pch/precompiled_ado.hxx | 2 +- connectivity/inc/pch/precompiled_dbtools.hxx | 3 +- cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 2 +- cppuhelper/inc/pch/precompiled_cppuhelper.hxx | 3 +- dbaccess/inc/pch/precompiled_dba.hxx | 2 +- dbaccess/inc/pch/precompiled_dbu.hxx | 5 +-- dbaccess/source/ui/control/sqledit.cxx | 3 -- .../ui/tabledesign/TableFieldDescWin.cxx | 1 - .../inc/pch/precompiled_deploymentmisc.hxx | 2 +- desktop/inc/pch/precompiled_sofficeapp.hxx | 4 +- .../inc/pch/precompiled_drawinglayer.hxx | 3 +- external/skia/inc/pch/precompiled_skia.hxx | 9 ++-- forms/source/solar/control/navtoolbar.cxx | 1 - sd/source/filter/html/htmlattr.cxx | 2 +- sfx2/inc/pch/precompiled_sfx.hxx | 6 ++- slideshow/inc/pch/precompiled_slideshow.hxx | 45 ++++++++++++++++++- sot/inc/pch/precompiled_sot.hxx | 2 +- svl/inc/pch/precompiled_svl.hxx | 2 +- svx/inc/pch/precompiled_svxcore.hxx | 3 +- sw/inc/pch/precompiled_vbaswobj.hxx | 3 +- uui/inc/pch/precompiled_uui.hxx | 3 +- .../inc/pch/precompiled_writerfilter.hxx | 5 ++- .../inc/pch/precompiled_xsec_xmlsec.hxx | 2 +- 24 files changed, 83 insertions(+), 34 deletions(-) diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx index 194a3678e2e7..b66d37067306 100644 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ b/chart2/inc/pch/precompiled_chartcore.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 2020-08-12 11:04:23 using: + Generated on 2020-08-27 16:25:53 using: ./bin/update_pch chart2 chartcore --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -188,6 +189,7 @@ #include #include #include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 06f10addb04f..821b53a60b24 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.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 2020-08-18 21:25:46 using: + Generated on 2020-08-27 17:03:22 using: ./bin/update_pch connectivity ado --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx index 8eddcad7e521..dcb2db38efbd 100644 --- a/connectivity/inc/pch/precompiled_dbtools.hxx +++ b/connectivity/inc/pch/precompiled_dbtools.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 2020-08-12 11:04:27 using: + Generated on 2020-08-27 16:25:54 using: ./bin/update_pch connectivity dbtools --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -163,6 +163,7 @@ #include #include #include +#include #include #include #include diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index 1efa0f90c396..4093507423f1 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.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 2020-08-12 11:14:42 using: + Generated on 2020-08-27 17:03:27 using: ./bin/update_pch cppcanvas cppcanvas --cutoff=11 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx index 4e0ba23d556a..13107ed06a00 100644 --- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx +++ b/cppuhelper/inc/pch/precompiled_cppuhelper.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 2020-08-12 11:04:30 using: + Generated on 2020-08-27 17:03:27 using: ./bin/update_pch cppuhelper cppuhelper --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index a21e987c78a7..1cfb9606d601 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.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 2020-08-12 11:14:45 using: + Generated on 2020-08-27 16:56:32 using: ./bin/update_pch dbaccess dba --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index b3254f54840a..cb4e4116b995 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.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 2020-08-18 21:26:00 using: + Generated on 2020-08-27 16:56:35 using: ./bin/update_pch dbaccess dbu --cutoff=12 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -71,7 +71,6 @@ #include #include #include -#include #include #include #include @@ -128,6 +127,7 @@ #include #include #include +#include #include #include #include @@ -189,7 +189,6 @@ #include #include #include -#include #include #include #include diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 9790cdab297d..60a95a8f45bb 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -43,9 +43,6 @@ #include #include #include -#include -#include -#include using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 2e87c0891e44..b85bc2e74a9d 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx index b275de325ff6..f436062a04ee 100644 --- a/desktop/inc/pch/precompiled_deploymentmisc.hxx +++ b/desktop/inc/pch/precompiled_deploymentmisc.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 2020-08-18 21:26:01 using: + Generated on 2020-08-27 16:56:36 using: ./bin/update_pch desktop deploymentmisc --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index 80c48b36c729..be42550673a3 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.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 2020-08-18 21:26:02 using: + Generated on 2020-08-27 17:03:37 using: ./bin/update_pch desktop sofficeapp --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -68,6 +69,7 @@ #include #include #include +#include #include #include #include diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index 75a26ff80bf7..ebfb3d986008 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.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 2020-08-12 11:14:50 using: + Generated on 2020-08-27 17:03:37 using: ./bin/update_pch drawinglayer drawinglayer --cutoff=4 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx index 67460c3f8013..7ed0d78c28be 100644 --- a/external/skia/inc/pch/precompiled_skia.hxx +++ b/external/skia/inc/pch/precompiled_skia.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 2020-08-25 10:25:07 using: + Generated on 2020-08-27 16:26:03 using: ./bin/update_pch external/skia skia --cutoff=1 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -72,7 +72,7 @@ #include #include #endif // PCH_LEVEL >= 2 -// PCH_LEVEL >= 3 +#if PCH_LEVEL >= 3 #include #include #include @@ -968,9 +968,10 @@ #include #include #include +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 #include #include -// PCH_LEVEL >= 4 -// PCH_LEVEL >= 5 +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 2f0147d04307..755502d6d409 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 926cabde29d2..b89ac9b6bb85 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -20,7 +20,7 @@ #include "htmlattr.hxx" #include #include -#include +#include SdHtmlAttrPreview::SdHtmlAttrPreview() { diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index c1bf5e00e2c4..d701c25c0cfe 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.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 2020-08-12 11:05:48 using: + Generated on 2020-08-27 16:26:27 using: ./bin/update_pch sfx2 sfx --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -170,6 +170,7 @@ #include #include #include +#include #include #include #include @@ -299,6 +300,7 @@ #include #include #include +#include #include #include #include @@ -449,6 +451,7 @@ #include #include #include +#include #include #include #include @@ -465,6 +468,7 @@ #include #include #include +#include #include #include #include diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index 51b09259e26b..1c9e2a56cc0b 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.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 2020-08-12 11:05:49 using: + Generated on 2020-08-27 16:26:28 using: ./bin/update_pch slideshow slideshow --cutoff=4 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -82,8 +82,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -96,6 +98,7 @@ #include #include #include +#include #include #include #include @@ -109,6 +112,7 @@ #include #include #include +#include #include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 @@ -123,6 +127,7 @@ #include #include #include +#include #include #include #include @@ -148,7 +153,10 @@ #include #include #include +#include +#include #include +#include #include #include #include @@ -176,6 +184,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -199,6 +210,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include @@ -208,12 +223,15 @@ #include #include #include +#include #include #include #include #include #include #include +#include +#include #include #include #include @@ -226,21 +244,46 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include #include +#include +#include #include +#include #include +#include #include +#include #include #include #include #include #include #include +#include #include #include +#include #include #include #include diff --git a/sot/inc/pch/precompiled_sot.hxx b/sot/inc/pch/precompiled_sot.hxx index 4ee791110a25..e9869d7091a8 100644 --- a/sot/inc/pch/precompiled_sot.hxx +++ b/sot/inc/pch/precompiled_sot.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 2020-08-18 21:27:11 using: + Generated on 2020-08-27 16:57:34 using: ./bin/update_pch sot sot --cutoff=5 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index 8ca68106a18e..eab70096cb54 100644 --- a/svl/inc/pch/precompiled_svl.hxx +++ b/svl/inc/pch/precompiled_svl.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 2020-08-18 21:27:12 using: + Generated on 2020-08-27 16:57:34 using: ./bin/update_pch svl svl --cutoff=6 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index cb8cdc67d053..38c5cb463eed 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.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 2020-08-12 11:15:33 using: + Generated on 2020-08-27 17:04:30 using: ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 8123e74b8087..4433fa4b73c5 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.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 2020-08-12 11:07:07 using: + Generated on 2020-08-27 16:26:57 using: ./bin/update_pch sw vbaswobj --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -197,6 +197,7 @@ #include #include #include +#include #include #include #include diff --git a/uui/inc/pch/precompiled_uui.hxx b/uui/inc/pch/precompiled_uui.hxx index 3af946befa96..c61d5a390513 100644 --- a/uui/inc/pch/precompiled_uui.hxx +++ b/uui/inc/pch/precompiled_uui.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 2020-08-18 21:28:27 using: + Generated on 2020-08-27 16:38:21 using: ./bin/update_pch uui uui --cutoff=4 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 748bf481264e..9009e2e393cb 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.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 2020-08-12 11:16:23 using: + Generated on 2020-08-27 16:58:29 using: ./bin/update_pch writerfilter writerfilter --cutoff=5 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -44,7 +44,10 @@ #include #include #include +#include #include +#include +#include #include #include #include diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index effd32a2e4d0..393dbcd4102b 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.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 2020-08-18 21:28:35 using: + Generated on 2020-08-27 17:05:02 using: ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: