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

[Noel Power]

 patches/vba/cws-vbasupportdev300.diff        |    8 ++++++++
 patches/vba/vba-override-base-vbaevents.diff |   21 +++++++++++++++++++++
 2 files changed, 29 insertions(+)

New commits:
commit 969ebdb22050128abf545a4fd0413f6f490b5e45
Author: Noel Power <noel.power at novell.com>
Date:   Fri Sep 3 13:32:36 2010 +0100

    fix some crashes
    
    patches/vba/cws-vbasupportdev300.diff: fix missing hunk ( from m2->m4 )
    patches/vba/vba-override-base-vbaevents.diff:  catch possible exception with Resize events

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 24a1428..39ef4f4 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -23128,6 +23128,14 @@ index 8fcfcd5..dd93063 100755
      sal_Int32 nType = 0;
      if ( !( _oType >>= nType ) )
          DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
+@@ -5533,7 +5533,6 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
+             }
+             else if ( bIsSingleCell )
+             {
+-                uno::Reference< excel::XRange > xUsedRange = getWorksheet()->getUsedRange();
+                 pRangeToUse = static_cast< ScVbaRange* >( xUsedRange.get() );	
+             }
+         
 @@ -5623,6 +5906,183 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::
      }
  }
diff --git a/patches/vba/vba-override-base-vbaevents.diff b/patches/vba/vba-override-base-vbaevents.diff
index 69bae1f..f94bd5b 100644
--- a/patches/vba/vba-override-base-vbaevents.diff
+++ b/patches/vba/vba-override-base-vbaevents.diff
@@ -177,6 +177,27 @@ index a08c2a6..442673f 100644
  }
  
  
+diff --git sc/source/ui/vba/vbaeventshelper.cxx sc/source/ui/vba/vbaeventshelper.cxx
+index bd71c9e..c50e613 100755
+--- sc/source/ui/vba/vbaeventshelper.cxx
++++ sc/source/ui/vba/vbaeventshelper.cxx
+@@ -372,7 +372,15 @@ void ScVbaEventsListener::processWindowResizeMacro()
+ {
+     OSL_TRACE( "**** Attempt to FIRE MACRO **** " );
+     if( !mbDisposed )
+-        mrVbaEvents.processVbaEvent( WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
++    {
++        try
++        {
++            mrVbaEvents.processVbaEvent( WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
++        }
++        catch( uno::Exception& )
++        {
++        }
++    }
+ }
+ 
+ // ============================================================================
 diff --git vcl/source/window/dialog.cxx vcl/source/window/dialog.cxx
 index 1e493ce..901c934 100644
 --- vcl/source/window/dialog.cxx