summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 20:19:23 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 20:19:23 +0000
commitb7e659e4410c1173c2d4e9ab2889786d22d1f2a4 (patch)
tree8c1e067506f3f6220fb94e888510512c75983861 /svtools
parentb9737cf002c0976e1fdbb0349ad5333019251b3a (diff)
INTEGRATION: CWS warnings01 (1.3.58); FILE MERGED
2006/04/07 19:14:13 sb 1.3.58.2: RESYNC: (1.3-1.4); FILE MERGED 2005/11/15 19:25:40 pl 1.3.58.1: #i55991# removed warnings
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/misc/ehdl.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 05bee765fddd..9ffb2f57ff66 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ehdl.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-03-27 09:02:49 $
+ * last change: $Author: hr $ $Date: 2006-06-19 21:19:23 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -436,8 +436,8 @@ BOOL SfxErrorHandler::GetErrorString(
//-------------------------------------------------------------------------
SfxErrorContext::SfxErrorContext(
- USHORT nCtxIdP, Window *pWin, USHORT nResIdP, ResMgr *pMgrP)
-: ErrorContext(pWin), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP)
+ USHORT nCtxIdP, Window *pWindow, USHORT nResIdP, ResMgr *pMgrP)
+: ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP)
{
if( nResId==USHRT_MAX )
nResId=RID_ERRCTX;
@@ -446,9 +446,9 @@ SfxErrorContext::SfxErrorContext(
//-------------------------------------------------------------------------
SfxErrorContext::SfxErrorContext(
- USHORT nCtxIdP, const String &aArg1P, Window *pWin,
+ USHORT nCtxIdP, const String &aArg1P, Window *pWindow,
USHORT nResIdP, ResMgr *pMgrP)
-: ErrorContext(pWin), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP),
+: ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP),
aArg1(aArg1P)
{
if( nResId==USHRT_MAX )