diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:21:11 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-03 16:21:11 +0000 |
| commit | db0303f88e85f2e4afcbcb6020a4834ca2f397c0 (patch) | |
| tree | 22e53818b1e93d1bbbc9310d7ff294ce54c02e58 /rsc/inc | |
| parent | 2d83432828f54f4ea6cdfc78454b145ef9d03983 (diff) | |
INTEGRATION: CWS res32bit (1.5.26); FILE MERGED
2004/10/27 17:50:53 pl 1.5.26.2: minor updates
2004/10/22 13:54:24 pl 1.5.26.1: #i34513# free rsc of 32 bit constraints
Diffstat (limited to 'rsc/inc')
| -rw-r--r-- | rsc/inc/rscerror.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 7330dbeacccb..3c7324638842 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -2,9 +2,9 @@ * * $RCSfile: rscerror.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-05-21 13:58:44 $ + * last change: $Author: obo $ $Date: 2005-01-03 17:21:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ /****************** D E F I N I T I O N S ********************************/ /******************* R e t u r n E r r o r s *******************/ -#define ERR_OK 0xFFFF +#define ERR_OK 0xFFFFFFFF #define ERR_ERROR 0x0100 #define ERR_UNKNOWN_METHOD 0x0101 // Return @@ -132,13 +132,13 @@ #define ERR_WARNINGEND 0x2000 class ERRTYPE { - USHORT nError; + sal_uInt32 nError; public: ERRTYPE() { nError = ERR_OK; } - ERRTYPE( USHORT nErr ) { nError = nErr; } + ERRTYPE( sal_uInt32 nErr ) { nError = nErr; } ERRTYPE( const ERRTYPE & rErr ) { nError = rErr.nError; }; ERRTYPE& operator = ( const ERRTYPE & rError ); - operator USHORT() const { return( nError ); } + operator sal_uInt32() const { return( nError ); } BOOL IsError() const { return( nError <= ERR_ERROREND ); } BOOL IsOk() const { return( !IsError() ); } BOOL IsWarning() const { @@ -161,7 +161,7 @@ class RscError void ErrorFormat( const ERRTYPE& rError, RscTop * pClass, const RscId & aId ); public: - USHORT nErrors;// Anzahl der Fehler + sal_uInt32 nErrors;// Anzahl der Fehler RscError(){ fListing = NULL; nErrors = 0; |