Kaydet (Commit) 17db270c authored tarafından Andreas Bregas's avatar Andreas Bregas

#95159# Changed XExactName handling to enable full qualified method names

üst 7f4a4e91
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: sbunoobj.cxx,v $ * $RCSfile: sbunoobj.cxx,v $
* *
* $Revision: 1.21 $ * $Revision: 1.22 $
* *
* last change: $Author: ab $ $Date: 2002-08-12 08:59:55 $ * last change: $Author: ab $ $Date: 2002-08-29 10:49:59 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -1735,10 +1735,12 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t ) ...@@ -1735,10 +1735,12 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t )
{ {
OUString aUName( rName ); OUString aUName( rName );
if( mxExactName.is() ) if( mxExactName.is() )
aUName = mxExactName->getExactName( aUName );
if( mxUnoAccess.is() )
{ {
if( aUName.getLength() ) OUString aUExactName = mxExactName->getExactName( aUName );
if( aUExactName.getLength() )
aUName = aUExactName;
}
if( mxUnoAccess.is() )
{ {
if( mxUnoAccess->hasProperty( aUName, PropertyConcept::ALL - PropertyConcept::DANGEROUS ) ) if( mxUnoAccess->hasProperty( aUName, PropertyConcept::ALL - PropertyConcept::DANGEROUS ) )
{ {
...@@ -1770,7 +1772,6 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t ) ...@@ -1770,7 +1772,6 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t )
QuickInsert( (SbxVariable*)xMethRef ); QuickInsert( (SbxVariable*)xMethRef );
pRes = xMethRef; pRes = xMethRef;
} }
}
// Wenn immer noch nichts gefunden wurde, muss geprueft werden, ob NameAccess vorliegt // Wenn immer noch nichts gefunden wurde, muss geprueft werden, ob NameAccess vorliegt
if( !pRes ) if( !pRes )
...@@ -1814,8 +1815,6 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t ) ...@@ -1814,8 +1815,6 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t )
} }
} }
else if( mxInvocation.is() ) else if( mxInvocation.is() )
{
if( aUName.getLength() )
{ {
if( mxInvocation->hasProperty( aUName ) ) if( mxInvocation->hasProperty( aUName ) )
{ {
...@@ -1833,7 +1832,6 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t ) ...@@ -1833,7 +1832,6 @@ SbxVariable* SbUnoObject::Find( const XubString& rName, SbxClassType t )
} }
} }
} }
}
// Ganz am Schluss noch pruefen, ob die Dbg_-Properties gemeint sind // Ganz am Schluss noch pruefen, ob die Dbg_-Properties gemeint sind
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment