ooo-build r12748 - trunk/patches/test/vba

[jiaojh svn gnome org]

Author: jiaojh
Date: Mon Jun  2 05:24:19 2008
New Revision: 12748
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12748&view=rev

Log:
clear up


Modified:
   trunk/patches/test/vba/vbaevents.diff

Modified: trunk/patches/test/vba/vbaevents.diff
==============================================================================
--- trunk/patches/test/vba/vbaevents.diff	(original)
+++ trunk/patches/test/vba/vbaevents.diff	Mon Jun  2 05:24:19 2008
@@ -1502,17 +1502,16 @@
      void                SetStorageGrammar( ScGrammar::Grammar eGrammar );
      ScGrammar::Grammar  GetStorageGrammar() const
 --- sc/source/core/data/documen2.cxx.orig	2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/core/data/documen2.cxx	2008-05-27 12:40:39.000000000 +0800
-@@ -93,6 +93,8 @@
++++ sc/source/core/data/documen2.cxx	2008-06-02 13:45:47.000000000 +0800
+@@ -93,6 +93,7 @@
  #include "listenercalls.hxx"
  #include "recursionhelper.hxx"
  #include "lookupcache.hxx"
-+//#include "vbaeventshelper.hxx"
 +#include <com/sun/star/document/XVbaEventsHelper.hpp>
  
  // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
  // dtor is convenient.
-@@ -146,6 +148,7 @@ ScDocument::ScDocument( ScDocumentMode	e
+@@ -146,6 +147,7 @@ ScDocument::ScDocument( ScDocumentMode	e
          pRecursionHelper( NULL ),
          pAutoNameCache( NULL ),
          pLookupCacheMapImpl( NULL ),
@@ -1520,7 +1519,7 @@
          nUnoObjectId( 0 ),
          nRangeOverflowType( 0 ),
  		aCurTextWidthCalcPos(MAXCOL,0,0),
-@@ -434,6 +437,12 @@ ScDocument::~ScDocument()
+@@ -434,6 +436,12 @@ ScDocument::~ScDocument()
  	delete pOtherObjects;
      delete pRecursionHelper;
  
@@ -1533,7 +1532,7 @@
      DBG_ASSERT( !pAutoNameCache, "AutoNameCache still set in dtor" );
  }
  
-@@ -1857,3 +1866,26 @@ void ScDocument::RemoveLookupCache( ScLo
+@@ -1857,3 +1865,26 @@ void ScDocument::RemoveLookupCache( ScLo
          EndListeningArea( pCache->getRange(), &rCache);
      }
  }
@@ -1561,12 +1560,11 @@
 +	return rVbaEventsHelper;
 +}
 --- sc/source/core/data/documen7.cxx.orig	2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/core/data/documen7.cxx	2008-05-30 12:26:31.000000000 +0800
-@@ -59,7 +59,16 @@
++++ sc/source/core/data/documen7.cxx	2008-06-02 13:46:02.000000000 +0800
+@@ -59,7 +59,15 @@
  
  
  #include "globstr.hrc"
-+//#include "vbaeventshelper.hxx"
 +#include <algorithm>
 +#include <vector>
  
@@ -1579,7 +1577,7 @@
  extern const ScFormulaCell* pLastFormulaTreeTop;	// cellform.cxx Err527 WorkAround
  
  // STATIC DATA -----------------------------------------------------------
