diff options
33 files changed, 45 insertions, 42 deletions
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index fd794b6b9894..8fc3e989a5cd 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.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:15 using: + Generated on 2020-09-01 15:29:27 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 10a28afc626c..56fe32010939 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/toolkit/vclmedit.hxx> #include <vcl/textdata.hxx> #include <vcl/txtattr.hxx> diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 821b53a60b24..fc58921859a0 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-27 17:03:22 using: + Generated on 2020-09-01 15:29:31 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/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index 4093507423f1..1f2059c2dd20 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-27 17:03:27 using: + Generated on 2020-09-01 15:29:33 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: @@ -61,6 +61,7 @@ #include <rtl/stringutils.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> +#include <rtl/ustrbuf.h> #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/config.h> diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx index 13107ed06a00..7823aaaa80c1 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-27 17:03:27 using: + Generated on 2020-09-01 15:29:33 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,6 +48,7 @@ #include <rtl/malformeduriexception.hxx> #include <rtl/random.h> #include <rtl/ref.hxx> +#include <rtl/textcvt.h> #include <rtl/unload.h> #include <rtl/uri.h> #include <rtl/uri.hxx> diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index 1cfb9606d601..70cdf5357945 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-27 16:56:32 using: + Generated on 2020-09-01 15:29:35 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: @@ -68,7 +68,6 @@ #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> -#include <rtl/strbuf.h> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx index f436062a04ee..e1932a58525c 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-27 16:56:36 using: + Generated on 2020-09-01 15:29:37 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: @@ -33,6 +33,7 @@ #if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> +#include <osl/file.h> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/pipe.hxx> diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index be42550673a3..020e2fb67a17 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-27 17:03:37 using: + Generated on 2020-09-01 15:29:38 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,7 +52,6 @@ #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> -#include <osl/file.h> #include <osl/file.hxx> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> @@ -69,7 +68,6 @@ #include <rtl/byteseq.hxx> #include <rtl/digest.h> #include <rtl/instance.hxx> -#include <rtl/locale.h> #include <rtl/math.h> #include <rtl/process.h> #include <rtl/ref.hxx> diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index ebfb3d986008..fa353e5b6d79 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-27 17:03:37 using: + Generated on 2020-09-01 15:29:38 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,7 +43,6 @@ #include <rtl/instance.hxx> #include <rtl/math.hxx> #include <rtl/ref.hxx> -#include <rtl/strbuf.h> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx index fe322fc2e188..172963beb33b 100644 --- a/include/vcl/toolkit/combobox.hxx +++ b/include/vcl/toolkit/combobox.hxx @@ -26,7 +26,7 @@ #include <memory> #include <vcl/dllapi.h> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #define COMBOBOX_APPEND (SAL_MAX_INT32) #define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32) diff --git a/include/vcl/edit.hxx b/include/vcl/toolkit/edit.hxx index ea34e5714e7b..c2a6f305fb2a 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/toolkit/edit.hxx @@ -17,8 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_EDIT_HXX -#define INCLUDED_VCL_EDIT_HXX +#pragma once + +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif #include <vcl/ctrl.hxx> #include <vcl/textfilter.hxx> @@ -240,6 +243,4 @@ public: bool IsPassword() const { return mbPassword; } }; -#endif // INCLUDED_VCL_EDIT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx index 9383f6103b9a..f3ce68b71444 100644 --- a/include/vcl/toolkit/fixed.hxx +++ b/include/vcl/toolkit/fixed.hxx @@ -23,7 +23,7 @@ #endif #include <vcl/dllapi.h> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/fixed.hxx> class SelectableFixedText final : public Edit diff --git a/include/vcl/toolkit/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx index 5eca1f13fbbe..2c81bd6140e8 100644 --- a/include/vcl/toolkit/spinfld.hxx +++ b/include/vcl/toolkit/spinfld.hxx @@ -24,7 +24,7 @@ #endif #include <vcl/dllapi.h> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/timer.hxx> class VCL_DLLPUBLIC SpinField : public Edit diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx index 63bd58e35a95..8a0088ab156d 100644 --- a/include/vcl/toolkit/vclmedit.hxx +++ b/include/vcl/toolkit/vclmedit.hxx @@ -25,7 +25,7 @@ #include <tools/lineend.hxx> #include <tools/wintypes.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/dllapi.h> #include <vcl/timer.hxx> #include <memory> diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index caa5c44cf1bd..1d44a0b048c7 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.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:42 using: + Generated on 2020-09-01 15:30:21 using: ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -68,6 +68,7 @@ #include <rtl/tencinfo.h> #include <rtl/textenc.h> #include <rtl/ustrbuf.hxx> +#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/config.h> #include <sal/log.hxx> diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index d075bc227e66..970a45ca64e6 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7316,7 +7316,6 @@ include/vcl/dllapi.h include/vcl/dndhelp.hxx include/vcl/dockingarea.hxx include/vcl/dockwin.hxx -include/vcl/edit.hxx include/vcl/embeddedfontshelper.hxx include/vcl/errcode.hxx include/vcl/errinf.hxx @@ -7419,6 +7418,7 @@ include/vcl/toolkit/calendar.hxx include/vcl/toolkit/combobox.hxx include/vcl/toolkit/controllayout.hxx include/vcl/toolkit/dialog.hxx +include/vcl/toolkit/edit.hxx include/vcl/toolkit/field.hxx include/vcl/toolkit/fixed.hxx include/vcl/toolkit/fixedhyper.hxx diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index 5998ec45322c..761fcd7557a3 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.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:50 using: + Generated on 2020-09-01 15:30:30 using: ./bin/update_pch starmath sm --cutoff=5 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -67,6 +67,7 @@ #include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/errcode.hxx> +#include <vcl/event.hxx> #include <vcl/font.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index d9ee9a599c39..f59f4d714e5b 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.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:06:39 using: + Generated on 2020-09-01 15:31:17 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -113,6 +113,8 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/transfer.hxx> +#include <vcl/uitest/eventdescription.hxx> +#include <vcl/uitest/logger.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclptr.hxx> #include <vcl/virdev.hxx> @@ -276,7 +278,6 @@ #include <libxml/xmlwriter.h> #include <o3tl/any.hxx> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/deleter.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index b70a0dbb9bfc..e1ba158f6930 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -31,7 +31,7 @@ #include <vcl/toolkit/dialog.hxx> #include <vcl/vclevent.hxx> #include <vcl/window.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/settings.hxx> #include <tools/debug.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 81fc7d618e19..32b248286a85 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -88,7 +88,7 @@ #include <vcl/toolkit/dialog.hxx> #include <vcl/dockingarea.hxx> #include <vcl/dockwin.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/event.hxx> #include <vcl/toolkit/field.hxx> #include <vcl/toolkit/fixed.hxx> diff --git a/toolkit/source/controls/filectrl.cxx b/toolkit/source/controls/filectrl.cxx index 9f6dce0accc8..cebbd9371818 100644 --- a/toolkit/source/controls/filectrl.cxx +++ b/toolkit/source/controls/filectrl.cxx @@ -27,7 +27,7 @@ #include <svl/svlresid.hxx> #include <svl/svl.hrc> #include <tools/urlobj.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 29f9379fe5b3..4b1fba1b790a 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-08-18 15:54:52 using: + Generated on 2020-09-01 15:31:50 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: @@ -284,7 +284,6 @@ #include <vcl/dibtools.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> -#include <vcl/edit.hxx> #include <vcl/event.hxx> #include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> @@ -317,6 +316,7 @@ #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/combobox.hxx> #include <vcl/toolkit/dialog.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/toolkit/fixed.hxx> #include <vcl/toolkit/lstbox.hxx> #include <vcl/toolkit/spinfld.hxx> diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 654a704931e8..46bf66caf79a 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -14,7 +14,7 @@ #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <vcl/ctrl.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/formatter.hxx> #include <vcl/toolkit/spinfld.hxx> #include <vcl/toolkit/fixed.hxx> diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index 6ab9d30625b1..f77df28af70f 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -10,7 +10,7 @@ #include <test/bootstrapfixture.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/combobox.hxx> #include <vcl/toolkit/dialog.hxx> diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 531315a09233..bc173254efbf 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -29,7 +29,7 @@ #include <vcl/toolkit/fixed.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/salnativewidgets.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/layout.hxx> #include <vcl/stdtext.hxx> #include <vcl/uitest/uiobject.hxx> diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index c8087261ebd2..a2e3c497e5c7 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -21,7 +21,7 @@ #include <vcl/event.hxx> #include <vcl/cursor.hxx> #include <vcl/menu.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/weld.hxx> #include <vcl/specialchars.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index e1cd87a682b6..907c7cfcd238 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -30,7 +30,7 @@ #include <svl/ctloptions.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/virdev.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index f468acd984d7..0d3cec607b20 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -54,7 +54,7 @@ #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> #include <com/sun/star/util/SearchFlags.hpp> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <sot/exchange.hxx> diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index bb7baa0dced1..b59a4b0a9131 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -29,7 +29,7 @@ #include <vcl/svapp.hxx> #include <vcl/accel.hxx> #include <vcl/builder.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/uitest/uiobject.hxx> diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index d206bd4e1124..8e3097d7d702 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -24,8 +24,8 @@ #include <vcl/toolkit/ivctrl.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/dialog.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/toolkit/field.hxx> -#include <vcl/edit.hxx> #include <vcl/menubtn.hxx> #include <vcl/toolkit/vclmedit.hxx> #include <vcl/uitest/logger.hxx> diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index e59f2581747a..a3a72d323bd2 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -29,7 +29,7 @@ #include <vcl/dockwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/help.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/settings.hxx> #include <vcl/toolbox.hxx> #include <vcl/ptrstyle.hxx> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 03f686f0a664..d54ec1b477a3 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -24,7 +24,7 @@ #include <vcl/builder.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/dialog.hxx> -#include <vcl/edit.hxx> +#include <vcl/toolkit/edit.hxx> #include <vcl/toolkit/field.hxx> #include <vcl/fieldvalues.hxx> #include <vcl/toolkit/fmtfield.hxx> diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 393dbcd4102b..96293690755f 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-27 17:05:02 using: + Generated on 2020-09-01 15:31:54 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: |