vcl/inc/jsdialog/jsdialogbuilder.hxx | 2 +- vcl/inc/pch/precompiled_vcl.hxx | 5 +++-- vcl/source/app/salvtables.cxx | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit e2341bb8a43b9d6443a90e745b699f662550c64c Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jun 20 16:03:52 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Jun 23 12:50:33 2020 +0200 salvtables.hxx not needed outside vcl Change-Id: I7193c511ec4695b70f482aedffcfc76ee4ded4b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96775 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index 5c7f5879af27..f5d0d098cb68 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -15,7 +15,7 @@ #include <vcl/sysdata.hxx> #include <vcl/virdev.hxx> #include <vcl/builder.hxx> -#include <vcl/salvtables.hxx> +#include <salvtables.hxx> #include <vcl/button.hxx> #include <vcl/fmtfield.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index c115104f821c..fca4ccecb24b 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 2020-05-07 20:21:38 using: + Generated on 2020-06-22 16:35:24 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: @@ -53,6 +53,7 @@ #include <boost/functional/hash.hpp> #include <boost/math/special_functions/sinc.hpp> #include <boost/multi_array.hpp> +#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 @@ -261,7 +262,7 @@ #include <saltimer.hxx> #include <salusereventlist.hxx> #include <salvd.hxx> -#include <vcl/salvtables.hxx> +#include <salvtables.hxx> #include <svdata.hxx> #include <vcl/BitmapFilter.hxx> #include <vcl/BitmapTools.hxx> diff --git a/include/vcl/salvtables.hxx b/vcl/inc/salvtables.hxx similarity index 100% rename from include/vcl/salvtables.hxx rename to vcl/inc/salvtables.hxx diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index ff441c6a5b18..0f4ba0ecc2b0 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -71,7 +71,7 @@ #include <bitmaps.hlst> #include <calendar.hxx> #include <wizdlg.hxx> -#include <vcl/salvtables.hxx> +#include <salvtables.hxx> #include <boost/property_tree/ptree.hpp> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
