[ooo-build-commit] .: 3 commits - patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                               |    8 ++++++--
 patches/dev300/smoketest-officeconnection-fix.diff |   15 +++++++++++++++
 patches/vba/vba-fix-implicit-indexaccess.diff      |   13 +++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit c34187ffc7a3b3163a57845b4e8fc6f0c828bd81
Author: Noel Power <noel.power at novell.com>
Date:   Tue Sep 21 16:25:34 2010 +0100

    fix smoketest for master ( connect rather than join office process )

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f94a603..e61b340 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2940,7 +2940,9 @@ oox-sc-notes.diff, muthusuba
 [ Fixes ]
 oox-pptx-import-fix-customshapes-and-groups.diff, n#621739, rodo
 oox-pptx-import-fix-groups-2.diff, n#619678, rodo
-
+# soffice process doesn't block ( under linux ) connect
+# to raised office instance instead ( should work for windows too )
+smoketest-officeconnection-fix.diff
 [ GSoC2010 ]
 
 # Patches from GSoC 2010 students.
diff --git a/patches/dev300/smoketest-officeconnection-fix.diff b/patches/dev300/smoketest-officeconnection-fix.diff
new file mode 100644
index 0000000..49efd7a
--- /dev/null
+++ b/patches/dev300/smoketest-officeconnection-fix.diff
@@ -0,0 +1,15 @@
+diff --git test/source/cpp/officeconnection.cxx test/source/cpp/officeconnection.cxx
+index 96f735a..9222c3a 100644
+--- test/source/cpp/officeconnection.cxx
++++ test/source/cpp/officeconnection.cxx
+@@ -108,6 +108,10 @@ void OfficeConnection::setUp() {
+                     argSoffice.copy(RTL_CONSTASCII_LENGTH("path:"))).pData,
+                 args, sizeof args / sizeof args[0], 0, 0, 0, envs,
+                 envs == 0 ? 0 : 1, &process_));
++        // ooo-build soffice.bin doesn't block
++        // desc string is already set up so below will try to connect
++        // using the existing pipe
++        process_ = 0; // don't join
+     } else if (argSoffice.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("connect:"))) {
+         desc = argSoffice.copy(RTL_CONSTASCII_LENGTH("connect:"));
+     } else {
commit b51f3d465516dccc5d818842989d794c8fe0deb5
Author: Noel Power <noel.power at novell.com>
Date:   Tue Sep 21 16:17:32 2010 +0100

    fix basic bug with handling of implicit indexes ( was killing smoketests )

diff --git a/patches/dev300/apply b/patches/dev300/apply
index acd7f5e..f94a603 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1160,6 +1160,9 @@ vbasupport-patch-roll-up.diff, i#113356, i#112998 i#113955 i#113358 i#113515 i#1
 vba-rangecell-colparam.diff, bnc#639297
 # fix logical Operator precendence for VBA
 vba-fix-logical-precedence-order.diff
+# fix bug with implicit handling of XIndexAccess for
+# objects ( introduced in vbasupportdev300.diff )
+vba-fix-implicit-indexaccess.diff
 [ VBAUntested ]
 SectionOwner => noelpwer
 # KEEP - unfinished autotext stuff 
diff --git a/patches/vba/vba-fix-implicit-indexaccess.diff b/patches/vba/vba-fix-implicit-indexaccess.diff
new file mode 100644
index 0000000..de4aebe
--- /dev/null
+++ b/patches/vba/vba-fix-implicit-indexaccess.diff
@@ -0,0 +1,13 @@
+diff --git basic/source/runtime/step2.cxx basic/source/runtime/step2.cxx
+index 68bef06..d50d38b 100755
+--- basic/source/runtime/step2.cxx
++++ basic/source/runtime/step2.cxx
+@@ -489,7 +489,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
+             pPar->Put( NULL, 0 );
+     }
+     // Index-Access bei UnoObjekten beruecksichtigen
+-	else if( pElem->GetType() == SbxOBJECT && !pElem->ISA(SbxMethod) && !pElem->ISA(SbxProperty) )
++    else if( pElem->GetType() == SbxOBJECT && !pElem->ISA(SbxMethod) && ( !bVBAEnabled || ( bVBAEnabled && !pElem->ISA(SbxProperty) ) ) )
+     {
+         pPar = pElem->GetParameters();
+         if ( pPar )
commit b6ec4f4a448aa68cdb8f6ff296c26eda9b5b8ca7
Author: Noel Power <noel.power at novell.com>
Date:   Tue Sep 21 16:13:36 2010 +0100

    remove solenv-subsequenttest-fix.diff
    
    solenv-subsequenttest-fix.diff: in a seperate effort I already migrated the same change to git ( but the issue and comments associated with this patch seem at odds with the content :-/ )

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fca9b88..acd7f5e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -711,7 +711,6 @@ pushfont-psstream.diff, i#84481, michael
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
-
 # do not create '.' subdirectories
 # omit './' in paths
 solenv-installer-cleaner-paths.diff, pmladek