diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:27:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:27:23 +0000 |
| commit | 8416c0aadfd29f72e0d8a3de591df443a0c08adc (patch) | |
| tree | ef824be3bede221eec8132ad3a611c2b9325d692 | |
| parent | f100f8e1daf8e419245e42f9c28daa2a67fb490d (diff) | |
INTEGRATION: CWS warnings01 (1.12.6); FILE MERGED
2006/05/23 23:25:22 sb 1.12.6.3: RESYNC: (1.12-1.13); FILE MERGED
2006/03/02 08:08:45 gh 1.12.6.2: removing warnings for linux and solarisSparc and some windows
2006/02/02 09:20:04 gh 1.12.6.1: removed compiler warnings
| -rw-r--r-- | automation/source/testtool/objtest.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index 1c3a98186..a7efab58d 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -4,9 +4,9 @@ * * $RCSfile: objtest.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2006-04-19 14:16:11 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:27:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -239,7 +239,7 @@ SV_DECL_IMPL_REF(SbxTransportMethod); class Controls: public SbxObject { public: - Controls( String aName ); + Controls( String aCName ); ~Controls(); void ChangeListener( SbxObject* pParent ); @@ -335,10 +335,11 @@ public: pLogMsg->aDebugData.nCol2 = nCol2p; \ pLogMsg->aDebugData.aLogType = aLogTypep; \ aLogHdl.Call( pLogMsg ); \ - if( pLogList ) \ + void* pDummyForWarningAboutNULL = pLogList; \ + if( pDummyForWarningAboutNULL ) \ { \ SbxDimArray* pLogArray = (SbxDimArray*)pLogList; \ - SbxVariable* pVar = new SbxVariable( SbxSTRING ); \ + SbxVariable* pLogLine = new SbxVariable( SbxSTRING ); \ String aCollect; \ aCollect.Append( pLogMsg->aDebugData.aFilename ); \ aCollect.AppendAscii( ";" ); \ @@ -347,8 +348,8 @@ public: aCollect.Append( aRevisionp ); \ aCollect.AppendAscii( ";" ); \ aCollect.Append( pLogMsg->aDebugData.aMsg ); \ - pVar->PutString( aCollect ); \ - pLogArray->Insert( pVar, pLogArray->Count() ); \ + pLogLine->PutString( aCollect ); \ + pLogArray->Insert( pLogLine, pLogArray->Count() ); \ } \ delete pLogMsg; \ } \ |