[ooo-build-commit] .: patches/vba

[Tor Lillqvist]

 patches/vba/cws-vbasupportdev300.diff |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 1f769049eaec5497a8bebecadbefb39fc6f49165
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 4 13:21:41 2010 +0300

    Make cws-vbasupportdev300.diff apply again

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 32f8333..d530a37 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -691,14 +691,14 @@ index 1a9e046..dfc8dfd 100755
 +    return aRetAny;
 +}
 +
- // Dbg-Hilfsmethode zum Auslesen der in einem Object implementierten Interfaces
+ // Debugging help method to readout the imlemented interfaces of an object
  String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
  {
 @@ -2008,11 +2147,26 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                  {
                      try
                      {
--                        // Wert holen
+-                        // get the value
 -                        Any aRetAny = mxInvocation->getValue( pProp->GetName() );
 +						UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
 +						sal_Bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() );
@@ -715,7 +715,7 @@ index 1a9e046..dfc8dfd 100755
 +							// Wert holen
 +							aRetAny = mxInvocation->getValue( pProp->GetName() );
  
-                         // Wert von Uno nach Sbx uebernehmen
+                         // take over the value from Uno to Sbx
                          unoToSbxValue( pVar, aRetAny );
 +						if( pParams && bCanBeConsideredAMethod )
 +							pVar->SetParameters( NULL );
@@ -746,7 +746,7 @@ index 1a9e046..dfc8dfd 100755
 -                        {
 -                            USHORT iSbx = (USHORT)(i+1);
 -
--                            // ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
+-                            // ATTENTION: Don't forget for Sbx-Parameter the offset!
 -                            aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
 -                                                        bBlockConversionToSmallestType );
 -
@@ -768,7 +768,7 @@ index 1a9e046..dfc8dfd 100755
 -                    {
 -                        for( i = 0 ; i < nParamCount ; i++ )
 -                        {
--                            // ACHTUNG: Bei den Sbx-Parametern den Offset nicht vergessen!
+-                            // ATTENTION: Don't forget for Sbx-Parameter the offset!
 -                            pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
 -                                                            bBlockConversionToSmallestType );
 -                        }
@@ -776,7 +776,7 @@ index 1a9e046..dfc8dfd 100755
 +					processAutomationParams( pParams, args, bOLEAutomation, nParamCount );
                  }
  
-                 // Methode callen
+                 // call the method
 @@ -2217,26 +2326,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                      }
                      else if( bInvocation && mxInvocation.is() )
@@ -785,7 +785,7 @@ index 1a9e046..dfc8dfd 100755
 -                        Sequence< Any > OutParam;
 -                        Any aRetAny = mxInvocation->invoke( pMeth->GetName(), args, OutParamIndex, OutParam );
 -
--                        // Wert von Uno nach Sbx uebernehmen
+-                        // take over the value from Uno to Sbx
 +						Any aRetAny = invokeAutomationMethod( pMeth->GetName(), args, pParams, nParamCount, mxInvocation );
                          unoToSbxValue( pVar, aRetAny );
 -
@@ -804,7 +804,7 @@ index 1a9e046..dfc8dfd 100755
 -                        }
                      }
  
-                     // #55460, Parameter hier weghauen, da das in unoToSbxValue()
+                     // remove parameter here, because this was not done anymore in unoToSbxValue()
 @@ -3165,11 +3256,16 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot,
  
  typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;