GNOME.org
 

ooo-build r12779 - trunk/patches/vba

Author: jiaojh
Date: Wed Jun  4 06:29:53 2008
New Revision: 12779
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12779&view=rev

Log:
update for build problem



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 06:29:53 2008
@@ -1,5 +1,5 @@
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ offapi/com/sun/star/document/VbaEventId.idl	2008-06-03 14:25:19.000000000 +0800
++++ offapi/com/sun/star/document/VbaEventId.idl	2008-06-04 14:40:31.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-03 14:25:19.000000000 +0800
++++ offapi/com/sun/star/document/XVbaEventsHelper.idl	2008-06-04 14:40:31.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-03 14:25:19.000000000 +0800
++++ offapi/com/sun/star/document/VbaEventsHelper.idl	2008-06-04 14:40:31.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-03 14:25:19.000000000 +0800
++++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl	2008-06-04 14:40:31.000000000 +0800
 @@ -0,0 +1,47 @@
 +/*************************************************************************
 + *
@@ -249,8 +249,8 @@
 +}; }; }; };
 +
 +#endif
---- 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
+--- 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 14:40:31.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-03 14:25:19.000000000 +0800
++++ sc/source/ui/vba/vbaeventshelper.hxx	2008-06-04 14:40:31.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 10:32:41.000000000 +0800
++++ sc/source/ui/vba/vbaeventshelper.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -0,0 +1,1059 @@
 +/*************************************************************************
 + *
@@ -1419,9 +1419,9 @@
 +    "ScVbaEventsHelper",
 +    "com.sun.star.document.VbaEventsHelper" );
 +}
---- sc/source/ui/vba/service.cxx.orig	2008-06-03 14:25:12.000000000 +0800
-+++ sc/source/ui/vba/service.cxx	2008-06-03 14:25:19.000000000 +0800
-@@ -69,6 +69,10 @@ namespace hyperlink 
+--- sc/source/ui/vba/service.cxx.orig	2008-06-04 14:39:22.000000000 +0800
++++ sc/source/ui/vba/service.cxx	2008-06-04 14:51:02.000000000 +0800
+@@ -65,6 +65,10 @@ namespace  userform
  {
  extern sdecl::ServiceDecl const serviceDecl;
  }
@@ -1432,26 +1432,26 @@
  
  
  extern "C"
-@@ -87,7 +91,7 @@ extern "C"
+@@ -82,7 +86,7 @@ extern "C"
+ 		OSL_TRACE("In component_writeInfo");
  
  	// Component registration
-         if ( component_writeInfoHelper( pServiceManager, pRegistryKey, 
--		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) )
-+		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
+-        if ( component_writeInfoHelper( pServiceManager, pRegistryKey, 
++        if ( component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, 
+ 		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl ) )
  		{
  			// Singleton registration
- 			try
-@@ -116,6 +120,8 @@ extern "C"
+@@ -112,6 +116,8 @@ extern "C"
  		OSL_TRACE("In component_getFactory for %s", pImplName );
  	void* pRet =  component_getFactoryHelper(
-         	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
-+    if( !pRet )
-+        pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
+         	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl );
++     if( !pRet )
++         pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
  	OSL_TRACE("Ret is 0x%x", pRet);
  	return pRet;
      }
---- 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
+--- sc/inc/document.hxx.orig	2008-06-04 14:39:22.000000000 +0800
++++ sc/inc/document.hxx	2008-06-04 14:40:31.000000000 +0800
 @@ -42,6 +42,7 @@
  #include "brdcst.hxx"
  #include "tabopparams.hxx"
@@ -1488,7 +1488,7 @@
  public:
      ScTabOpList         aTableOpList;		            // list of ScInterpreterTableOpParams currently in use
      ScInterpreterTableOpParams  aLastTableOpParams;     // remember last params
-@@ -1722,6 +1730,8 @@ public:
+@@ -1723,6 +1731,8 @@ public:
  	void GetSortParam( ScSortParam& rParam, SCTAB nTab );
  	void SetSortParam( ScSortParam& rParam, SCTAB nTab );
  
@@ -1497,8 +1497,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-03 14:24:49.000000000 +0800
-+++ sc/source/core/data/documen2.cxx	2008-06-03 14:25:19.000000000 +0800
+--- sc/source/core/data/documen2.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/core/data/documen2.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -93,6 +93,7 @@
  #include "listenercalls.hxx"
  #include "recursionhelper.hxx"
@@ -1555,8 +1555,8 @@
 +	}
 +	return rVbaEventsHelper;
 +}
---- 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
+--- sc/source/core/data/documen7.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/core/data/documen7.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -59,7 +59,15 @@
  
  
@@ -1613,8 +1613,8 @@
  	}
  	DBG_ASSERT( nFormulaTrackCount==0, "TrackFormulas: nFormulaTrackCount!=0" );
  }
---- sc/source/core/tool/makefile.mk.orig	2008-06-03 14:25:12.000000000 +0800
-+++ sc/source/core/tool/makefile.mk	2008-06-03 14:25:19.000000000 +0800
+--- sc/source/core/tool/makefile.mk.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/core/tool/makefile.mk	2008-06-04 14:40:31.000000000 +0800
 @@ -158,3 +158,11 @@ $(INCCOM)$/osversiondef.hxx :
  
  $(SLO)$/interpr5.obj : $(INCCOM)$/osversiondef.hxx
@@ -1627,8 +1627,8 @@
 +$(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-03 14:24:49.000000000 +0800
-+++ sc/source/ui/docshell/docsh.cxx	2008-06-04 10:42:22.000000000 +0800
+--- sc/source/ui/docshell/docsh.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/docshell/docsh.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -126,6 +126,13 @@
  #include <rtl/logfile.hxx>
  
@@ -1775,8 +1775,8 @@
  
  void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
  {
---- 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
+--- sc/source/ui/inc/docsh.hxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/inc/docsh.hxx	2008-06-04 14:40:31.000000000 +0800
 @@ -47,6 +47,7 @@
  #include "refreshtimer.hxx"
  
@@ -1794,8 +1794,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-03 14:25:12.000000000 +0800
-+++ sc/source/ui/undo/undoblk3.cxx	2008-06-03 14:25:19.000000000 +0800
+--- sc/source/ui/undo/undoblk3.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/undo/undoblk3.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -79,7 +79,17 @@ TYPEINIT1(ScUndoInsertAreaLink,		SfxUndo
  TYPEINIT1(ScUndoRemoveAreaLink,		SfxUndoAction);
  TYPEINIT1(ScUndoUpdateAreaLink,		SfxUndoAction);
@@ -1840,8 +1840,8 @@
  }
  
  
---- 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
+--- sc/source/ui/undo/undoblk.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/undo/undoblk.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -125,6 +125,7 @@ ScUndoInsertCells::ScUndoInsertCells( Sc
  	}
  
@@ -1938,8 +1938,8 @@
      SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
  }
  
---- 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
+--- sc/source/ui/undo/undocell.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/undo/undocell.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -214,6 +214,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocS
  	nCount( nNewCount )
  {
@@ -2012,8 +2012,8 @@
  }
  
  void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
---- 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
+--- sc/source/ui/unoobj/viewuno.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/unoobj/viewuno.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -71,8 +71,12 @@
  #include "gridwin.hxx"
  #include <com/sun/star/view/DocumentZoomType.hpp>
@@ -2149,8 +2149,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-03 14:25:12.000000000 +0800
-+++ sc/source/ui/unoobj/docuno.cxx	2008-06-03 16:01:07.000000000 +0800
+--- sc/source/ui/unoobj/docuno.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/unoobj/docuno.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -92,7 +92,12 @@
  #include "rangeutl.hxx"
  #include "ViewSettingsSequenceDefines.hxx"
@@ -2225,8 +2225,8 @@
  // XServiceInfo
  
  rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
---- 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
+--- sc/inc/docuno.hxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/inc/docuno.hxx	2008-06-04 14:40:31.000000000 +0800
 @@ -55,6 +55,7 @@
  #include <com/sun/star/sheet/XSheetAnnotations.hpp>
  #include <com/sun/star/beans/XPropertySet.hpp>
@@ -2252,8 +2252,8 @@
  };
  
  
---- 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
+--- sc/source/ui/view/gridwin.cxx.orig	2008-06-04 14:39:22.000000000 +0800
++++ sc/source/ui/view/gridwin.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -150,7 +150,13 @@
  #include <svx/sdr/overlay/overlaymanager.hxx>
  #include <vcl/svapp.hxx>
@@ -2352,7 +2352,7 @@
  					            pImp->MousePressed( aEvent );
                              else
                                  pImp->MouseReleased( aEvent );
-@@ -4858,26 +4911,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
+@@ -4856,26 +4909,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
  	ScDocument* pDoc = pDocSh->GetDocument();
  	ScBaseCell* pCell = NULL;
  
@@ -2382,8 +2382,8 @@
  
  	ScHideTextCursor aHideCursor( pViewData, eWhich );	// before GetEditArea (MapMode is changed)
  
---- 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
+--- sc/source/ui/view/tabview3.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sc/source/ui/view/tabview3.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -82,6 +82,10 @@
  #include "client.hxx"
  
@@ -2433,18 +2433,18 @@
  		TabChanged();										// DrawView
  		aViewData.GetViewShell()->WindowChanged();			// falls das aktive Fenster anders ist
          if ( !bUnoRefDialog )
---- 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
-@@ -127,6 +127,7 @@ SLOFILES= \
-                 $(SLO)$/vbacommandbars.obj \
-         $(SLO)$/vbahyperlink.obj \
-         $(SLO)$/vbapagesetup.obj \
-+        $(SLO)$/vbaeventshelper.obj \
+--- sc/source/ui/vba/makefile.mk.orig	2008-06-04 14:39:22.000000000 +0800
++++ sc/source/ui/vba/makefile.mk	2008-06-04 14:43:34.000000000 +0800
+@@ -122,6 +122,7 @@ SLOFILES= \
+ 		$(SLO)$/vbamultipage.obj \
+ 		$(SLO)$/vbapages.obj \
  		$(SLO)$/service.obj \
++        $(SLO)$/vbaeventshelper.obj \
   
  
---- 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
+ # --- Targets ------------------------------------------------------
+--- sfx2/inc/sfx2/objsh.hxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sfx2/inc/sfx2/objsh.hxx	2008-06-04 14:40:31.000000000 +0800
 @@ -304,6 +304,7 @@ public:
      void                        SetNoName();
      sal_Bool                    IsInModalMode() const;
@@ -2473,8 +2473,8 @@
      );
  
      /** adjusts the internal macro mode, according to the current security settings
---- 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
+--- sfx2/source/doc/objmisc.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sfx2/source/doc/objmisc.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -1591,7 +1591,7 @@ namespace
  }
  
@@ -2505,8 +2505,8 @@
  }
  
  //-------------------------------------------------------------------------
---- 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
+--- sfx2/source/doc/objserv.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sfx2/source/doc/objserv.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -28,6 +28,8 @@
   *
   ************************************************************************/
@@ -2543,8 +2543,8 @@
  			//!! detaillierte Auswertung eines Fehlercodes
  			SfxObjectShellRef xLock( this );
  
---- 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
+--- sfx2/source/view/viewprn.cxx.orig	2008-06-04 14:40:23.000000000 +0800
++++ sfx2/source/view/viewprn.cxx	2008-06-04 14:40:31.000000000 +0800
 @@ -28,10 +28,12 @@
   *
   ************************************************************************/
@@ -2606,9 +2606,9 @@
  				bool bDetectHidden = ( !bSilent && pDoc );
  				if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
  					return;
---- 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(
+--- sfx2/source/doc/objxtor.cxx.orig	2008-06-04 14:39:22.000000000 +0800
++++ sfx2/source/doc/objxtor.cxx	2008-06-04 14:40:31.000000000 +0800
+@@ -585,6 +585,13 @@ SfxObjectShell* SfxObjectShell::Current(
  	return pFrame ? pFrame->GetObjectShell() : 0;
  }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]