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

[Tor Lillqvist]

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

New commits:
commit 63a5ff204f6f368a859e88a9791cf9758a8c59b1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 7 10:38:01 2010 +0300

    Make cws-vbasupportdev300.diff apply again

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 6990385..a69a46e 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -939,7 +939,7 @@ index 834d731..0b9b351 100644
 +
  /////////////////////////////////////////////////////////////////////////////
  
- // Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
+ // A Basic module has set EXTSEARCH, so that the elements, that the modul contains,
 @@ -795,6 +794,82 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
          SbxVariable* pVar = pHint->GetVar();
          SbProperty* pProp = PTR_CAST(SbProperty,pVar);
@@ -1032,7 +1032,7 @@ index 834d731..0b9b351 100644
      {
          SbiToken eEndTok = NIL;
 @@ -1036,12 +1113,14 @@ void SbModule::SetVBACompat( BOOL bCompat )
- // Ausfuehren eines BASIC-Unterprogramms
+ // Run a Basic-subprogram
  USHORT SbModule::Run( SbMethod* pMeth )
  {
 +	OSL_TRACE("About to run %s, vba compatmode is %d", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), mbVBACompat );
@@ -1061,7 +1061,7 @@ index 834d731..0b9b351 100644
 +			}
              if( bDelInst )
              {
-                 // #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
+                 // #57841 Clear Uno-Objects, which were helt in RTL functions,
 @@ -1201,10 +1289,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
  
      // VBA always ensure screenupdating is enabled after completing
@@ -1072,7 +1072,7 @@ index 834d731..0b9b351 100644
 -#endif
      if( bDelInst )
      {
-         // #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
+         // #57841 Clear Uno-Objects, which were helt in RTL functions,
 @@ -1215,6 +1301,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
          pINST = NULL;
      }
@@ -1144,7 +1144,7 @@ index 834d731..0b9b351 100644
      nLine2		 = 0;
      refStatics = new SbxArray;
 +    mCaller          = 0;
-     // AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
+     // From: 1996-07.02: HACK due to 'Referenz could not be saved'
      SetFlag( SBX_NO_MODIFY );
  }
 @@ -1807,6 +1937,7 @@ SbMethod::SbMethod( const SbMethod& r )
@@ -1156,9 +1156,9 @@ index 834d731..0b9b351 100644
  }
  
 @@ -1875,8 +2006,13 @@ SbxInfo* SbMethod::GetInfo()
- // Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
- // #34191# Mit speziellem RefCounting, damit das Basic nicht durch CloseDocument()
- // abgeschossen werden kann. Rueckgabewert wird als String geliefert.
+ // Interface to execute a method of the applications
+ // #34191# With special RefCounting, damit so that the Basic was not fired of by CloseDocument()
+ // The return value will be delivered as string.
 -ErrCode SbMethod::Call( SbxValue* pRet )
 +ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
  {
@@ -1167,11 +1167,11 @@ index 834d731..0b9b351 100644
 + 		OSL_TRACE("SbMethod::Call Have been passed a caller 0x%x", pCaller );
 +		mCaller = pCaller;
 +	}
-     // RefCount vom Modul hochzaehlen
+     // Increment the RefCount of the module
      SbModule* pMod_ = (SbModule*)GetParent();
      pMod_->AddRef();
 @@ -1904,7 +2040,7 @@ ErrCode SbMethod::Call( SbxValue* pRet )
-     // Objekte freigeben
+     // Release objects
      pMod_->ReleaseRef();
      pBasic->ReleaseRef();
 -
@@ -8136,14 +8136,14 @@ diff --git forms/source/inc/property.hrc forms/source/inc/property.hrc
 index e70dff4..5c44b93 100644
 --- forms/source/inc/property.hrc
 +++ forms/source/inc/property.hrc
-@@ -60,7 +60,8 @@ namespace frm
- #define PROPERTY_ID_INPUT_REQUIRED      (PROPERTY_ID_START + 19)
+@@ -60,8 +60,8 @@ namespace frm
  #define PROPERTY_ID_WRITING_MODE        (PROPERTY_ID_START + 20)
  #define PROPERTY_ID_CONTEXT_WRITING_MODE    (PROPERTY_ID_START + 21)
  #define PROPERTY_ID_VERTICAL_ALIGN      (PROPERTY_ID_START + 22)
 -#define PROPERTY_ID_GRAPHIC             (PROPERTY_ID_START + 23)
 +#define PROPERTY_ID_GROUP_NAME          (PROPERTY_ID_START + 23)
 +#define PROPERTY_ID_GRAPHIC             (PROPERTY_ID_START + 24)
+-    // free
      // free
      // free
      // free