From c6350b36860f3a3681722640b09f221489803e02 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 14 Mar 2019 13:17:30 +0100 Subject: regenerate PCH headers for the 4 new levels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plus some build fixes triggered by this. Change-Id: I59b21def706598ceffd45ae5b1f0262ec9c1ad50 Reviewed-on: https://gerrit.libreoffice.org/71581 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- .../inc/pch/precompiled_PresentationMinimizer.hxx | 133 ++++++++++++++++++--- sdext/inc/pch/precompiled_PresenterScreen.hxx | 29 ++--- sdext/source/minimizer/optimizerdialogcontrols.cxx | 2 +- 3 files changed, 132 insertions(+), 32 deletions(-) (limited to 'sdext') diff --git a/sdext/inc/pch/precompiled_PresentationMinimizer.hxx b/sdext/inc/pch/precompiled_PresentationMinimizer.hxx index 01a0f609b7a7..e2fb9539e135 100644 --- a/sdext/inc/pch/precompiled_PresentationMinimizer.hxx +++ b/sdext/inc/pch/precompiled_PresentationMinimizer.hxx @@ -13,34 +13,43 @@ 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 2017-09-20 22:53:55 using: + Generated on 2019-04-29 21:18:57 using: ./bin/update_pch sdext PresentationMinimizer --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./sdext/inc/pch/precompiled_PresentationMinimizer.hxx "make sdext.build" --find-conflicts */ +#if PCH_LEVEL >= 1 #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 +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 #include +#include #include #include #include @@ -49,8 +58,11 @@ #include #include #include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -64,14 +76,82 @@ #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 +#include +#include +#include +#include +#include +#include +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#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 @@ -81,13 +161,11 @@ #include #include #include +#include #include #include -#include -#include #include #include -#include #include #include #include @@ -99,24 +177,51 @@ #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 +#include +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/inc/pch/precompiled_PresenterScreen.hxx b/sdext/inc/pch/precompiled_PresenterScreen.hxx index 6c6e3ba95cf7..6d22aa8bb095 100644 --- a/sdext/inc/pch/precompiled_PresenterScreen.hxx +++ b/sdext/inc/pch/precompiled_PresenterScreen.hxx @@ -13,34 +13,32 @@ 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 2017-09-20 22:53:56 using: + Generated on 2019-04-29 21:18:57 using: ./bin/update_pch sdext PresenterScreen --cutoff=2 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./sdext/inc/pch/precompiled_PresenterScreen.hxx "make sdext.build" --find-conflicts */ +#if PCH_LEVEL >= 1 #include #include -#include #include -#include -#include -#include #include #include +#include #include #include #include #include +#include #include -#include #include -#include #include -#include #include #include +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 #include #include #include @@ -64,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -72,6 +69,8 @@ #include #include #include +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 #include #include #include @@ -106,12 +105,9 @@ #include #include #include -#include -#include #include #include #include -#include #include #include #include @@ -125,15 +121,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include #include #include #include @@ -149,13 +142,15 @@ #include #include #include -#include -#include +#include #include #include #include #include #include #include +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 4bc97cc51a2e..6d237ddbfb48 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -49,7 +49,7 @@ static void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl FontDescriptor aFontDescriptor; if ( rOptimizerDialog.getControlProperty( rControl, "FontDescriptor" ) >>= aFontDescriptor ) { - aFontDescriptor.Weight = FontWeight::BOLD; + aFontDescriptor.Weight = com::sun::star::awt::FontWeight::BOLD; rOptimizerDialog.setControlProperty( rControl, "FontDescriptor", Any( aFontDescriptor ) ); } } -- cgit