-@@ -449,6 +458,7 @@ void ScDocument::TrackFormulas( ULONG nH
+@@ -449,6 +457,7 @@ void ScDocument::TrackFormulas( ULONG nH
  		ScFormulaCell* pTrack;
  		ScFormulaCell* pNext;
  		pTrack = pFormulaTrack;
@@ -1587,7 +1585,7 @@
  		do
  		{
  			ScHint aHint( nHintId, pTrack->aPos, pTrack );
-@@ -458,6 +468,12 @@ void ScDocument::TrackFormulas( ULONG nH
+@@ -458,6 +467,12 @@ void ScDocument::TrackFormulas( ULONG nH
  			//	Repaint fuer bedingte Formate mit relativen Referenzen:
  			if ( pCondFormList )
  				pCondFormList->SourceChanged( pTrack->aPos );
@@ -1600,7 +1598,7 @@
  			pTrack = pTrack->GetNextTrack();
  		} while ( pTrack );
  		pTrack = pFormulaTrack;
-@@ -480,6 +496,18 @@ void ScDocument::TrackFormulas( ULONG nH
+@@ -480,6 +495,18 @@ void ScDocument::TrackFormulas( ULONG nH
  			else
  				SetForcedFormulaPending( TRUE );
  		}
@@ -1634,13 +1632,12 @@
 +        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
 +        echo $@
 --- sc/source/ui/docshell/docsh.cxx.orig	2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/docshell/docsh.cxx	2008-05-30 15:56:49.000000000 +0800
-@@ -131,6 +131,14 @@
++++ sc/source/ui/docshell/docsh.cxx	2008-06-02 13:46:41.000000000 +0800
+@@ -131,6 +131,13 @@
  #include <rtl/logfile.hxx>
  
  #include <comphelper/processfactory.hxx>
 +#include "uiitems.hxx"
-+//#include "vbaeventshelper.hxx"
 +#include "cellsuno.hxx"
 +#include <com/sun/star/document/XVbaEventsHelper.hpp>
 +#include <com/sun/star/document/VbaEventId.hpp>
@@ -1650,7 +1647,7 @@
  
  using namespace com::sun::star;
  
-@@ -719,9 +727,70 @@ BOOL __EXPORT ScDocShell::Load( SfxMediu
+@@ -719,9 +726,70 @@ BOOL __EXPORT ScDocShell::Load( SfxMediu
  	return bRet;
  }
  
@@ -1721,7 +1718,7 @@
  	if (rHint.ISA(SfxSimpleHint))								// ohne Parameter
  	{
  		ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId();
-@@ -2246,6 +2315,16 @@ USHORT __EXPORT ScDocShell::PrepareClose
+@@ -2246,6 +2314,16 @@ USHORT __EXPORT ScDocShell::PrepareClose
  
  	DoEnterHandler();
  
@@ -1738,7 +1735,7 @@
  	USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
  	if (nRet == TRUE)						// TRUE = schliessen
  		aDocument.DisableIdle(TRUE);		// nicht mehr drin rumpfuschen !!!
-@@ -2455,6 +2534,43 @@ void ScDocShell::SetModified( BOOL bModi
+@@ -2455,6 +2533,43 @@ void ScDocShell::SetModified( BOOL bModi
  	}
  }
  
@@ -2260,12 +2257,11 @@
  
  
 --- sc/source/ui/view/gridwin.cxx.orig	2008-05-07 12:06:10.000000000 +0800
-+++ sc/source/ui/view/gridwin.cxx	2008-05-30 16:11:00.000000000 +0800
-@@ -149,7 +149,14 @@
++++ sc/source/ui/view/gridwin.cxx	2008-06-02 13:46:55.000000000 +0800
+@@ -149,7 +149,13 @@
  #include <svx/sdr/overlay/overlaymanager.hxx>
  #include <vcl/svapp.hxx>
  
-+//#include "vbaeventshelper.hxx"
 +#include "cellsuno.hxx"
 +
 +#include <com/sun/star/document/XVbaEventsHelper.hpp>
@@ -2276,7 +2272,7 @@
  using ::com::sun::star::uno::Sequence;
  using ::com::sun::star::uno::Any;
  
-@@ -398,6 +405,32 @@ void lcl_UnLockComment( SdrView* pView, 
+@@ -398,6 +404,32 @@ void lcl_UnLockComment( SdrView* pView, 
  
  }
  
@@ -2309,7 +2305,7 @@
  //==================================================================
  
  //	WB_DIALOGCONTROL noetig fuer UNO-Controls
-@@ -1442,6 +1475,7 @@ void ScGridWindow::HandleMouseButtonDown
+@@ -1442,6 +1474,7 @@ void ScGridWindow::HandleMouseButtonDown
  	SCCOL	nOldColFBox	  = bWasFilterBox ? pFilterBox->GetCol() : 0;
  	SCROW  nOldRowFBox	  = bWasFilterBox ? pFilterBox->GetRow() : 0;
  #endif
@@ -2317,7 +2313,7 @@
  
  	ClickExtern();	// loescht FilterBox, wenn vorhanden
  
-@@ -2122,6 +2156,26 @@ void __EXPORT ScGridWindow::MouseButtonU
+@@ -2122,6 +2155,26 @@ void __EXPORT ScGridWindow::MouseButtonU
  		{
  			nMouseStatus = SC_GM_NONE;				// keinen Doppelklick anfangen
  			ScGlobal::OpenURL( aUrl, aTarget );
@@ -2344,7 +2340,7 @@
  			return;
  		}
  	}
-@@ -2441,13 +2495,13 @@ long ScGridWindow::PreNotify( NotifyEven
+@@ -2441,13 +2494,13 @@ long ScGridWindow::PreNotify( NotifyEven
  			        if (xController.is())
  			        {
  				        ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController );
@@ -2360,7 +2356,7 @@
  					            pImp->MousePressed( aEvent );
                              else
                                  pImp->MouseReleased( aEvent );
-@@ -4857,26 +4911,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
+@@ -4857,26 +4910,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
  	ScDocument* pDoc = pDocSh->GetDocument();
  	ScBaseCell* pCell = NULL;
  
@@ -2391,12 +2387,9 @@
  	ScHideTextCursor aHideCursor( pViewData, eWhich );	// before GetEditArea (MapMode is changed)
  
 --- sc/source/ui/view/tabview3.cxx.orig	2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/view/tabview3.cxx	2008-05-28 16:32:00.000000000 +0800
-@@ -80,8 +80,13 @@
- #include "rangeutl.hxx"
- #include "client.hxx"
++++ sc/source/ui/view/tabview3.cxx	2008-06-02 13:47:09.000000000 +0800
+@@ -82,6 +82,10 @@
  #include "tabprotection.hxx"
-+//#include "vbaeventshelper.hxx"
  
  #include <com/sun/star/chart2/data/HighlightedRange.hpp>
 +#include <com/sun/star/document/XVbaEventsHelper.hpp>
@@ -2406,7 +2399,7 @@
  
  namespace
  {
-@@ -1684,6 +1689,17 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
+@@ -1684,6 +1688,17 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
  										//	nicht InputEnterHandler wegen Referenzeingabe !
  
  		ScDocument* pDoc = aViewData.GetDocument();
@@ -2424,7 +2417,7 @@
  		pDoc->MakeTable( nTab );
  
  		SCTAB nTabCount = pDoc->GetTableCount();
-@@ -1782,7 +1798,18 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
+@@ -1782,7 +1797,18 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
  					if ( pGridWin[i]->IsVisible() )
  						pGridWin[i]->UpdateEditViewPos();
  		}