mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS gh11 (1.18.12); FILE MERGED

Browse Source 
2005/09/21 10:41:02 gh 1.18.12.2: RESYNC: (1.18-1.19); FILE MERGED
2005/08/04 13:40:16 gh 1.18.12.1: #i50168#problem reusing variables
This commit is contained in:
Kurt Zenker
2005-10-06 11:37:43 +00:00
parent f451508b64
commit cc886ebe3a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
automation/source/testtool/objtest.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: objtest.cxx,v $ * $RCSfile: objtest.cxx,v $
* *
* $Revision: 1.19 $ * $Revision: 1.20 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 19:32:08 $ * last change: $Author: kz $ $Date: 2005-10-06 12:37:43 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -2201,8 +2201,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
} }
if ( !IsError() ) if ( !IsError() )
{ {
SbxVariable *pMember; SbxVariable *pMember = NULL;
if ( ! (pMember = pVar->GetParent()->Find(CUniString("ID"),SbxCLASS_DONTCARE)) ) if ( !( pVar->GetParent() && (pMember = pVar->GetParent()->Find(CUniString("ID"),SbxCLASS_DONTCARE)) ) )
{ {
SetError( SbxERR_NAMED_NOT_FOUND ); SetError( SbxERR_NAMED_NOT_FOUND );
} }
@@ -2719,7 +2719,13 @@ SbxVariable* TestToolObj::Find( const String& Str, SbxClassType Type)
return NULL; return NULL;
SbxVariableRef Old = SbxObject::Find(Str, Type ); SbxVariableRef Old = SbxObject::Find(Str, Type );
if (Old && Old->GetUserData() != ID_Dispatch && Old->GetUserData() != ID_UNODispatch && Old->GetUserData() != 0 ) // do not return any objects from pControlsObjs[] or pMyVars[]
if (Old && Old->GetUserData() != ID_Dispatch
&& Old->GetUserData() != ID_UNODispatch
&& Old->GetUserData() != ID_Control
&& Old->GetUserData() != ID_StringControl
&& Old->GetUserData() != ID_ErrorDummy
&& Old->GetUserData() != 0 )
return Old; return Old;
else else
{ {
@@ -2825,7 +2831,7 @@ SbxVariable* TestToolObj::Find( const String& Str, SbxClassType Type)
String TestToolObj::GetRevision( String const &aSourceIn ) String TestToolObj::GetRevision( String const &aSourceIn )
{ {
// search $Revision: 1.19 $ // search $Revision: 1.20 $
xub_StrLen nPos; xub_StrLen nPos;
if ( ( nPos = aSourceIn.SearchAscii( "$Revision:" ) ) != STRING_NOTFOUND ) if ( ( nPos = aSourceIn.SearchAscii( "$Revision:" ) ) != STRING_NOTFOUND )
return aSourceIn.Copy( nPos+ 10, aSourceIn.SearchAscii( "$", nPos+10 ) -nPos-10); return aSourceIn.Copy( nPos+ 10, aSourceIn.SearchAscii( "$", nPos+10 ) -nPos-10);