diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:49:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:49:08 +0000 |
| commit | 3376cfc517667703acf77e6aa2620eeb2d4b23a8 (patch) | |
| tree | f62f3e7bd7a03630fb9b95c8932f0a69a74381c4 /tools | |
| parent | 9e32ccdaea25ffe5a4abb7eae44c7dc9d16024a0 (diff) | |
INTEGRATION: CWS warnings01 (1.2.6); FILE MERGED
2006/01/25 17:59:00 sb 1.2.6.3: RESYNC: (1.2-1.3); FILE MERGED
2005/11/10 11:20:41 pl 1.2.6.2: #i53898# removed warnings
2005/10/27 12:29:13 sb 1.2.6.1: #i53898# Made code warning-free.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/ref/errinf.cxx | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 7622ab9db50c..fe4c32fa9100 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -4,9 +4,9 @@ * * $RCSfile: errinf.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-11-11 12:15:49 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,13 +41,19 @@ class ErrorHandler; +namespace { + +typedef void (* DisplayFnPtr)(); + +} + struct EDcrData { public: ErrorHandler *pFirstHdl; ErrorContext *pFirstCtx; - void *pDsp; + DisplayFnPtr pDsp; BOOL bIsWindowDsp; @@ -186,15 +192,15 @@ USHORT DynamicErrorInfo::GetDialogMask() const StandardErrorInfo::StandardErrorInfo( - ULONG lUserId, ULONG lArgExtId, USHORT nFlags) -: DynamicErrorInfo(lUserId, nFlags), lExtId(lArgExtId) + ULONG UserId, ULONG lArgExtId, USHORT nFlags) +: DynamicErrorInfo(UserId, nFlags), lExtId(lArgExtId) { } StringErrorInfo::StringErrorInfo( - ULONG lUserId, const String& aStringP, USHORT nFlags) -: DynamicErrorInfo(lUserId, nFlags), aString(aStringP) + ULONG UserId, const String& aStringP, USHORT nFlags) +: DynamicErrorInfo(UserId, nFlags), aString(aStringP) { } @@ -267,14 +273,14 @@ void ErrorHandler::RegisterDisplay(WindowDisplayErrorFunc *aDsp) { EDcrData *pData=EDcrData::GetData(); pData->bIsWindowDsp=TRUE; - pData->pDsp=(void*)aDsp; + pData->pDsp = reinterpret_cast< DisplayFnPtr >(aDsp); } void ErrorHandler::RegisterDisplay(BasicDisplayErrorFunc *aDsp) { EDcrData *pData=EDcrData::GetData(); pData->bIsWindowDsp=FALSE; - pData->pDsp=(void*)aDsp; + pData->pDsp = reinterpret_cast< DisplayFnPtr >(aDsp); } USHORT ErrorHandler::HandleError(ULONG lId, USHORT nFlags) |