ooo-build r12785 - trunk/patches/vba

From: jiaojh svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12785 - trunk/patches/vba
Date: Wed, 4 Jun 2008 07:40:26 +0000 (UTC)
Author: jiaojh
Date: Wed Jun  4 07:40:26 2008
New Revision: 12785
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12785&view=rev

Log:
crazy for make and update patch.


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

Modified: trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff	(original)
+++ trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff	Wed Jun  4 07:40:26 2008
@@ -1,5 +1,5 @@
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ offapi/com/sun/star/document/VbaEventId.idl	2008-06-04 15:17:44.000000000 +0800
++++ offapi/com/sun/star/document/VbaEventId.idl	2008-06-03 14:25:19.000000000 +0800
 @@ -0,0 +1,83 @@
 +/*************************************************************************
 + *
@@ -85,7 +85,7 @@
 +
 +#endif
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ offapi/com/sun/star/document/XVbaEventsHelper.idl	2008-06-04 15:17:44.000000000 +0800
++++ offapi/com/sun/star/document/XVbaEventsHelper.idl	2008-06-03 14:25:19.000000000 +0800
 @@ -0,0 +1,54 @@
 +/*************************************************************************
 + *
@@ -142,7 +142,7 @@
 +
 +#endif
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ offapi/com/sun/star/document/VbaEventsHelper.idl	2008-06-04 15:17:44.000000000 +0800
++++ offapi/com/sun/star/document/VbaEventsHelper.idl	2008-06-03 14:25:19.000000000 +0800
 @@ -0,0 +1,55 @@
 +/*************************************************************************
 + *
@@ -200,7 +200,7 @@
 +
 +#endif
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl	2008-06-04 15:17:44.000000000 +0800
++++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl	2008-06-03 14:25:19.000000000 +0800
 @@ -0,0 +1,47 @@
 +/*************************************************************************
 + *
@@ -249,8 +249,8 @@
 +}; }; }; };
 +
 +#endif
---- offapi/com/sun/star/document/makefile.mk.bak	2008-06-04 14:40:23.000000000 +0800
-+++ offapi/com/sun/star/document/makefile.mk	2008-06-04 15:17:44.000000000 +0800
+--- offapi/com/sun/star/document/makefile.mk.bak	2008-06-03 14:25:12.000000000 +0800
++++ offapi/com/sun/star/document/makefile.mk	2008-06-03 14:25:19.000000000 +0800
 @@ -109,6 +109,10 @@ IDLFILES=\
      DocumentRevisionListPersistence.idl \
      XDocumentLanguages.idl \
@@ -263,7 +263,7 @@
  
  # ------------------------------------------------------------------
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaeventshelper.hxx	2008-06-04 15:17:44.000000000 +0800
++++ sc/source/ui/vba/vbaeventshelper.hxx	2008-06-03 14:25:19.000000000 +0800
 @@ -0,0 +1,92 @@
 +/*************************************************************************
 + *
@@ -358,7 +358,7 @@
 +#endif
 +
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaeventshelper.cxx	2008-06-04 15:17:44.000000000 +0800
++++ sc/source/ui/vba/vbaeventshelper.cxx	2008-06-04 10:32:41.000000000 +0800
 @@ -0,0 +1,1059 @@
 +/*************************************************************************
 + *
@@ -1419,8 +1419,8 @@
 +    "ScVbaEventsHelper",
 +    "com.sun.star.document.VbaEventsHelper" );
 +}
---- sc/inc/document.hxx.orig	2008-06-04 15:17:07.000000000 +0800
-+++ sc/inc/document.hxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/inc/document.hxx.orig	2008-06-03 14:24:49.000000000 +0800
++++ sc/inc/document.hxx	2008-06-03 14:25:19.000000000 +0800
 @@ -42,6 +42,7 @@
  #include "brdcst.hxx"
  #include "tabopparams.hxx"
@@ -1457,7 +1457,7 @@
  public:
      ScTabOpList         aTableOpList;		            // list of ScInterpreterTableOpParams currently in use
      ScInterpreterTableOpParams  aLastTableOpParams;     // remember last params
-@@ -1723,6 +1731,8 @@ public:
+@@ -1722,6 +1730,8 @@ public:
  	void GetSortParam( ScSortParam& rParam, SCTAB nTab );
  	void SetSortParam( ScSortParam& rParam, SCTAB nTab );
  
@@ -1466,8 +1466,8 @@
      /** Should only be GRAM_PODF or GRAM_ODFF. */
      void                SetStorageGrammar( ScGrammar::Grammar eGrammar );
      ScGrammar::Grammar  GetStorageGrammar() const
