tools: move errcode.hxx to the vcl module
Change-Id: I17e5a033de5f0aeb0a726744f7b464cdab6e2ee3
Reviewed-on: https://gerrit.libreoffice.org/36854
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index f7a0d4d..85d7402 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -78,7 +78,7 @@
#include <svl/SfxBroadcaster.hxx>
#include <svl/zforlist.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
#include <tools/stream.hxx>
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 5e6560a..91f9d77 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -17,10 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include "sb.hrc"
#define __RSC
#include <vcl/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sb.hrc"
StringArray RID_BASIC_START
{
ItemList [ en-US ] =
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index ee16722..fdfcb75 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -22,7 +22,7 @@
#include <o3tl/any.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <svl/hint.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index f8882d06..c4cd17e 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <svl/svdde.hxx>
#include "ddectrl.hxx"
#include <basic/sberrors.hxx>
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index 2e789bd..fc8c782 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
#include "sbxres.hxx"
diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index 9d52eeb..9c4e0e0 100644
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index 478a9d5..d4df0fe 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 2f7f05a..130f51e 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -18,7 +18,7 @@
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/svapp.hxx>
#include <basic/sbx.hxx>
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 342aa0e..a5ce46a 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -20,7 +20,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <svl/zforlist.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/color.hxx>
#include <i18nlangtag/lang.h>
#include <basic/sbx.hxx>
diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index 3c17e61..e40d8dd 100644
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -19,7 +19,7 @@
#include <config_features.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
#include "runtime.hxx"
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index fa82edd3..d429ea9 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index beab314..6a1de98 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/svapp.hxx>
#include <basic/sbx.hxx>
#include <rtl/character.hxx>
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index d92a0aa..81624fe 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 73f503d..5aba02c 100644
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index b23c63f..1b46030 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -19,7 +19,7 @@
#include <config_features.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/resmgr.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 74402c5..3877fd3 100644
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index 404036d..1a448c3a 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -19,7 +19,7 @@
#include <config_features.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
#include "sbxres.hxx"
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 89cf8bb..f3546eb 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index dd79eea..6a8ac1f 100644
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 3074694..f1ec816 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -485,7 +485,7 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx
index 3f066ba..618cb6e 100644
--- a/chart2/inc/pch/precompiled_chartcore.hxx
+++ b/chart2/inc/pch/precompiled_chartcore.hxx
@@ -184,7 +184,7 @@
#include <svx/xpoly.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <tools/solar.h>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index ee57ed7..45f8e87 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -446,7 +446,7 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index f7bf18b..03b15fe 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -56,7 +56,7 @@
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/urlobj.hxx>
#include <unotools/sharedunocomponent.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 3ecc3a3..9a8eb0d 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -80,7 +80,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <functional>
#include <list>
diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx
index 0a8defe5..01a43fb 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -22,7 +22,7 @@
#include <osl/conditn.hxx>
#include <cppuhelper/implbase.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index ace0282..7386631 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -266,7 +266,7 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/gen.hxx>
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index 2b8955a..3321681 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -249,7 +249,7 @@
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/gen.hxx>
#include <tools/inetmime.hxx>
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index 2a67dc7..750542c8 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SBMETH_HXX
#define INCLUDED_BASIC_SBMETH_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <basic/sbxmeth.hxx>
#include <basic/sbdef.hxx>
#include <basic/basicdllapi.h>
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 77e3231..cfdd3f8 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -23,7 +23,7 @@
#ifndef __RSC
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <o3tl/typed_flags_set.hxx>
enum class SbxClassType { // SBX-class-IDs (order is important!)
diff --git a/include/editeng/editerr.hxx b/include/editeng/editerr.hxx
index 9e5cc9eb..f020d01 100644
--- a/include/editeng/editerr.hxx
+++ b/include/editeng/editerr.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_EDITENG_EDITERR_HXX
#define INCLUDED_EDITENG_EDITERR_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX)
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 48c3ce5..dcce24b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -39,7 +39,7 @@
#include <svx/msdffdef.hxx>
#include <tools/color.hxx>
#include <tools/colordata.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/gen.hxx>
#include <tools/ref.hxx>
#include <tools/solar.h>
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index 92a116b6..10d6784 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -23,7 +23,7 @@
#include <filter/msfilter/msfilterdllapi.h>
#include <rtl/ustring.hxx>
#include <sot/storage.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/ref.hxx>
class SfxObjectShell;
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index f44b0a1..cba04af 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <svl/poolitem.hxx>
#include <vcl/image.hxx>
#include <com/sun/star/script/XLibraryContainer.hpp>
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index b1da805..a7b7302 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <sfx2/dllapi.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/link.hxx>
#include <memory>
#include <vector>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index f2f8ed6..2e55a97 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/button.hxx>
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 654720a..3c05132 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -23,7 +23,7 @@
#include <sfx2/dllapi.h>
#include <sfx2/signaturestate.hxx>
#include <sal/types.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 54a300b..3cfe413 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -34,7 +34,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <sfx2/shell.hxx>
#include <tools/gen.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/jobset.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vcl/vclptr.hxx>
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 2365f13..5f60caf 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <sot/object.hxx>
#include <tools/stream.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <sot/storinfo.hxx>
#include <sot/sotdllapi.h>
diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index e4b5c0b..6fde591 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVTOOLS_SFXECODE_HXX
#define INCLUDED_SVTOOLS_SFXECODE_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#define ERRCODE_SFX_NOTATEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2)
#define ERRCODE_SFX_GENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3)
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index 4f02c70..7dc3347 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVTOOLS_SOERR_HXX
#define INCLUDED_SVTOOLS_SOERR_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
// error codes
#define RID_SO_ERROR_HANDLER 32000
diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx
index 09a32fa..f8c0ffa 100644
--- a/include/svx/svxerr.hxx
+++ b/include/svx/svxerr.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVX_SVXERR_HXX
#define INCLUDED_SVX_SVXERR_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
// define ----------------------------------------------------------------
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 26b2b2c..0bc3766 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -24,7 +24,7 @@
#include <tools/toolsdllapi.h>
#include <tools/lineend.hxx>
#include <tools/ref.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <rtl/string.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/tools/errcode.hxx b/include/vcl/errcode.hxx
similarity index 99%
rename from include/tools/errcode.hxx
rename to include/vcl/errcode.hxx
index 6eaef4b..22ab86f 100644
--- a/include/tools/errcode.hxx
+++ b/include/vcl/errcode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_TOOLS_ERRCODE_HXX
#define INCLUDED_TOOLS_ERRCODE_HXX
#ifndef INCLUDED_VCL_ERRCODE_HXX
#define INCLUDED_VCL_ERRCODE_HXX
#ifndef __RSC
#include <tools/solar.h>
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index 6778187..b4bd6db 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -23,7 +23,7 @@
#define INCLUDED_VCL_ERRINF_HXX
#include <rtl/ustring.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/dllapi.h>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index a5ccedd..9307d3a 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/outdev.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 9a64847..e441de4 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -514,7 +514,7 @@
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 8b3fb3c..d0878a1 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -552,7 +552,7 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx
index 69a00d6..a1f7493 100644
--- a/sc/inc/scerrors.hxx
+++ b/sc/inc/scerrors.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_INC_SCERRORS_HXX
#define INCLUDED_SC_INC_SCERRORS_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#define SCERR_NONE 0
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 8193f75..080264c7 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -26,7 +26,7 @@
#include "importfilterdata.hxx"
#include <sal/types.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
namespace com { namespace sun { namespace star {
namespace beans { struct PropertyValue; }
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 27993c6..2b9835c 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -482,7 +482,7 @@
#include <tools/date.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/fldunit.hxx>
#include <tools/gen.hxx>
#include <tools/globname.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 92fbc46..04156e6 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -487,7 +487,7 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index b453437..009bb9f 100644
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SD_INC_SDERROR_HXX
#define INCLUDED_SD_INC_SDERROR_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#define ERROR_SD_BASE (ERRCODE_AREA_SD)
#define ERROR_SD_READ_BASE (ERROR_SD_BASE | ERRCODE_CLASS_READ)
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 8db03c5..e1c590e 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SD_INC_SDXMLWRP_HXX
#define INCLUDED_SD_INC_SDXMLWRP_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include "sdfilter.hxx"
// SdXMLFilter
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index 918a956..7712bb5 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_FILEDLG_HXX
#define INCLUDED_SD_SOURCE_UI_INC_FILEDLG_HXX
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <memory>
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index df10b09..29c9e32 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -34,7 +34,7 @@
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <rtl/ref.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
using namespace com::sun::star;
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 35012f1..3d7215a 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/ucb/NameClash.hpp>
#include <rtl/ustring.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vector>
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index 91800a5..94fa516 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -37,7 +37,7 @@
#include <cppuhelper/implbase.hxx>
#include <sfx2/sfxuno.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
class SfxObjectShell;
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index 2bb9285..1d54e90 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -139,7 +139,7 @@
#include <token.hxx>
#include <tools/color.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index acab229..43808e2 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -364,7 +364,7 @@
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/fract.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 201a708..fb56189 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -381,7 +381,7 @@
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/fldunit.hxx>
#include <tools/gen.hxx>
#include <tools/globname.hxx>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 4fd868e..e8daea6 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -635,7 +635,7 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index fdd62fe..d199952 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -513,7 +513,7 @@
#include <tools/datetime.hxx>
#include <tools/datetimeutils.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/fract.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 41e348d..242d1f9 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -566,7 +566,7 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index 7fbd51c..b474070 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -364,7 +364,7 @@
#include <tools/date.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index aff4847..a496633 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_INC_SWERROR_H
#define INCLUDED_SW_INC_SWERROR_H
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#define ERROR_SW_BASE (ERRCODE_AREA_SW)
#define ERROR_SW_READ_BASE (ERROR_SW_BASE | ERRCODE_CLASS_READ)
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index b70ffbd..ef688fb 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/i18n/TextConversionOption.hpp>
#include <com/sun/star/frame/DispatchHelper.hpp>
#include <com/sun/star/style/CaseMap.hpp>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <swmodeltestbase.hxx>
#include <ndtxt.hxx>
#include <wrtsh.hxx>
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 06ec8d3..3ce1dfe 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -30,7 +30,7 @@
#include <rtl/ustring.hxx>
#include <tools/stream.hxx>
#include <tools/link.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/datetime.hxx>
namespace com
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index d4ee48a..4cd4ad3 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -35,7 +35,7 @@
#include <osl/diagnose.h>
#include <rtl/digest.h>
#include <osl/mutex.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/abstdlg.hxx>
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index d5251ca..a9f70dc 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/task/InteractionClassification.hpp>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/resary.hxx>
#include <tools/wintypes.hxx>
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index d345b24..bc24f7f 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -21,7 +21,7 @@
#define UUI_IDS_HRC
#include <svl/solar.hrc>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#define RID_KEEP_PASSWORD (RID_UUI_START + 0)
#define RID_SAVE_PASSWORD (RID_UUI_START + 1)
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx
index 068c9a3..a2dcd31 100644
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -313,7 +313,7 @@
#include <svtools/svtdllapi.h>
#include <tools/color.hxx>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx
index 23efed0..6f01d1c 100644
--- a/vbahelper/inc/pch/precompiled_vbahelper.hxx
+++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx
@@ -127,7 +127,7 @@
#include <svl/poolitem.hxx>
#include <svl/hint.hxx>
#include <svl/svldllapi.h>
#include <tools/errcode.hxx>
#include <vcl/errcode.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <tools/ref.hxx>
