ooo-build r15174 - in trunk: . patches/dev300

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15174 - in trunk: . patches/dev300
Date: Tue, 27 Jan 2009 20:22:25 +0000 (UTC)
Author: kyoshida
Date: Tue Jan 27 20:22:25 2009
New Revision: 15174
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15174&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-dbrange-dynamic-resize-m39.diff:
	* patches/dev300/sc-dbrange-dynamic-resize.diff:
	* patches/dev300/apply: adjusted for dev300-m40.


Added:
   trunk/patches/dev300/sc-dbrange-dynamic-resize-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/sc-dbrange-dynamic-resize.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-dbrange-dynamic-resize.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 20:22:25 2009
@@ -965,9 +965,15 @@
 # Support print & page preview for files containing only lines
 sc-print-lines.diff, n#351468, i#85076, jonp
 
+[ CalcFixes <= dev300-m39 ]
+# Dynyamically resize filtered range when new data rows are present.
+sc-dbrange-dynamic-resize-m39.diff, n#352662, i#85305, kohei
+
+[ CalcFixes > dev300-m39 ]
 # Dynyamically resize filtered range when new data rows are present.
 sc-dbrange-dynamic-resize.diff, n#352662, i#85305, kohei
 
+[ CalcFixes ]
 # Have cell background paint over the gridlines.
 sc-cellbackground-over-gridlines.diff, n#361360, i#3907, kohei
 

Modified: trunk/patches/dev300/sc-dbrange-dynamic-resize.diff
==============================================================================
--- trunk/patches/dev300/sc-dbrange-dynamic-resize.diff	(original)
+++ trunk/patches/dev300/sc-dbrange-dynamic-resize.diff	Tue Jan 27 20:22:25 2009
@@ -1,7 +1,8 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/dbcolect.hxx sc/inc/dbcolect.hxx
---- sc.clean/inc/dbcolect.hxx	2008-03-03 11:24:43.000000000 -0500
-+++ sc/inc/dbcolect.hxx	2008-03-05 11:52:43.000000000 -0500
-@@ -115,6 +115,7 @@ private:
+diff --git sc/inc/dbcolect.hxx sc/inc/dbcolect.hxx
+index 13db55d..feeec81 100644
+--- sc/inc/dbcolect.hxx
++++ sc/inc/dbcolect.hxx
+@@ -95,6 +95,7 @@ private:
  	ScQueryConnect  eQueryConnect[MAXQUERY];
  	BOOL			bIsAdvanced;		// TRUE if created by advanced filter
  	ScRange			aAdvSource;			// source range
@@ -9,7 +10,7 @@
  	// SubTotalParam
  	BOOL			bSubRemoveOnly;
  	BOOL			bSubReplace;
-@@ -165,9 +166,10 @@ public:
+@@ -142,9 +143,10 @@ public:
  			const String& GetName() const				{ return aName; }
  			void		GetName(String& rName) const	{ rName = aName; }
  			void		SetName(const String& rName)	{ aName = rName; }
@@ -22,19 +23,20 @@
  			void		MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
  			BOOL		IsByRow() const 				{ return bByRow; }
  			void		SetByRow(BOOL bByR) 			{ bByRow = bByR; }
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/document.hxx sc/inc/document.hxx
---- sc.clean/inc/document.hxx	2008-03-03 11:24:43.000000000 -0500
-+++ sc/inc/document.hxx	2008-03-05 11:47:35.000000000 -0500
-@@ -864,7 +864,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
+diff --git sc/inc/document.hxx sc/inc/document.hxx
+index fe8ebe1..b4844a1 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -844,7 +844,7 @@ public:
  	USHORT			GetErrCode( const ScAddress& ) const;
  
  	void			GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
 -									SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld );
 +									SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld ) const;
- 	BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
- 	BOOL			GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
- 	BOOL			GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
-@@ -1381,6 +1381,9 @@ SC_DLLPUBLIC	SvNumberFormatter*	GetForma
+ 	SC_DLLPUBLIC BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
+ 	SC_DLLPUBLIC BOOL			GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
+ 	SC_DLLPUBLIC BOOL			GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
+@@ -1350,6 +1350,9 @@ public:
  										SCTAB nTab, ScQueryParam& rQueryParam );
  	void 			GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr);
  
@@ -42,13 +44,13 @@
 +    void            UpdateDynamicEndRow(ScDBData& rDBData) const;
 +
  	BOOL			GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
- 								TypedStrCollection& rStrings, bool bFilter = false );
+ 								TypedScStrCollection& rStrings, bool bFilter = false );
  	SC_DLLPUBLIC BOOL			GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