---- sc/source/core/data/documen2.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/core/data/documen2.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/core/data/documen2.cxx.orig	2008-06-03 14:24:49.000000000 +0800
++++ sc/source/core/data/documen2.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -93,6 +93,7 @@
  #include "listenercalls.hxx"
  #include "recursionhelper.hxx"
@@ -1524,8 +1524,8 @@
 +	}
 +	return rVbaEventsHelper;
 +}
---- sc/source/core/data/documen7.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/core/data/documen7.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/core/data/documen7.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/source/core/data/documen7.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -59,7 +59,15 @@
  
  
@@ -1582,22 +1582,8 @@
  	}
  	DBG_ASSERT( nFormulaTrackCount==0, "TrackFormulas: nFormulaTrackCount!=0" );
  }
---- sc/source/core/tool/makefile.mk.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/core/tool/makefile.mk	2008-06-04 15:17:44.000000000 +0800
-@@ -158,3 +158,11 @@ $(INCCOM)$/osversiondef.hxx :
- 
- $(SLO)$/interpr5.obj : $(INCCOM)$/osversiondef.hxx
- 
-+ALLTAR : \
-+        $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+        echo $@
---- sc/source/ui/docshell/docsh.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/docshell/docsh.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/docshell/docsh.cxx.orig	2008-06-03 14:24:49.000000000 +0800
++++ sc/source/ui/docshell/docsh.cxx	2008-06-04 10:42:22.000000000 +0800
 @@ -126,6 +126,13 @@
  #include <rtl/logfile.hxx>
  
@@ -1744,8 +1730,8 @@
  
  void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
  {
---- sc/source/ui/inc/docsh.hxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/inc/docsh.hxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/inc/docsh.hxx.orig	2008-06-03 14:24:49.000000000 +0800
++++ sc/source/ui/inc/docsh.hxx	2008-06-03 14:25:19.000000000 +0800
 @@ -47,6 +47,7 @@
  #include "refreshtimer.hxx"
  
@@ -1763,8 +1749,8 @@
  
  	void			UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
  													   SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
---- sc/source/ui/undo/undoblk3.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/undo/undoblk3.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/undo/undoblk3.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/source/ui/undo/undoblk3.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -79,7 +79,17 @@ TYPEINIT1(ScUndoInsertAreaLink,		SfxUndo
  TYPEINIT1(ScUndoRemoveAreaLink,		SfxUndoAction);
  TYPEINIT1(ScUndoUpdateAreaLink,		SfxUndoAction);
@@ -1809,8 +1795,8 @@
  }
  
  
---- sc/source/ui/undo/undoblk.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/undo/undoblk.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/undo/undoblk.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/source/ui/undo/undoblk.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -125,6 +125,7 @@ ScUndoInsertCells::ScUndoInsertCells( Sc
  	}
  
@@ -1907,8 +1893,8 @@
      SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
  }
  
---- sc/source/ui/undo/undocell.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/undo/undocell.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/undo/undocell.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/source/ui/undo/undocell.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -214,6 +214,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocS
  	nCount( nNewCount )
  {
@@ -1981,8 +1967,8 @@
  }
  
  void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
---- sc/source/ui/unoobj/viewuno.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/unoobj/viewuno.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/unoobj/viewuno.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/source/ui/unoobj/viewuno.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -71,8 +71,12 @@
  #include "gridwin.hxx"
  #include <com/sun/star/view/DocumentZoomType.hpp>
@@ -2118,8 +2104,8 @@
  	lang::EventObject aEvent;
  	aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
  	for ( USHORT n=0; n<aSelectionListeners.Count(); n++ )
