GNOME.org
 

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

Author: kyoshida
Date: Sun May 18 06:33:08 2008
New Revision: 12584
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12584&view=rev

Log:
2008-05-18  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-overwrite-char-font-attrs.diff: don't overwrite
	character font attributes while importing XML document, because doing
	so would remove any character font attributes in cells with their own
	font attributes (i#89598).


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sc-overwrite-char-font-attrs.diff

Modified: trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/dev300/sc-overwrite-char-font-attrs.diff	(original)
+++ trunk/patches/dev300/sc-overwrite-char-font-attrs.diff	Sun May 18 06:33:08 2008
@@ -1,6 +1,6 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/attarray.hxx sc/inc/attarray.hxx
---- sc.clean/inc/attarray.hxx	2008-04-01 12:26:30.000000000 -0400
-+++ sc/inc/attarray.hxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/inc/attarray.hxx sc/inc/attarray.hxx
+--- sc.clean/inc/attarray.hxx	2008-05-18 01:44:42.000000000 -0400
++++ sc/inc/attarray.hxx	2008-05-18 01:44:58.000000000 -0400
 @@ -45,6 +45,7 @@
  #endif
  
@@ -23,9 +23,9 @@
  	void	ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
  								const SvxBorderLine* pLine, BOOL bColorOnly );
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/cell.hxx sc/inc/cell.hxx
---- sc.clean/inc/cell.hxx	2008-04-01 12:26:30.000000000 -0400
-+++ sc/inc/cell.hxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/inc/cell.hxx sc/inc/cell.hxx
+--- sc.clean/inc/cell.hxx	2008-05-18 01:44:42.000000000 -0400
++++ sc/inc/cell.hxx	2008-05-18 01:44:58.000000000 -0400
 @@ -39,6 +39,9 @@
  #include <stddef.h>
  
@@ -36,7 +36,7 @@
  #include <tools/mempool.hxx>
  #include <svtools/listener.hxx>
  #include "global.hxx"
-@@ -82,6 +85,7 @@ class ScCodeArray;
+@@ -76,6 +79,7 @@ class ScCodeArray;
  class ScTokenArray;
  class ScProgress;
  class ScPostIt;
@@ -44,7 +44,7 @@
  
  class ScMultipleReadHeader;
  class ScMultipleWriteHeader;
-@@ -241,8 +245,57 @@ public:
+@@ -230,8 +234,57 @@ public:
  	const EditTextObject* GetData() const	{ return pData; }
  
  	void			Save( SvStream& rStream ) const;
@@ -102,10 +102,9 @@
  enum ScMatrixMode {
      MM_NONE      = 0,                   // No matrix formula
      MM_FORMULA   = 1,                   // Upper left matrix formula cell
-Only in sc/inc: cell.hxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/column.hxx sc/inc/column.hxx
---- sc.clean/inc/column.hxx	2008-04-01 12:26:30.000000000 -0400
-+++ sc/inc/column.hxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/inc/column.hxx sc/inc/column.hxx
+--- sc.clean/inc/column.hxx	2008-05-18 01:44:42.000000000 -0400
++++ sc/inc/column.hxx	2008-05-18 01:44:58.000000000 -0400
 @@ -73,6 +73,7 @@ class ScAttrIterator;
  class ScAttrArray;
  class ScBaseCell;
@@ -133,10 +132,10 @@
  	void		DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
  
  	void		ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
-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-04-01 12:26:30.000000000 -0400
-+++ sc/inc/document.hxx	2008-04-21 12:25:29.000000000 -0400
-@@ -1137,7 +1137,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/inc/document.hxx sc/inc/document.hxx
+--- sc.clean/inc/document.hxx	2008-05-18 01:44:42.000000000 -0400
++++ sc/inc/document.hxx	2008-05-18 01:44:58.000000000 -0400
+@@ -1130,7 +1130,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
  									const ScPatternAttr& rAttr );
  	void			ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
  										SCCOL nEndCol, SCROW nEndRow,
@@ -146,7 +145,7 @@
  	void			ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow,
  											SCCOL nEndCol, SCROW nEndRow, SCTAB nTab,
  											const ScPatternAttr& rAttr );
-@@ -1204,7 +1205,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
+@@ -1197,7 +1198,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
  							SCCOL nVCol, SCROW nVRow, SCTAB nVTab,
  							const String& sValStr, double& nX);
  
@@ -156,10 +155,10 @@
  	void			DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
  	void			DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark );
  
-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-04-01 12:26:30.000000000 -0400
-+++ sc/inc/table.hxx	2008-04-21 12:25:29.000000000 -0400
-@@ -74,6 +74,7 @@ class ScAutoFormatData;
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/inc/table.hxx sc/inc/table.hxx
+--- sc.clean/inc/table.hxx	2008-05-18 01:44:42.000000000 -0400
++++ sc/inc/table.hxx	2008-05-18 01:44:58.000000000 -0400
+@@ -77,6 +77,7 @@ class ScAutoFormatData;
  class ScBaseCell;
  class ScDocument;
  class ScDrawLayer;
@@ -167,7 +166,7 @@
  class ScFormulaCell;
  class ScOutlineTable;
  class ScPostIt;
-@@ -466,7 +467,8 @@ public:
+@@ -472,7 +473,8 @@ public:
  
  	void		ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr );
  	void		ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );
@@ -177,7 +176,7 @@
  	void		SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE )
  					{ aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool ); }
  	void		SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE );
-@@ -494,7 +496,7 @@ public:
+@@ -500,7 +502,7 @@ public:
  	BOOL		ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
  	BOOL		RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
  
@@ -186,9 +185,9 @@
  	void		DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
  
  	void		ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
---- sc.clean/source/core/data/attarray.cxx	2008-04-01 12:26:36.000000000 -0400
-+++ sc/source/core/data/attarray.cxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
+--- sc.clean/source/core/data/attarray.cxx	2008-05-18 01:44:46.000000000 -0400
++++ sc/source/core/data/attarray.cxx	2008-05-18 01:52:28.000000000 -0400
 @@ -46,6 +46,7 @@
  #include <svx/bolnitem.hxx>
  #include <svx/frmdiritem.hxx>
@@ -216,27 +215,32 @@
  {
  	if (ValidRow(nStartRow) && ValidRow(nEndRow))
  	{
-@@ -480,6 +482,27 @@ void ScAttrArray::SetPatternArea(SCROW n
+@@ -480,6 +482,32 @@ void ScAttrArray::SetPatternArea(SCROW n
                      pData[nInsert-1].nRow = nStartRow - 1;
                  pData[nInsert].nRow = nEndRow;
                  pData[nInsert].pPattern = pPattern;
 +
-+                // Remove character attributes from these cells.
-+                for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
++                // Remove character attributes from these cells if the pattern
++                // is applied during normal session.  We don't want to do this
++                // while importing document.
++                if (!pDocument->IsImportingXML())
 +                {
-+                    ScBaseCell* pCell;
-+                    pDocument->GetCell(nCol, nRow, nTab, pCell);
-+                    if (pCell && pCell->GetCellType() == CELLTYPE_EDIT)
++                    for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
 +                    {
-+                        EditTextObject* pOldData = NULL;
-+                        ScEditCell* pEditCell = static_cast<ScEditCell*>(pCell);
-+                        if (pDataArray)
-+                            pOldData = pEditCell->GetData()->Clone();
-+                        pEditCell->RemoveCharAttribs(*pPattern);
-+                        if (pDataArray)
++                        ScBaseCell* pCell;
++                        pDocument->GetCell(nCol, nRow, nTab, pCell);
++                        if (pCell && pCell->GetCellType() == CELLTYPE_EDIT)
 +                        {
-+                            EditTextObject* pNewData = pEditCell->GetData()->Clone();
-+                            pDataArray->AddItem(nTab, nCol, nRow, pOldData, pNewData);
++                            EditTextObject* pOldData = NULL;
++                            ScEditCell* pEditCell = static_cast<ScEditCell*>(pCell);
++                            if (pDataArray)
++                                pOldData = pEditCell->GetData()->Clone();
++                            pEditCell->RemoveCharAttribs(*pPattern);
++                            if (pDataArray)
++                            {
++                                EditTextObject* pNewData = pEditCell->GetData()->Clone();
++                                pDataArray->AddItem(nTab, nCol, nRow, pOldData, pNewData);
++                            }
 +                        }
 +                    }
 +                }
@@ -244,7 +248,7 @@
                  nCount++;
              }
  		}
-@@ -715,7 +738,7 @@ void ScAttrArray::ApplyLineStyleArea( SC
+@@ -715,7 +743,7 @@ void ScAttrArray::ApplyLineStyleArea( SC
  #undef SET_LINE
  
  
@@ -253,7 +257,7 @@
  {
  #ifdef DBG_UTIL
  	TestData();
-@@ -750,7 +773,7 @@ void ScAttrArray::ApplyCacheArea( SCROW 
+@@ -750,7 +778,7 @@ void ScAttrArray::ApplyCacheArea( SCROW 
  				{
  					if (nY1 < nStartRow) nY1=nStartRow;
  					if (nY2 > nEndRow) nY2=nEndRow;
@@ -262,9 +266,9 @@
  					Search( nStart, nPos );
  				}
  				else
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
---- sc.clean/source/core/data/cell2.cxx	2008-04-01 12:26:36.000000000 -0400
-+++ sc/source/core/data/cell2.cxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
+--- sc.clean/source/core/data/cell2.cxx	2008-05-18 01:44:46.000000000 -0400
++++ sc/source/core/data/cell2.cxx	2008-05-18 01:44:58.000000000 -0400
 @@ -61,7 +61,8 @@
  #include "editutil.hxx"
  #include "chgtrack.hxx"
@@ -379,11 +383,11 @@
 +
  //---------------------------------------------------------------------
  
- BOOL ScFormulaCell::IsEmpty()
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/column.cxx sc/source/core/data/column.cxx
---- sc.clean/source/core/data/column.cxx	2008-04-01 12:26:36.000000000 -0400
-+++ sc/source/core/data/column.cxx	2008-04-21 12:25:29.000000000 -0400
-@@ -374,7 +374,7 @@ ULONG ScColumn::GetNumberFormat( SCROW n
+ void ScFormulaCell::GetEnglishFormula( String& rFormula, BOOL bCompileXML,
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/core/data/column.cxx sc/source/core/data/column.cxx
+--- sc.clean/source/core/data/column.cxx	2008-05-18 01:44:46.000000000 -0400
++++ sc/source/core/data/column.cxx	2008-05-18 01:44:58.000000000 -0400
+@@ -370,7 +370,7 @@ ULONG ScColumn::GetNumberFormat( SCROW n
  }
  
  
@@ -392,7 +396,7 @@
  {
      SCROW nTop = 0;
      SCROW nBottom = 0;
-@@ -385,7 +385,7 @@ SCsROW ScColumn::ApplySelectionCache( Sf
+@@ -381,7 +381,7 @@ SCsROW ScColumn::ApplySelectionCache( Sf
  		ScMarkArrayIter aMarkIter( rMark.GetArray() + nCol );
  		while (aMarkIter.Next( nTop, nBottom ))
  		{
@@ -401,7 +405,7 @@
  			bFound = TRUE;
  		}
  	}
-@@ -459,11 +459,12 @@ void ScColumn::ApplyPattern( SCROW nRow,
+@@ -455,11 +455,12 @@ void ScColumn::ApplyPattern( SCROW nRow,
  }
  
  
@@ -416,10 +420,10 @@
  }
  
  
-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-04-01 12:26:36.000000000 -0400
-+++ sc/source/core/data/document.cxx	2008-04-21 12:25:29.000000000 -0400
-@@ -3018,12 +3018,13 @@ void ScDocument::ApplyPattern( SCCOL nCo
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/core/data/document.cxx sc/source/core/data/document.cxx
+--- sc.clean/source/core/data/document.cxx	2008-05-18 01:44:46.000000000 -0400
++++ sc/source/core/data/document.cxx	2008-05-18 01:44:58.000000000 -0400
+@@ -3049,12 +3049,13 @@ void ScDocument::ApplyPattern( SCCOL nCo
  void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
  						SCCOL nEndCol, SCROW nEndRow,
  						const ScMarkData& rMark,
@@ -435,7 +439,7 @@
  }
  
  
-@@ -4112,7 +4113,7 @@ void ScDocument::ApplyFrameAreaTab( cons
+@@ -4143,7 +4144,7 @@ void ScDocument::ApplyFrameAreaTab( cons
  }
  
  
@@ -444,7 +448,7 @@
  {
  	const SfxItemSet* pSet = &rAttr.GetItemSet();
  	BOOL bSet = FALSE;
-@@ -4129,7 +4130,7 @@ void ScDocument::ApplySelectionPattern( 
+@@ -4160,7 +4161,7 @@ void ScDocument::ApplySelectionPattern( 
  			ScRange aRange;
  			rMark.GetMarkArea( aRange );
  			ApplyPatternArea( aRange.aStart.Col(), aRange.aStart.Row(),
@@ -453,7 +457,7 @@
  		}
  		else
  		{
-@@ -4137,7 +4138,7 @@ void ScDocument::ApplySelectionPattern( 
+@@ -4168,7 +4169,7 @@ void ScDocument::ApplySelectionPattern( 
              for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
                  if (pTab[nTab])
                      if (rMark.GetTableSelect(nTab))
@@ -462,9 +466,9 @@
  		}
  	}
  }
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/table2.cxx sc/source/core/data/table2.cxx
---- sc.clean/source/core/data/table2.cxx	2008-04-01 12:26:36.000000000 -0400
-+++ sc/source/core/data/table2.cxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/core/data/table2.cxx sc/source/core/data/table2.cxx
+--- sc.clean/source/core/data/table2.cxx	2008-05-18 01:44:46.000000000 -0400
++++ sc/source/core/data/table2.cxx	2008-05-18 01:44:58.000000000 -0400
 @@ -1657,14 +1657,14 @@ void ScTable::ApplyPattern( SCCOL nCol, 
  
  
@@ -496,9 +500,9 @@
  }
  
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
---- sc.clean/source/ui/inc/undoblk.hxx	2008-04-01 12:26:31.000000000 -0400
-+++ sc/source/ui/inc/undoblk.hxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
+--- sc.clean/source/ui/inc/undoblk.hxx	2008-05-18 01:44:43.000000000 -0400
++++ sc/source/ui/inc/undoblk.hxx	2008-05-18 01:44:58.000000000 -0400
 @@ -48,6 +48,10 @@
  #include "spellparam.hxx"
  #endif
@@ -530,9 +534,9 @@
  };
  
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/undocell.hxx sc/source/ui/inc/undocell.hxx
---- sc.clean/source/ui/inc/undocell.hxx	2008-04-01 12:26:31.000000000 -0400
-+++ sc/source/ui/inc/undocell.hxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/ui/inc/undocell.hxx sc/source/ui/inc/undocell.hxx
+--- sc.clean/source/ui/inc/undocell.hxx	2008-05-18 01:44:43.000000000 -0400
++++ sc/source/ui/inc/undocell.hxx	2008-05-18 01:44:58.000000000 -0400
 @@ -43,6 +43,8 @@
  #include "postit.hxx"
  #endif
@@ -567,10 +571,10 @@
  };
  
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/undo/makefile.mk sc/source/ui/undo/makefile.mk
---- sc.clean/source/ui/undo/makefile.mk	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/undo/makefile.mk	2008-04-21 12:25:29.000000000 -0400
-@@ -82,6 +82,7 @@ SLOFILES =  \
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/ui/undo/makefile.mk sc/source/ui/undo/makefile.mk
+--- sc.clean/source/ui/undo/makefile.mk	2008-05-18 01:44:43.000000000 -0400
++++ sc/source/ui/undo/makefile.mk	2008-05-18 01:44:58.000000000 -0400
+@@ -89,6 +89,7 @@ SLOFILES =  \
  		$(SLO)$/undotab.obj
  
  EXCEPTIONSFILES= \
@@ -578,10 +582,10 @@
      $(SLO)$/undostyl.obj
  
  # --- Tagets -------------------------------------------------------
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
---- sc.clean/source/ui/undo/undoblk3.cxx	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/undo/undoblk3.cxx	2008-04-21 12:25:29.000000000 -0400
-@@ -464,6 +464,12 @@ String __EXPORT ScUndoSelectionAttr::Get
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
+--- sc.clean/source/ui/undo/undoblk3.cxx	2008-05-18 01:44:43.000000000 -0400
++++ sc/source/ui/undo/undoblk3.cxx	2008-05-18 01:44:58.000000000 -0400
+@@ -473,6 +473,12 @@ String __EXPORT ScUndoSelectionAttr::Get
  	return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
  }
  
@@ -594,7 +598,7 @@
  
  //----------------------------------------------------------------------------
  
-@@ -482,6 +488,8 @@ void ScUndoSelectionAttr::DoChange( cons
+@@ -495,6 +501,8 @@ void ScUndoSelectionAttr::DoChange( cons
  	USHORT nExtFlags = 0;
  	pDocShell->UpdatePaintExt( nExtFlags, aEffRange );
  
@@ -603,7 +607,7 @@
  	if (bUndo)	// nur bei Undo
  	{
  		ScRange aCopyRange = aRange;
-@@ -506,6 +514,24 @@ void ScUndoSelectionAttr::DoChange( cons
+@@ -519,6 +527,24 @@ void ScUndoSelectionAttr::DoChange( cons
  	ShowTable( aRange );
  }
  
@@ -628,9 +632,9 @@
  
  //----------------------------------------------------------------------------
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/undo/undocell.cxx sc/source/ui/undo/undocell.cxx
---- sc.clean/source/ui/undo/undocell.cxx	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/undo/undocell.cxx	2008-04-21 12:25:29.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/ui/undo/undocell.cxx sc/source/ui/undo/undocell.cxx
+--- sc.clean/source/ui/undo/undocell.cxx	2008-05-18 01:44:43.000000000 -0400
++++ sc/source/ui/undo/undocell.cxx	2008-05-18 01:44:58.000000000 -0400
 @@ -66,6 +66,8 @@
  #include "chgtrack.hxx"
  #include "sc.hrc"
@@ -691,10 +695,10 @@
  	EndRedo();
  }
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
---- sc.clean/source/ui/view/viewfunc.cxx	2008-04-01 12:26:33.000000000 -0400
-+++ sc/source/ui/view/viewfunc.cxx	2008-04-21 12:25:29.000000000 -0400
-@@ -1296,6 +1296,8 @@ void ScViewFunc::ApplySelectionPattern( 
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj --exclude='*.orig' sc.clean/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
+--- sc.clean/source/ui/view/viewfunc.cxx	2008-05-18 01:44:43.000000000 -0400
++++ sc/source/ui/view/viewfunc.cxx	2008-05-18 01:44:58.000000000 -0400
+@@ -1294,6 +1294,8 @@ void ScViewFunc::ApplySelectionPattern( 
  		SCROW nEndRow = aMarkRange.aEnd.Row();
  		SCTAB nEndTab = aMarkRange.aEnd.Tab();
  
@@ -703,7 +707,7 @@
  		if (bRecord)
  		{
  			ScRange aCopyRange = aMarkRange;
-@@ -1312,15 +1314,14 @@ void ScViewFunc::ApplySelectionPattern( 
+@@ -1310,15 +1312,14 @@ void ScViewFunc::ApplySelectionPattern( 
  
  			aFuncMark.MarkToMulti();
  
@@ -725,7 +729,7 @@
  
  		pDocSh->PostPaint( nStartCol, nStartRow, nStartTab,
  						   nEndCol,   nEndRow,   nEndTab,
-@@ -1334,6 +1335,19 @@ void ScViewFunc::ApplySelectionPattern( 
+@@ -1332,6 +1333,19 @@ void ScViewFunc::ApplySelectionPattern( 
  		SCCOL nCol = pViewData->GetCurX();
  		SCROW nRow = pViewData->GetCurY();
  		SCTAB nTab = pViewData->GetTabNo();
@@ -745,7 +749,7 @@
  		ScPatternAttr* pOldPat = new ScPatternAttr(*pDoc->GetPattern( nCol, nRow, nTab ));
  
  		pDoc->ApplyPattern( nCol, nRow, nTab, rAttr );
-@@ -1342,11 +1356,10 @@ void ScViewFunc::ApplySelectionPattern( 
+@@ -1341,11 +1355,10 @@ void ScViewFunc::ApplySelectionPattern( 
  
  		if (bRecord)
  		{
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]