-Only in sc/inc: document.hxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/global.hxx sc/inc/global.hxx
---- sc.clean/inc/global.hxx	2008-03-03 11:24:43.000000000 -0500
-+++ sc/inc/global.hxx	2008-03-05 00:52:49.000000000 -0500
-@@ -932,6 +932,8 @@ struct SC_DLLPUBLIC ScQueryParam
+diff --git sc/inc/global.hxx sc/inc/global.hxx
+index f94ed38..7d48689 100644
+--- sc/inc/global.hxx
++++ sc/inc/global.hxx
+@@ -831,6 +831,8 @@ struct SC_DLLPUBLIC ScQueryParam
  	SCTAB			nDestTab;
  	SCCOL			nDestCol;
  	SCROW			nDestRow;
@@ -57,10 +59,11 @@
  
  private:
  	SCSIZE			nEntryCount;
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/table.hxx sc/inc/table.hxx
---- sc.clean/inc/table.hxx	2008-03-03 11:24:44.000000000 -0500
-+++ sc/inc/table.hxx	2008-03-05 00:52:16.000000000 -0500
-@@ -355,7 +355,7 @@ public:
+diff --git sc/inc/table.hxx sc/inc/table.hxx
+index 931e8ac..2378728 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -337,7 +337,7 @@ public:
  						SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow );
  
  	void		GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
@@ -69,12 +72,13 @@
  
  	SCSIZE	    GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
  										SCCOL nEndCol, SCROW nEndRow, ScDirection eDir );
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
---- sc.clean/source/core/data/documen3.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/data/documen3.cxx	2008-03-05 11:47:22.000000000 -0500
-@@ -1282,6 +1282,18 @@ BOOL ScDocument::HasRowHeader( SCCOL nSt
- //	GetFilterEntries - Eintraege fuer AutoFilter-Listbox
- //
+diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
+index 7ad994d..ec6c46c 100644
+--- sc/source/core/data/documen3.cxx
++++ sc/source/core/data/documen3.cxx
+@@ -1269,6 +1269,18 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
+ 	//return FALSE;
+ }
  
 +void ScDocument::UpdateDynamicEndRow(ScDBData& rDBData) const
 +{
@@ -88,10 +92,10 @@
 +    rDBData.SetDynamicEndRow(nRow2a);
 +}
 +
- BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedStrCollection& rStrings, bool bFilter )
- {
- 	if ( ValidTab(nTab) && pTab[nTab] && pDBCollection )
-@@ -1289,6 +1301,7 @@ BOOL ScDocument::GetFilterEntries( SCCOL
+ //
+ //	GetFilterEntries - Eintraege fuer AutoFilter-Listbox
+ //
+@@ -1280,6 +1292,7 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt
  		ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE);	//!??
  		if (pDBData)
  		{
@@ -99,7 +103,7 @@
  			SCTAB nAreaTab;
  			SCCOL nStartCol;
  			SCROW nStartRow;
-@@ -1300,6 +1313,7 @@ BOOL ScDocument::GetFilterEntries( SCCOL
+@@ -1291,6 +1304,7 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt
  
  			ScQueryParam aParam;
  			pDBData->GetQueryParam( aParam );
@@ -107,11 +111,11 @@
  			rStrings.SetCaseSensitive( aParam.bCaseSens );
  
              // return all filter entries, if a filter condition is connected with a boolean OR
-Only in sc/source/core/data: documen3.cxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/document.cxx sc/source/core/data/document.cxx
---- sc.clean/source/core/data/document.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/data/document.cxx	2008-03-04 22:23:36.000000000 -0500
-@@ -584,7 +584,7 @@ BOOL ScDocument::GetTableArea( SCTAB nTa
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index fa98376..5844fa0 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -598,7 +598,7 @@ BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
  //	zusammenhaengender Bereich
  
  void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
@@ -120,11 +124,11 @@
  {
  	if (VALIDTAB(nTab))
  		if (pTab[nTab])
-Only in sc/source/core/data: document.cxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/global2.cxx sc/source/core/data/global2.cxx
---- sc.clean/source/core/data/global2.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/data/global2.cxx	2008-03-05 00:56:41.000000000 -0500
-@@ -295,7 +295,8 @@ ScQueryParam::ScQueryParam( const ScQuer
+diff --git sc/source/core/data/global2.cxx sc/source/core/data/global2.cxx
+index 6d3169f..58b43e2 100644
+--- sc/source/core/data/global2.cxx
++++ sc/source/core/data/global2.cxx
+@@ -256,7 +256,8 @@ ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
  		bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
  		bRegExp(r.bRegExp), bMixedComparison(r.bMixedComparison),
          bDuplicate(r.bDuplicate), bDestPers(r.bDestPers),
@@ -134,7 +138,7 @@
  {
  	nEntryCount = 0;
  
-@@ -321,6 +322,8 @@ void ScQueryParam::Clear()
+@@ -282,6 +283,8 @@ void ScQueryParam::Clear()
  	nTab = SCTAB_MAX;
  	bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
  	bInplace = bByRow = bDuplicate = bDestPers = TRUE;
@@ -143,7 +147,7 @@
  
  	Resize( MAXQUERY );
  	for (USHORT i=0; i<MAXQUERY; i++)
-@@ -347,6 +350,8 @@ ScQueryParam& ScQueryParam::operator=( c
+@@ -308,6 +311,8 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
  	bDuplicate	= r.bDuplicate;
  	bByRow		= r.bByRow;
  	bDestPers	= r.bDestPers;
@@ -152,7 +156,7 @@
  
  	Resize( r.nEntryCount );
  	for (USHORT i=0; i<nEntryCount; i++)
-@@ -384,7 +389,9 @@ BOOL ScQueryParam::operator==( const ScQ
+@@ -345,7 +350,9 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
  		&& (bDestPers   == rOther.bDestPers)
  		&& (nDestTab	== rOther.nDestTab)
  		&& (nDestCol	== rOther.nDestCol)
@@ -163,7 +167,7 @@
  	{
  		bEqual = TRUE;
  		for ( USHORT i=0; i<nUsed && bEqual; i++ )
-@@ -446,6 +453,7 @@ void ScQueryParam::MoveToDest()
+@@ -407,6 +414,7 @@ void ScQueryParam::MoveToDest()
          nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
          nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
          nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
@@ -171,10 +175,11 @@
  		for (USHORT i=0; i<nEntryCount; i++)
  			pEntries[i].nField += nDifX;
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/table1.cxx sc/source/core/data/table1.cxx
---- sc.clean/source/core/data/table1.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/data/table1.cxx	2008-03-04 22:23:36.000000000 -0500
-@@ -665,7 +665,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStar
+diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
+index c831b0b..92442ff 100644
+--- sc/source/core/data/table1.cxx
++++ sc/source/core/data/table1.cxx
+@@ -664,7 +664,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
  }
  
  void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
@@ -183,11 +188,11 @@
  {
  	BOOL bLeft       = FALSE;
  	BOOL bRight  = FALSE;
-Only in sc/source/core/data: table1.cxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/table3.cxx sc/source/core/data/table3.cxx
---- sc.clean/source/core/data/table3.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/data/table3.cxx	2008-03-05 11:10:54.000000000 -0500
-@@ -1363,6 +1363,7 @@ SCSIZE ScTable::Query(ScQueryParam& rPar
+diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx
+index f840689..f17fcef 100644
+--- sc/source/core/data/table3.cxx
++++ sc/source/core/data/table3.cxx
+@@ -1558,6 +1558,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
  	BOOL* pSpecial = new BOOL[nEntryCount];
      lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
  
@@ -195,7 +200,7 @@
  	if (!aParam.bInplace)
  	{
  		nOutRow = aParam.nDestRow + nHeader;
-@@ -1371,7 +1372,7 @@ SCSIZE ScTable::Query(ScQueryParam& rPar
+@@ -1566,7 +1567,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
  							aParam.nDestCol, aParam.nDestRow, aParam.nDestTab );
  	}
  
@@ -204,10 +209,11 @@
  	{
  		BOOL bResult;									// Filterergebnis
  		BOOL bValid = ValidQuery(j, aParam, pSpecial);
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx
---- sc.clean/source/core/tool/dbcolect.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/tool/dbcolect.cxx	2008-03-05 11:52:55.000000000 -0500
-@@ -671,18 +671,20 @@ String ScDBData::GetOperations() const
+diff --git sc/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx
+index 74fae17..419e7e8 100644
+--- sc/source/core/tool/dbcolect.cxx
++++ sc/source/core/tool/dbcolect.cxx
+@@ -378,18 +378,20 @@ String ScDBData::GetOperations() const
  	return aVal;
  }
  
@@ -232,7 +238,7 @@
  }
  
  void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
-@@ -694,6 +696,11 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL
+@@ -401,6 +403,11 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
  	nEndRow   = nRow2;
  }
  
@@ -244,7 +250,7 @@
  void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
  {
  	USHORT i;
-@@ -799,6 +806,7 @@ void ScDBData::GetQueryParam( ScQueryPar
+@@ -508,6 +515,7 @@ void ScDBData::GetQueryParam( ScQueryParam& rQueryParam ) const
  	rQueryParam.nDestTab = nQueryDestTab;
  	rQueryParam.nDestCol = nQueryDestCol;
  	rQueryParam.nDestRow = nQueryDestRow;
@@ -252,10 +258,11 @@
  
  	rQueryParam.Resize( MAXQUERY );
  	for (SCSIZE i=0; i<MAXQUERY; i++)
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
---- sc.clean/source/ui/dbgui/filtdlg.cxx	2008-03-03 11:24:49.000000000 -0500
-+++ sc/source/ui/dbgui/filtdlg.cxx	2008-03-05 11:11:49.000000000 -0500
-@@ -403,7 +403,7 @@ void ScFilterDlg::UpdateValueList( USHOR
+diff --git sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
+index 2654ef9..dc4fb13 100644
+--- sc/source/ui/dbgui/filtdlg.cxx
++++ sc/source/ui/dbgui/filtdlg.cxx
+@@ -390,7 +390,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
  			{
  				SCTAB nTab		 = nSrcTab;
  				SCROW nFirstRow = theQueryData.nRow1;
@@ -264,10 +271,11 @@
  
  				//	erstmal ohne die erste Zeile
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
---- sc.clean/source/ui/inc/dbfunc.hxx	2008-03-03 11:24:45.000000000 -0500
-+++ sc/source/ui/inc/dbfunc.hxx	2008-03-04 22:23:36.000000000 -0500
-@@ -85,7 +85,7 @@ public:
+diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
+index cb4797c..8556472 100644
+--- sc/source/ui/inc/dbfunc.hxx
++++ sc/source/ui/inc/dbfunc.hxx
+@@ -80,7 +80,7 @@ public:
  	void			GotoDBArea( const String& rDBName );
  
  					// DB-Bereich vom Cursor
@@ -276,10 +284,11 @@
  
  	void			NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
---- sc.clean/source/ui/view/dbfunc.cxx	2008-03-03 11:24:49.000000000 -0500
-+++ sc/source/ui/view/dbfunc.cxx	2008-03-05 11:47:22.000000000 -0500
-@@ -112,7 +112,7 @@ void ScDBFunc::GotoDBArea( const String&
+diff --git sc/source/ui/view/dbfunc.cxx sc/source/ui/view/dbfunc.cxx
+index ee42e57..3bb5742 100644
+--- sc/source/ui/view/dbfunc.cxx
++++ sc/source/ui/view/dbfunc.cxx
+@@ -107,7 +107,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
  
  //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
  
@@ -288,7 +297,7 @@
  {
  	ScDocShell* pDocSh = GetViewData()->GetDocShell();
  	ScDBData* pData = NULL;
-@@ -124,11 +124,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMar
+@@ -119,11 +119,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode )
  					ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
  							 GetViewData()->GetTabNo() ),
  					eMode, FALSE );
@@ -311,10 +320,11 @@
  		MarkRange( aFound, FALSE );
  	}
  	return pData;
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
---- sc.clean/source/ui/view/gridwin.cxx	2008-03-03 11:24:49.000000000 -0500
-+++ sc/source/ui/view/gridwin.cxx	2008-03-05 11:12:33.000000000 -0500
-@@ -1224,6 +1224,7 @@ void ScGridWindow::ExecFilter( ULONG nSe
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index 0dd7b47..63a1785 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -1235,6 +1235,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
  					pViewData->GetViewShell()->UpdateInputHandler();
  				}
  
@@ -322,10 +332,11 @@
  				pViewData->GetView()->Query( aParam, NULL, TRUE );
  				pDBData->SetQueryParam( aParam );							// speichern
  			}
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/tabvwshc.cxx sc/source/ui/view/tabvwshc.cxx
---- sc.clean/source/ui/view/tabvwshc.cxx	2008-03-03 11:24:49.000000000 -0500
-+++ sc/source/ui/view/tabvwshc.cxx	2008-03-05 11:43:37.000000000 -0500
-@@ -195,8 +195,9 @@ SfxModelessDialog* ScTabViewShell::Creat
+diff --git sc/source/ui/view/tabvwshc.cxx sc/source/ui/view/tabvwshc.cxx
+index 9c17453..aa38b7a 100644
+--- sc/source/ui/view/tabvwshc.cxx
++++ sc/source/ui/view/tabvwshc.cxx
+@@ -178,8 +178,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
  									 SCITEM_QUERYDATA,
  									 SCITEM_QUERYDATA );
  
@@ -336,7 +347,7 @@
  
  			ScQueryItem aItem( SCITEM_QUERYDATA, GetViewData(), &aQueryParam );
  			ScRange aAdvSource;
-@@ -220,8 +221,9 @@ SfxModelessDialog* ScTabViewShell::Creat
+@@ -203,8 +204,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
  									 SCITEM_QUERYDATA,
  									 SCITEM_QUERYDATA );
  
@@ -347,4 +358,3 @@
  
  			aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA,
  									  GetViewData(),
-Only in sc/source/ui/view: tabvwshc.cxx.orig
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]