diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-04-24 01:06:41 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-04-27 10:38:35 +0200 |
commit | f9f045e7830d184497554e0e438cc478fa990eb6 (patch) | |
tree | 97c1044537c89390fe32548ee9bf3ee0b78c9a8c /include | |
parent | 8d633023dea4e55755f651822fd7eed3dc14621b (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/basic/sbmeth.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbxdef.hxx | 2 | ||||
-rw-r--r-- | include/editeng/editerr.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/svxmsbas.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/app.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/docinsert.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/filedlghelper.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/viewsh.hxx | 2 | ||||
-rw-r--r-- | include/sot/storage.hxx | 2 | ||||
-rw-r--r-- | include/svtools/sfxecode.hxx | 2 | ||||
-rw-r--r-- | include/svtools/soerr.hxx | 2 | ||||
-rw-r--r-- | include/svx/svxerr.hxx | 2 | ||||
-rw-r--r-- | include/tools/stream.hxx | 2 | ||||
-rw-r--r-- | include/vcl/errcode.hxx (renamed from include/tools/errcode.hxx) | 4 | ||||
-rw-r--r-- | include/vcl/errinf.hxx | 2 | ||||
-rw-r--r-- | include/vcl/print.hxx | 2 |
18 files changed, 19 insertions, 19 deletions
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 2a67dc7ad592..750542c8eff3 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 77e3231a65a5..cfdd3f883b46 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 9e5cc9ebfcdd..f020d01a4855 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 48c3ce50c254..dcce24bb3644 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 92a116b601eb..10d6784675d4 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 f44b0a16894d..cba04af4a281 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 b1da8052b1db..a7b7302a795f 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 f2f8ed6356d3..2e55a9702c79 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 654720aad1a9..3c05132304bb 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 54a300b7eab7..3cfe413bcf30 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 2365f13a237c..5f60cafd3f79 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 e4b5c0b58196..6fde5916271a 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 4f02c70cfecd..7dc3347f3598 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 09a32faf3445..f8c0ffae98c5 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 26b2b2c498ba..0bc3766807fa 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 index 6eaef4b1b77e..22ab86fbf22c 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 677818701531..b4bd6db323b9 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 a5ccedd4f3e6..9307d3ac7e78 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> |