diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:18:23 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:18:23 +0000 |
| commit | e5f48c8a3aab1aa854a86445b984b8d7134d4070 (patch) | |
| tree | 4699bdc161e353e6d65ea39fdb8ab8da122d7a92 /automation/source/testtool/cmdstrm.cxx | |
| parent | ed85f3860e28a996c550076316f944c0dc44ff76 (diff) | |
INTEGRATION: CWS sb59 (1.8.14); FILE MERGED
2006/08/16 14:46:06 sb 1.8.14.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'automation/source/testtool/cmdstrm.cxx')
| -rw-r--r-- | automation/source/testtool/cmdstrm.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx index f60365892858..d0d031cf9d55 100644 --- a/automation/source/testtool/cmdstrm.cxx +++ b/automation/source/testtool/cmdstrm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cmdstrm.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-17 00:38:17 $ + * last change: $Author: obo $ $Date: 2006-10-12 11:18:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -162,7 +162,7 @@ String CmdStream::WandleKeyEventString( String aKeys ) } } aKeys.Insert(Result,nPos1); - nPos1 += Result.Len(); + nPos1 = nPos1 + Result.Len(); } else nPos1 = aKeys.Len() + 1; @@ -222,8 +222,10 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString ) break; case SbxOBJECT: // whenever a control is passed. TabPage, MenuBar { - SbxProperty *pMember; - if ( rPar->Get( i )->ISA( SbxObject ) && ( pMember = ((SbxObject*)rPar->Get( i ))->GetDfltProperty() ) ) + SbxProperty *pMember = NULL; + if ( rPar->Get( i )->ISA( SbxObject ) ) + pMember = ((SbxObject*)rPar->Get( i ))->GetDfltProperty(); + if ( pMember != NULL ) { if ( pMember->GetType() == SbxSTRING ) { |