---- sc/source/ui/unoobj/docuno.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/unoobj/docuno.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/unoobj/docuno.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/source/ui/unoobj/docuno.cxx	2008-06-03 16:01:07.000000000 +0800
 @@ -92,7 +92,12 @@
  #include "rangeutl.hxx"
  #include "ViewSettingsSequenceDefines.hxx"
@@ -2194,8 +2180,8 @@
  // XServiceInfo
  
  rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
---- sc/inc/docuno.hxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/inc/docuno.hxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/inc/docuno.hxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/inc/docuno.hxx	2008-06-03 14:25:19.000000000 +0800
 @@ -55,6 +55,7 @@
  #include <com/sun/star/sheet/XSheetAnnotations.hpp>
  #include <com/sun/star/beans/XPropertySet.hpp>
@@ -2221,8 +2207,8 @@
  };
  
  
---- sc/source/ui/view/gridwin.cxx.orig	2008-06-04 15:17:07.000000000 +0800
-+++ sc/source/ui/view/gridwin.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/view/gridwin.cxx.orig	2008-06-03 14:24:49.000000000 +0800
++++ sc/source/ui/view/gridwin.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -150,7 +150,13 @@
  #include <svx/sdr/overlay/overlaymanager.hxx>
  #include <vcl/svapp.hxx>
@@ -2321,7 +2307,7 @@
  					            pImp->MousePressed( aEvent );
                              else
                                  pImp->MouseReleased( aEvent );
-@@ -4856,26 +4909,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
+@@ -4858,26 +4911,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
  	ScDocument* pDoc = pDocSh->GetDocument();
  	ScBaseCell* pCell = NULL;
  
@@ -2351,8 +2337,8 @@
  
  	ScHideTextCursor aHideCursor( pViewData, eWhich );	// before GetEditArea (MapMode is changed)
  
---- sc/source/ui/view/tabview3.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sc/source/ui/view/tabview3.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sc/source/ui/view/tabview3.cxx.orig	2008-06-03 14:24:49.000000000 +0800
++++ sc/source/ui/view/tabview3.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -82,6 +82,10 @@
  #include "client.hxx"
  
@@ -2402,8 +2388,8 @@
  		TabChanged();										// DrawView
  		aViewData.GetViewShell()->WindowChanged();			// falls das aktive Fenster anders ist
          if ( !bUnoRefDialog )
---- sc/source/ui/vba/makefile.mk.orig	2008-06-04 15:17:18.000000000 +0800
-+++ sc/source/ui/vba/makefile.mk	2008-06-04 15:18:04.000000000 +0800
+--- sc/source/ui/vba/makefile.mk.orig	2008-06-03 14:24:59.000000000 +0800
++++ sc/source/ui/vba/makefile.mk	2008-06-03 14:25:28.000000000 +0800
 @@ -122,6 +122,7 @@ SLOFILES= \
  		$(SLO)$/vbamultipage.obj \
  		$(SLO)$/vbapages.obj \
@@ -2412,71 +2398,70 @@
   
  
  # --- Targets ------------------------------------------------------
