diff options
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/errcode.hxx | 157 | ||||
| -rw-r--r-- | include/vcl/graphicfilter.hxx | 14 |
2 files changed, 79 insertions, 92 deletions
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx index 9dc57efae451..5c90f286d520 100644 --- a/include/vcl/errcode.hxx +++ b/include/vcl/errcode.hxx @@ -28,7 +28,7 @@ /* 01234567012345670123456701234567 -|| || ||| || | +|| || || || | Warning || || | | || || || | Dynamic || || | @@ -58,9 +58,12 @@ Warning || || | #define ERRCODE_DYNAMIC_COUNT 31UL #define ERRCODE_DYNAMIC_MASK (31UL << ERRCODE_DYNAMIC_SHIFT) +enum class ErrCodeArea; + class SAL_WARN_UNUSED ErrCode final { public: + explicit constexpr ErrCode(ErrCodeArea nArea, sal_uInt32 value) : m_value(value | (sal_uInt32(nArea) << ERRCODE_AREA_SHIFT)) {} explicit constexpr ErrCode(sal_uInt32 value) : m_value(value) {} constexpr ErrCode() : m_value(0) {} @@ -105,14 +108,18 @@ public: return ErrCode(m_value & ~ERRCODE_DYNAMIC_MASK); } - sal_uInt16 GetRest() const { - return m_value & ERRCODE_RES_MASK; + ErrCodeArea GetArea() const { + return static_cast<ErrCodeArea>((m_value >> ERRCODE_AREA_SHIFT) & 0x01fff); } sal_uInt32 GetClass() const { return m_value & ERRCODE_CLASS_MASK; } + sal_uInt16 GetRest() const { + return m_value & ERRCODE_RES_MASK; + } + OUString toHexString() const { return "0x" + OUString::number(m_value, 16); } @@ -134,44 +141,24 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) os << sal_uInt32(err); return os; } -#define ERRCODE_AREA_IO (0 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_SV (1 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_SFX (2 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_INET (3 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_VCL (4 << ERRCODE_AREA_SHIFT) - -#define ERRCODE_AREA_SVX ( 8 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_SVX_END (( 9 << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_SO ( 9 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_SO_END ((10 << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_SBX ( 10 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_SBX_END ((11 << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_DB ( 11 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_DB_END ((12 << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_JAVA ( 12 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_JAVA_END ((13 << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_UUI ( 13 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_UUI_END ((14 << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_LIB2 ( 14 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_LIB2_END ((15 << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_CHAOS ( 15 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_CHAOS_END ((16 << ERRCODE_AREA_SHIFT) - 1) - -#define ERRCODE_AREA_APP1 (32 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_APP2 (40 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_APP3 (48 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_APP4 (56 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_APP5 (64 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_APP6 (72 << ERRCODE_AREA_SHIFT) - -#define ERRCODE_AREA_SC ERRCODE_AREA_APP1 -#define ERRCODE_AREA_SC_END (ERRCODE_AREA_APP2-1) - -#define ERRCODE_AREA_SD ERRCODE_AREA_APP2 -#define ERRCODE_AREA_SD_END (ERRCODE_AREA_APP3-1) - -#define ERRCODE_AREA_SW ERRCODE_AREA_APP4 -#define ERRCODE_AREA_SW_END (ERRCODE_AREA_APP5-1) +enum class ErrCodeArea { + Io = 0 , + Sv = 1 , + Sfx = 2 , + Inet = 3 , + Vcl = 4 , + Svx = 8 , + So = 9 , + Sbx = 10, + Db = 11, + Java = 12, + Uui = 13, + Lib2 = 14, + Chaos = 15, + Sc = 32, + Sd = 40, + Sw = 56, +}; #define ERRCODE_CLASS_NONE ( 0 << ERRCODE_CLASS_SHIFT) #define ERRCODE_CLASS_ABORT ( 1 << ERRCODE_CLASS_SHIFT) @@ -199,44 +186,44 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) #define ERRCODE_NONE ErrCode(0) -#define ERRCODE_IO_MISPLACEDCHAR ErrCode(1UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTEXISTS ErrCode(2UL | ERRCODE_CLASS_NOTEXISTS | ERRCODE_AREA_IO) -#define ERRCODE_IO_ALREADYEXISTS ErrCode(3UL | ERRCODE_CLASS_ALREADYEXISTS | ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTADIRECTORY ErrCode(4UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTAFILE ErrCode(5UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_INVALIDDEVICE ErrCode(6UL | ERRCODE_CLASS_PATH | ERRCODE_AREA_IO) -#define ERRCODE_IO_ACCESSDENIED ErrCode(7UL | ERRCODE_CLASS_ACCESS | ERRCODE_AREA_IO) -#define ERRCODE_IO_LOCKVIOLATION ErrCode(8UL | ERRCODE_CLASS_LOCKING | ERRCODE_AREA_IO) -#define ERRCODE_IO_OUTOFSPACE ErrCode(9UL | ERRCODE_CLASS_SPACE | ERRCODE_AREA_IO) -#define ERRCODE_IO_ISWILDCARD ErrCode(11UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTSUPPORTED ErrCode(12UL | ERRCODE_CLASS_NOTSUPPORTED | ERRCODE_AREA_IO) -#define ERRCODE_IO_GENERAL ErrCode(13UL | ERRCODE_CLASS_GENERAL | ERRCODE_AREA_IO) -#define ERRCODE_IO_TOOMANYOPENFILES ErrCode(14UL | ERRCODE_CLASS_SPACE | ERRCODE_AREA_IO) -#define ERRCODE_IO_CANTREAD ErrCode(15UL | ERRCODE_CLASS_READ | ERRCODE_AREA_IO) -#define ERRCODE_IO_CANTWRITE ErrCode(16UL | ERRCODE_CLASS_WRITE | ERRCODE_AREA_IO) -#define ERRCODE_IO_OUTOFMEMORY ErrCode(17UL | ERRCODE_CLASS_SPACE | ERRCODE_AREA_IO) -#define ERRCODE_IO_CANTSEEK ErrCode(18UL | ERRCODE_CLASS_GENERAL | ERRCODE_AREA_IO) -#define ERRCODE_IO_CANTTELL ErrCode(19UL | ERRCODE_CLASS_GENERAL | ERRCODE_AREA_IO) -#define ERRCODE_IO_WRONGVERSION ErrCode(20UL | ERRCODE_CLASS_VERSION | ERRCODE_AREA_IO) -#define ERRCODE_IO_WRONGFORMAT ErrCode(21UL | ERRCODE_CLASS_FORMAT | ERRCODE_AREA_IO) -#define ERRCODE_IO_INVALIDCHAR ErrCode(22UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_UNKNOWN ErrCode(23UL | ERRCODE_CLASS_UNKNOWN | ERRCODE_AREA_IO) -#define ERRCODE_IO_INVALIDACCESS ErrCode(24UL | ERRCODE_CLASS_ACCESS | ERRCODE_AREA_IO) -#define ERRCODE_IO_CANTCREATE ErrCode(25UL | ERRCODE_CLASS_CREATE | ERRCODE_AREA_IO) -#define ERRCODE_IO_INVALIDPARAMETER ErrCode(26UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_ABORT ErrCode(27UL | ERRCODE_CLASS_ABORT | ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTEXISTSPATH ErrCode(28UL | ERRCODE_CLASS_NOTEXISTS | ERRCODE_AREA_IO) -#define ERRCODE_IO_PENDING ErrCode(29UL | ERRCODE_CLASS_NOTEXISTS | ERRCODE_AREA_IO) -#define ERRCODE_IO_RECURSIVE ErrCode(30UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_NAMETOOLONG ErrCode(31UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_INVALIDLENGTH ErrCode(32UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_CURRENTDIR ErrCode(33UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTSAMEDEVICE ErrCode(34UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO) -#define ERRCODE_IO_DEVICENOTREADY ErrCode(35UL | ERRCODE_CLASS_READ | ERRCODE_AREA_IO) -#define ERRCODE_IO_BADCRC ErrCode(36UL | ERRCODE_CLASS_READ | ERRCODE_AREA_IO) -#define ERRCODE_IO_WRITEPROTECTED ErrCode(37UL | ERRCODE_CLASS_ACCESS | ERRCODE_AREA_IO) -#define ERRCODE_IO_BROKENPACKAGE ErrCode(38UL | ERRCODE_CLASS_FORMAT | ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT ErrCode(39UL | ERRCODE_CLASS_FORMAT | ERRCODE_AREA_IO) +#define ERRCODE_IO_MISPLACEDCHAR ErrCode( ErrCodeArea::Io, 1UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_NOTEXISTS ErrCode( ErrCodeArea::Io, 2UL | ERRCODE_CLASS_NOTEXISTS ) +#define ERRCODE_IO_ALREADYEXISTS ErrCode( ErrCodeArea::Io, 3UL | ERRCODE_CLASS_ALREADYEXISTS ) +#define ERRCODE_IO_NOTADIRECTORY ErrCode( ErrCodeArea::Io, 4UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_NOTAFILE ErrCode( ErrCodeArea::Io, 5UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_INVALIDDEVICE ErrCode( ErrCodeArea::Io, 6UL | ERRCODE_CLASS_PATH ) +#define ERRCODE_IO_ACCESSDENIED ErrCode( ErrCodeArea::Io, 7UL | ERRCODE_CLASS_ACCESS ) +#define ERRCODE_IO_LOCKVIOLATION ErrCode( ErrCodeArea::Io, 8UL | ERRCODE_CLASS_LOCKING ) +#define ERRCODE_IO_OUTOFSPACE ErrCode( ErrCodeArea::Io, 9UL | ERRCODE_CLASS_SPACE ) +#define ERRCODE_IO_ISWILDCARD ErrCode( ErrCodeArea::Io, 11UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_NOTSUPPORTED ErrCode( ErrCodeArea::Io, 12UL | ERRCODE_CLASS_NOTSUPPORTED ) +#define ERRCODE_IO_GENERAL ErrCode( ErrCodeArea::Io, 13UL | ERRCODE_CLASS_GENERAL ) +#define ERRCODE_IO_TOOMANYOPENFILES ErrCode( ErrCodeArea::Io, 14UL | ERRCODE_CLASS_SPACE ) +#define ERRCODE_IO_CANTREAD ErrCode( ErrCodeArea::Io, 15UL | ERRCODE_CLASS_READ ) +#define ERRCODE_IO_CANTWRITE ErrCode( ErrCodeArea::Io, 16UL | ERRCODE_CLASS_WRITE ) +#define ERRCODE_IO_OUTOFMEMORY ErrCode( ErrCodeArea::Io, 17UL | ERRCODE_CLASS_SPACE ) +#define ERRCODE_IO_CANTSEEK ErrCode( ErrCodeArea::Io, 18UL | ERRCODE_CLASS_GENERAL ) +#define ERRCODE_IO_CANTTELL ErrCode( ErrCodeArea::Io, 19UL | ERRCODE_CLASS_GENERAL ) +#define ERRCODE_IO_WRONGVERSION ErrCode( ErrCodeArea::Io, 20UL | ERRCODE_CLASS_VERSION ) +#define ERRCODE_IO_WRONGFORMAT ErrCode( ErrCodeArea::Io, 21UL | ERRCODE_CLASS_FORMAT ) +#define ERRCODE_IO_INVALIDCHAR ErrCode( ErrCodeArea::Io, 22UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_UNKNOWN ErrCode( ErrCodeArea::Io, 23UL | ERRCODE_CLASS_UNKNOWN ) +#define ERRCODE_IO_INVALIDACCESS ErrCode( ErrCodeArea::Io, 24UL | ERRCODE_CLASS_ACCESS ) +#define ERRCODE_IO_CANTCREATE ErrCode( ErrCodeArea::Io, 25UL | ERRCODE_CLASS_CREATE ) +#define ERRCODE_IO_INVALIDPARAMETER ErrCode( ErrCodeArea::Io, 26UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_ABORT ErrCode( ErrCodeArea::Io, 27UL | ERRCODE_CLASS_ABORT ) +#define ERRCODE_IO_NOTEXISTSPATH ErrCode( ErrCodeArea::Io, 28UL | ERRCODE_CLASS_NOTEXISTS ) +#define ERRCODE_IO_PENDING ErrCode( ErrCodeArea::Io, 29UL | ERRCODE_CLASS_NOTEXISTS ) +#define ERRCODE_IO_RECURSIVE ErrCode( ErrCodeArea::Io, 30UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_NAMETOOLONG ErrCode( ErrCodeArea::Io, 31UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_INVALIDLENGTH ErrCode( ErrCodeArea::Io, 32UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_CURRENTDIR ErrCode( ErrCodeArea::Io, 33UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_NOTSAMEDEVICE ErrCode( ErrCodeArea::Io, 34UL | ERRCODE_CLASS_PARAMETER ) +#define ERRCODE_IO_DEVICENOTREADY ErrCode( ErrCodeArea::Io, 35UL | ERRCODE_CLASS_READ ) +#define ERRCODE_IO_BADCRC ErrCode( ErrCodeArea::Io, 36UL | ERRCODE_CLASS_READ ) +#define ERRCODE_IO_WRITEPROTECTED ErrCode( ErrCodeArea::Io, 37UL | ERRCODE_CLASS_ACCESS ) +#define ERRCODE_IO_BROKENPACKAGE ErrCode( ErrCodeArea::Io, 38UL | ERRCODE_CLASS_FORMAT ) +#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT ErrCode( ErrCodeArea::Io, 39UL | ERRCODE_CLASS_FORMAT ) // StreamErrorCodes @@ -270,12 +257,12 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) #define ERRCODE_ABORT ERRCODE_IO_ABORT -#define ERRCODE_INET_NAME_RESOLVE ErrCode(ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 1) -#define ERRCODE_INET_CONNECT ErrCode(ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 2) -#define ERRCODE_INET_READ ErrCode(ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 3) -#define ERRCODE_INET_WRITE ErrCode(ERRCODE_AREA_INET | ERRCODE_CLASS_WRITE| 4) -#define ERRCODE_INET_GENERAL ErrCode(ERRCODE_AREA_INET | ERRCODE_CLASS_WRITE| 5) -#define ERRCODE_INET_OFFLINE ErrCode(ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 6) +#define ERRCODE_INET_NAME_RESOLVE ErrCode(ErrCodeArea::Inet, ERRCODE_CLASS_READ | 1) +#define ERRCODE_INET_CONNECT ErrCode(ErrCodeArea::Inet, ERRCODE_CLASS_READ | 2) +#define ERRCODE_INET_READ ErrCode(ErrCodeArea::Inet, ERRCODE_CLASS_READ | 3) +#define ERRCODE_INET_WRITE ErrCode(ErrCodeArea::Inet, ERRCODE_CLASS_WRITE| 4) +#define ERRCODE_INET_GENERAL ErrCode(ErrCodeArea::Inet, ERRCODE_CLASS_WRITE| 5) +#define ERRCODE_INET_OFFLINE ErrCode(ErrCodeArea::Inet, ERRCODE_CLASS_READ | 6) #endif diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index e41583f899f8..62ed0745a3d9 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -36,13 +36,13 @@ class SvStream; struct WmfExternal; struct ConvertData; -#define ERRCODE_GRFILTER_OPENERROR ErrCode(ERRCODE_AREA_VCL | ERRCODE_CLASS_GENERAL | 1) -#define ERRCODE_GRFILTER_IOERROR ErrCode(ERRCODE_AREA_VCL | ERRCODE_CLASS_GENERAL | 2) -#define ERRCODE_GRFILTER_FORMATERROR ErrCode(ERRCODE_AREA_VCL | ERRCODE_CLASS_GENERAL | 3) -#define ERRCODE_GRFILTER_VERSIONERROR ErrCode(ERRCODE_AREA_VCL | ERRCODE_CLASS_GENERAL | 4) -#define ERRCODE_GRFILTER_FILTERERROR ErrCode(ERRCODE_AREA_VCL | ERRCODE_CLASS_GENERAL | 5) -#define ERRCODE_GRFILTER_ABORT ErrCode(ERRCODE_AREA_VCL | ERRCODE_CLASS_GENERAL | 6) -#define ERRCODE_GRFILTER_TOOBIG ErrCode(ERRCODE_AREA_VCL | ERRCODE_CLASS_GENERAL | 7) +#define ERRCODE_GRFILTER_OPENERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 1) +#define ERRCODE_GRFILTER_IOERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 2) +#define ERRCODE_GRFILTER_FORMATERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 3) +#define ERRCODE_GRFILTER_VERSIONERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 4) +#define ERRCODE_GRFILTER_FILTERERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 5) +#define ERRCODE_GRFILTER_ABORT ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 6) +#define ERRCODE_GRFILTER_TOOBIG ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 7) #define GRFILTER_OUTHINT_GREY 1 |