[ooo-build-commit] patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                                 |    3 ++-
 patches/vba/vba-fallback-to-calling-doc-context.diff |   15 ---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit c8d2b7ccabf9d98f23e40cc99d2b3e00026febb3
Author: Noel Power <npower at linux-h0uc.site>
Date:   Tue Jun 23 17:40:57 2009 +0100

    seperate out xlsx part of patch ( patch order problem )
    
    * patches/dev300/apply:
    * patches/vba/vba-fallback-to-calling-doc-context.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 62e0049..258d044 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3073,7 +3073,8 @@ pptx-fix-connector-crash.diff, n#499129, thorsten
 # FIXME: Remove this patch (and update the other pptx patches) after 3.1 is
 # branched
 xlsx-filter-as-a-separate-lib.diff
-
+# tweak to above ( associated with vba-fallback-to-calling-doc-context.diff )
+xlsx-separate-lib-vba-fallback-tweak.diff
 # Snapshot of the xlsx export filter at the time of creation of ooxml03
 # This is until 0453-Fix-formatted-text-change-tracking.patch, inluding, and
 # should contain all the available changes.
diff --git a/patches/vba/vba-fallback-to-calling-doc-context.diff b/patches/vba/vba-fallback-to-calling-doc-context.diff
index 4c1cafa..2f761cf 100644
--- a/patches/vba/vba-fallback-to-calling-doc-context.diff
+++ b/patches/vba/vba-fallback-to-calling-doc-context.diff
@@ -718,21 +718,6 @@ index 8290f66..110d15f 100644
  }
  
  sal_Int32 
-diff --git sc/source/filter/xlsx/xlsx-excimp8.cxx sc/source/filter/xlsx/xlsx-excimp8.cxx
-index 2995571..d03666e 100644
---- sc/source/filter/xlsx/xlsx-excimp8.cxx
-+++ sc/source/filter/xlsx/xlsx-excimp8.cxx
-@@ -277,7 +277,9 @@ void ImportExcel8::ReadBasic( void )
-         if( bLoadCode || bLoadStrg )
-         {
-             uno::Any aGlobs;
--            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.excel.Globals") );
-+            uno::Sequence< uno::Any > aArgs(1);
-+            aArgs[ 0 ] <<= pShell->GetModel();
-+            aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "ooo.vba.excel.Globals"), aArgs );
-             pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
- 	    bool bAsComment = !bLoadExecutable || !aGlobs.hasValue();
 diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
 index 337ceb3..72d92cf 100644
 --- sc/source/ui/docshell/docsh.cxx