From c8ff3059a79cc7358c68189840b5abcd5680bbe3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 28 Aug 2017 08:40:30 +0200 Subject: move all the basic errcodes to one file Change-Id: Ic3353c80ac9fdbd17f17503b1c973c9a7cef0c7f Reviewed-on: https://gerrit.libreoffice.org/41617 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basic/source/comp/token.cxx | 1 + basic/source/inc/scanner.hxx | 3 ++- basic/source/sbx/sbxbool.cxx | 1 + basic/source/sbx/sbxbyte.cxx | 1 + basic/source/sbx/sbxchar.cxx | 1 + basic/source/sbx/sbxcoll.cxx | 1 + basic/source/sbx/sbxcurr.cxx | 1 + basic/source/sbx/sbxdate.cxx | 1 + basic/source/sbx/sbxdec.cxx | 1 + basic/source/sbx/sbxexec.cxx | 1 + basic/source/sbx/sbxint.cxx | 1 + basic/source/sbx/sbxlng.cxx | 1 + basic/source/sbx/sbxobj.cxx | 1 + basic/source/sbx/sbxsng.cxx | 1 + basic/source/sbx/sbxuint.cxx | 1 + basic/source/sbx/sbxulng.cxx | 1 + include/basic/sberrors.hxx | 34 +++++++++++++++++++++++++++++++++- include/basic/sbxcore.hxx | 1 + include/basic/sbxdef.hxx | 33 --------------------------------- sc/source/ui/docshell/docsh4.cxx | 1 + sc/source/ui/view/cellsh1.cxx | 1 + sc/source/ui/view/cellsh2.cxx | 1 + sc/source/ui/view/tabvwshh.cxx | 1 + sfx2/source/doc/objserv.cxx | 1 + 24 files changed, 56 insertions(+), 35 deletions(-) diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index 44dcebcd95ee..2b8a7f6eb53c 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -20,6 +20,7 @@ #include +#include #include "sal/macros.h" #include "basiccharclass.hxx" #include "token.hxx" diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx index 15e37b25cd2e..25e038a8a1af 100644 --- a/basic/source/inc/scanner.hxx +++ b/basic/source/inc/scanner.hxx @@ -20,7 +20,8 @@ #ifndef INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX #define INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX -#include +#include +#include // The scanner is stand-alone, i. e. it can be used from everywhere. // A BASIC-instance is necessary for error messages. Without BASIC diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx index 902b1eb88e9c..cb8e0c3eba37 100644 --- a/basic/source/sbx/sbxbool.cxx +++ b/basic/source/sbx/sbxbool.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" #include "sbxres.hxx" diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx index 2cd4657eb037..423611ac9b98 100644 --- a/basic/source/sbx/sbxbyte.cxx +++ b/basic/source/sbx/sbxbyte.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" #include diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx index bad4903b6121..593c22799b5c 100644 --- a/basic/source/sbx/sbxchar.cxx +++ b/basic/source/sbx/sbxchar.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" #include diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index af752516baea..9b41cb2a18b3 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -20,6 +20,7 @@ #include #include +#include #include "sbxres.hxx" diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 70856e7b602c..ed0badced771 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -22,6 +22,7 @@ #include #include +#include #include #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index a5ce46ac6bce..bf85af3f7c80 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include "sbxconv.hxx" #include "math.h" #include diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index b0b7381a39eb..7060e3a4db35 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -20,6 +20,7 @@ #include #include +#include #include "sbxconv.hxx" #include diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index 6a1de98b28d3..b33905ba20f9 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index 8a6527614190..7edef31d48d3 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" #include diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index 9c906f631e40..0eadecb07423 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" #include diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 0a17ccdb3319..9e331905f73b 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "sbxres.hxx" diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index 582a11db7ea9..fc972379f133 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" float ImpGetSingle( const SbxValues* p ) diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index a02464dc6cf0..d093b5d4b2da 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" sal_uInt16 ImpGetUShort( const SbxValues* p ) diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index c694b50cecb6..0db10aff19d5 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -19,6 +19,7 @@ #include #include +#include #include "sbxconv.hxx" sal_uInt32 ImpGetULong( const SbxValues* p ) diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx index 8ecaaeacb549..236b6f1861c0 100644 --- a/include/basic/sberrors.hxx +++ b/include/basic/sberrors.hxx @@ -20,7 +20,39 @@ #ifndef INCLUDED_BASIC_SBERRORS_HXX #define INCLUDED_BASIC_SBERRORS_HXX -#include +#include + +// New error codes per define +#define ERRCODE_SBX_SYNTAX ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Compiler, 1) +#define ERRCODE_SBX_NOTIMP ErrCode( ErrCodeArea::Sbx, ErrCodeClass::NotSupported, 2) +#define ERRCODE_SBX_OVERFLOW ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 3) // overflow +#define ERRCODE_SBX_BOUNDS ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 4) // Invalid array index +#define ERRCODE_SBX_ZERODIV ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 5) // Division by zero +#define ERRCODE_SBX_CONVERSION ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 6) // wrong data type +#define ERRCODE_SBX_BAD_PARAMETER ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 7) // invalid Parameter +#define ERRCODE_SBX_PROC_UNDEFINED ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 8) // Sub or Func not def +#define ERRCODE_SBX_ERROR ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Unknown, 9) // generic object error +#define ERRCODE_SBX_NO_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 10) // Object var not object +#define ERRCODE_SBX_CANNOT_LOAD ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Create, 11) // Object init/load fail +#define ERRCODE_SBX_BAD_INDEX ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 12) // Invalid object index +#define ERRCODE_SBX_NO_ACTIVE_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 13) // Object not active +#define ERRCODE_SBX_BAD_PROP_VALUE ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 14) // Bad property value +#define ERRCODE_SBX_PROP_READONLY ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Read, 15) // Property is read only +#define ERRCODE_SBX_PROP_WRITEONLY ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Write, 16) // Property is write only +#define ERRCODE_SBX_INVALID_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 17) // Invalid object reference +#define ERRCODE_SBX_NO_METHOD ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 18) // Property or Method unknown +#define ERRCODE_SBX_INVALID_USAGE_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 19) // Invalid object usage +#define ERRCODE_SBX_NO_OLE ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 20) // No OLE-Object +#define ERRCODE_SBX_BAD_METHOD ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 21) // Method not supported +#define ERRCODE_SBX_OLE_ERROR ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 22) // OLE Automation Error +#define ERRCODE_SBX_BAD_ACTION ErrCode( ErrCodeArea::Sbx, ErrCodeClass::NotSupported, 23) // Action not supported +#define ERRCODE_SBX_NO_NAMED_ARGS ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 24) // No named arguments +#define ERRCODE_SBX_BAD_LOCALE ErrCode( ErrCodeArea::Sbx, ErrCodeClass::NotSupported, 25) // Locale not supported +#define ERRCODE_SBX_NAMED_NOT_FOUND ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 26) // Unknown named argument +#define ERRCODE_SBX_NOT_OPTIONAL ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 27) // Argument not optional +#define ERRCODE_SBX_WRONG_ARGS ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 28) // Invalid number of arguments +#define ERRCODE_SBX_NOT_A_COLL ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 29) // Object contains no elements +#define LAST_SBX_ERROR_ID 29UL // Mapping to ErrCode #define ERRCODE_BASIC_SYNTAX ERRCODE_SBX_SYNTAX // unspecified syntax error diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index ed6a3944c2a2..3be787bf0d7f 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -24,6 +24,7 @@ #include #include #include +#include class SvStream; diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx index 1c15a1c31968..f015b963c621 100644 --- a/include/basic/sbxdef.hxx +++ b/include/basic/sbxdef.hxx @@ -21,8 +21,6 @@ #ifndef INCLUDED_BASIC_SBXDEF_HXX #define INCLUDED_BASIC_SBXDEF_HXX - -#include #include enum class SbxClassType { // SBX-class-IDs (order is important!) @@ -123,37 +121,6 @@ enum class SbxNameType { // Type of the questioned name of a variable ShortTypes, // Name%(A%,B$) }; -// New error codes per define -#define ERRCODE_SBX_SYNTAX ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Compiler, 1) -#define ERRCODE_SBX_NOTIMP ErrCode( ErrCodeArea::Sbx, ErrCodeClass::NotSupported, 2) -#define ERRCODE_SBX_OVERFLOW ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 3) // overflow -#define ERRCODE_SBX_BOUNDS ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 4) // Invalid array index -#define ERRCODE_SBX_ZERODIV ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 5) // Division by zero -#define ERRCODE_SBX_CONVERSION ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 6) // wrong data type -#define ERRCODE_SBX_BAD_PARAMETER ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 7) // invalid Parameter -#define ERRCODE_SBX_PROC_UNDEFINED ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 8) // Sub or Func not def -#define ERRCODE_SBX_ERROR ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Unknown, 9) // generic object error -#define ERRCODE_SBX_NO_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 10) // Object var not object -#define ERRCODE_SBX_CANNOT_LOAD ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Create, 11) // Object init/load fail -#define ERRCODE_SBX_BAD_INDEX ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 12) // Invalid object index -#define ERRCODE_SBX_NO_ACTIVE_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 13) // Object not active -#define ERRCODE_SBX_BAD_PROP_VALUE ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 14) // Bad property value -#define ERRCODE_SBX_PROP_READONLY ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Read, 15) // Property is read only -#define ERRCODE_SBX_PROP_WRITEONLY ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Write, 16) // Property is write only -#define ERRCODE_SBX_INVALID_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 17) // Invalid object reference -#define ERRCODE_SBX_NO_METHOD ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 18) // Property or Method unknown -#define ERRCODE_SBX_INVALID_USAGE_OBJECT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 19) // Invalid object usage -#define ERRCODE_SBX_NO_OLE ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Access, 20) // No OLE-Object -#define ERRCODE_SBX_BAD_METHOD ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 21) // Method not supported -#define ERRCODE_SBX_OLE_ERROR ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 22) // OLE Automation Error -#define ERRCODE_SBX_BAD_ACTION ErrCode( ErrCodeArea::Sbx, ErrCodeClass::NotSupported, 23) // Action not supported -#define ERRCODE_SBX_NO_NAMED_ARGS ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 24) // No named arguments -#define ERRCODE_SBX_BAD_LOCALE ErrCode( ErrCodeArea::Sbx, ErrCodeClass::NotSupported, 25) // Locale not supported -#define ERRCODE_SBX_NAMED_NOT_FOUND ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 26) // Unknown named argument -#define ERRCODE_SBX_NOT_OPTIONAL ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 27) // Argument not optional -#define ERRCODE_SBX_WRONG_ARGS ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Sbx, 28) // Invalid number of arguments -#define ERRCODE_SBX_NOT_A_COLL ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Runtime, 29) // Object contains no elements -#define LAST_SBX_ERROR_ID 29UL // Flag-Bits: enum class SbxFlagBits { diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index a0c76fced7b1..f90bc10844d3 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -36,6 +36,7 @@ using namespace ::com::sun::star; #include #include #include +#include #include #include #include diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 17f66d918f7a..65fbe33d71b8 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -25,6 +25,7 @@ #include "scitems.hxx" #include +#include #include #include #include diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index b03cad6f1fac..47534bd04a89 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -19,6 +19,7 @@ #include +#include #include "scitems.hxx" #include #include diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 6d4bac505d39..234d5b29860f 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -19,6 +19,7 @@ #include +#include #include #include #include diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 6a5c31c43aff..8378fc925ffa 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -55,6 +55,7 @@ #include #include +#include #include #include #include -- cgit