ooo-build r11999 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Mar 25 15:20:35 2008
New Revision: 11999
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11999&view=rev

Log:
2008-03-25  Noel Power <noel power novell com>

        * patches/vba/vba-workbook-worksheet-events.diff: fix patch
        * apply problem


Modified:
   trunk/ChangeLog
   trunk/patches/vba/vba-workbook-worksheet-events.diff

Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff	(original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff	Tue Mar 25 15:20:35 2008
@@ -590,3 +590,37 @@
  		TabChanged();										// DrawView
  		aViewData.GetViewShell()->WindowChanged();			// falls das aktive Fenster anders ist
          if ( !bUnoRefDialog )
+--- /data4/sles/ooo-mLnew/ooo-build/build/ooc680-m2/sfx2/source/doc/objmisc.cxx	2006-05-22 08:25:06.000000000 +0100
++++ sfx2/source/doc/objmisc.cxx	2006-06-02 13:29:02.000000000 +0100
+@@ -1396,7 +1396,7 @@ ErrCode SfxObjectShell::CallXScript( con
+         ::com::sun::star::uno::Any& aRet,
+         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
+-            aOutParam)
++            aOutParam, bool bRaiseError )
+ {
+     OSL_TRACE( "in CallXScript" );
+ 	ErrCode nErr = ERRCODE_NONE;
+@@ -1470,7 +1470,7 @@ ErrCode SfxObjectShell::CallXScript( con
+         nErr = ERRCODE_BASIC_INTERNAL_ERROR;
+     }
+ 
+-	if ( bCaughtException )
++	if ( bCaughtException && bRaiseError )
+ 	{
+ 		SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+ 
+
+--- /data4/sles/ooo-mLnew/ooo-build/build/ooc680-m2/sfx2/inc/objsh.hxx	2006-05-02 17:01:46.000000000 +0100
++++ sfx2/inc/sfx2/objsh.hxx	2006-06-02 13:29:01.000000000 +0100
+@@ -427,7 +427,8 @@ public:
+         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
+         ::com::sun::star::uno::Any& aRet,
+         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam
++        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
++        bool bRaiseError = true
+     );
+ 
+     BOOL                        DoMacroQuery( const String& rScriptType );
+