---- sfx2/inc/sfx2/objsh.hxx.orig	2008-06-04 14:56:11.000000000 +0800
-+++ sfx2/inc/sfx2/objsh.hxx	2008-06-04 15:17:44.000000000 +0800
-@@ -405,8 +405,7 @@ public:
+--- sfx2/inc/sfx2/objsh.hxx.orig	2008-06-04 11:30:47.000000000 +0800
++++ sfx2/inc/sfx2/objsh.hxx	2008-06-04 10:41:41.000000000 +0800
+@@ -304,6 +304,7 @@ public:
+     void                        SetNoName();
+     sal_Bool                    IsInModalMode() const;
+     sal_Bool					HasModalViews() const;
++    sal_Bool                    IsInPrepareClose() const;
+     sal_Bool                    IsHelpDocument() const;
+ 
+     sal_Bool                    IsDocShared() const;
+@@ -403,7 +404,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,
--        bool bRaiseError = true,
--        ::com::sun::star::uno::Any* aCaller = 0
+-        ::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
      );
  
      static ErrCode  CallXScript(
-@@ -416,8 +415,7 @@ public:
+@@ -412,7 +414,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,
--        bool bRaiseError = true,
--        ::com::sun::star::uno::Any* aCaller = 0
+-        ::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
      );
  
      /** adjusts the internal macro mode, according to the current security settings
---- sfx2/source/doc/objmisc.cxx.orig	2008-06-04 14:56:11.000000000 +0800
-+++ sfx2/source/doc/objmisc.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sfx2/source/doc/objmisc.cxx.orig	2008-06-04 11:20:37.000000000 +0800
++++ sfx2/source/doc/objmisc.cxx	2008-06-03 18:53:21.000000000 +0800
 @@ -1591,7 +1591,7 @@ namespace
  }
  
  ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL,
--    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
+-    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
 +    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError )
  {
      OSL_TRACE( "in CallXScript" );
  	ErrCode nErr = ERRCODE_NONE;
-@@ -1622,16 +1622,7 @@ ErrCode SfxObjectShell::CallXScript( con
- 
-         // obtain the script, and execute it
-         Reference< provider::XScript > xScript( xScriptProvider->getScript( _rScriptURL ), UNO_QUERY_THROW );
--        if ( pCaller && pCaller->hasValue() )
--        {
--            Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY ); 
--            if ( xProps.is() )
--            {
--                Sequence< uno::Any > aArgs( 1 );
--                aArgs[ 0 ] = *pCaller;
--                xProps->setPropertyValue( rtl::OUString::createFromAscii("Caller"), uno::makeAny( aArgs ) );
--            }
--        }
-+
-         aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
+@@ -1632,7 +1632,7 @@ ErrCode SfxObjectShell::CallXScript( con
+         nErr = ERRCODE_BASIC_INTERNAL_ERROR;
      }
-     catch ( const uno::Exception& )
-@@ -1665,9 +1656,9 @@ ErrCode SfxObjectShell::CallXScript( con
+ 
+-	if ( bCaughtException )
++	if ( bCaughtException && bRaiseError )
+ 	{
+         ::std::auto_ptr< VclAbstractDialog > pScriptErrDlg;
+ 		SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+@@ -1656,9 +1656,9 @@ 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, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
+-            aOutParam)
 +            aOutParam, bool bRaiseError )
  {
--    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller );
+-    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam );
 +    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError );
  }
  
  //-------------------------------------------------------------------------
---- sfx2/source/doc/objserv.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sfx2/source/doc/objserv.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sfx2/source/doc/objserv.cxx.orig	2008-06-03 14:24:49.000000000 +0800
++++ sfx2/source/doc/objserv.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -28,6 +28,8 @@
   *
   ************************************************************************/
@@ -2513,8 +2498,8 @@
  			//!! detaillierte Auswertung eines Fehlercodes
  			SfxObjectShellRef xLock( this );
  
---- sfx2/source/view/viewprn.cxx.orig	2008-06-04 14:40:23.000000000 +0800
-+++ sfx2/source/view/viewprn.cxx	2008-06-04 15:17:44.000000000 +0800
+--- sfx2/source/view/viewprn.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sfx2/source/view/viewprn.cxx	2008-06-03 14:25:19.000000000 +0800
 @@ -28,10 +28,12 @@
   *
   ************************************************************************/
@@ -2576,9 +2561,9 @@
  				bool bDetectHidden = ( !bSilent && pDoc );
  				if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
  					return;
---- sfx2/source/doc/objxtor.cxx.orig	2008-06-04 15:17:07.000000000 +0800
-+++ sfx2/source/doc/objxtor.cxx	2008-06-04 15:17:44.000000000 +0800
-@@ -585,6 +585,13 @@ SfxObjectShell* SfxObjectShell::Current(
+--- sfx2/source/doc/objxtor.cxx.orig	2008-06-03 18:53:27.000000000 +0800
++++ sfx2/source/doc/objxtor.cxx	2008-06-04 10:41:41.000000000 +0800
+@@ -594,6 +594,13 @@ SfxObjectShell* SfxObjectShell::Current(
  	return pFrame ? pFrame->GetObjectShell() : 0;
  }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]