[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                    |    4 +--
 patches/vba/vba-ctb-fix-looponload.diff |   40 +++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit fb2051c859edc793ff3aa35a456e44d1ef2cd9e4
Author: Noel Power <noel.power at novell.com>
Date:   Tue Mar 23 11:48:28 2010 +0000

    fix crash with Tcg records (  n#590359 )
    
    * patches/dev300/apply:
    * patches/vba/vba-ctb-fix-looponload.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 15cc103..dc2c6c5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1720,8 +1720,8 @@ vba-fix-scp2-librarylocation.diff
 # fix problem with parallel build failing
 vba-fix-scripting-parallelbuild.diff 
 # fix strange problem when strange (empty) TBC records can
-# cause document load to ... loop
-vba-ctb-fix-looponload.diff, n#589794
+# cause document load to ... loop ( and potential crash )
+vba-ctb-fix-looponload.diff, n#589794, n#590359
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-ctb-fix-looponload.diff b/patches/vba/vba-ctb-fix-looponload.diff
index 11aa759..d74aaef 100644
--- a/patches/vba/vba-ctb-fix-looponload.diff
+++ b/patches/vba/vba-ctb-fix-looponload.diff
@@ -1,5 +1,25 @@
+diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
+index a46a293..09a35ae 100644
+--- sw/source/filter/ww8/ww8par.cxx
++++ sw/source/filter/ww8/ww8par.cxx
+@@ -3919,9 +3919,13 @@ bool WW8Customizations::Import( SwDocShell* pShell )
+     Tcg aTCG;
+     long nCur = mpTableStream->Tell();
+     mpTableStream->Seek( mWw8Fib.fcCmds ); // point at tgc record
+-    if (!aTCG.Read( mpTableStream ) )
+-        OSL_TRACE("** Read of Customization data failed!!!! ");
++    bool bReadResult = aTCG.Read( mpTableStream );
+     mpTableStream->Seek( nCur ); // return to previous position, is that necessary?
++    if ( !bReadResult )
++    {
++        OSL_TRACE("** Read of Customization data failed!!!! ");
++        return false;
++    }
+ #if DEBUG
+     aTCG.Print( stderr );
+ #endif
 diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx
-index 42f22d1..44c8253 100644
+index 42f22d1..f20a7b9 100644
 --- sw/source/filter/ww8/ww8toolbar.cxx
 +++ sw/source/filter/ww8/ww8toolbar.cxx
 @@ -105,6 +105,7 @@ bool CTBWrapper::Read( SvStream* pS )
@@ -27,3 +47,21 @@ index 42f22d1..44c8253 100644
      if ( cCust )
      {
          for ( sal_Int32 index = 0; index < cCust; ++index )
+@@ -773,12 +784,15 @@ void Tcg::Print( FILE* fp )
+     Indent a(true);
+     indent_printf(fp, "[ 0x%x ] Tcg - dump %d\n", nOffSet, nTcgVer);
+     indent_printf(fp,"  nTcgVer %d\n", nTcgVer);
+-    tcg->Print( fp );
++    if ( tcg.get() )
++        tcg->Print( fp );
+ }
+ 
+ bool Tcg::ImportCustomToolBar( SfxObjectShell& rDocSh )
+ {
+-    return tcg->ImportCustomToolBar( rDocSh );
++    if ( tcg.get() )
++        return tcg->ImportCustomToolBar( rDocSh );
++    return false;
+ }
+ 
+ Tcg255::Tcg255()