ooo-build r12261 - in trunk: . patches/dev300 patches/src680

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12261 - in trunk: . patches/dev300 patches/src680
Date: Mon, 21 Apr 2008 17:43:16 +0100 (BST)
Author: kyoshida
Date: Mon Apr 21 16:43:15 2008
New Revision: 12261
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12261&view=rev

Log:
2008-04-21  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/apply:
	* patches/src680/sc-overwrite-char-font-attrs.diff: adjusted to DEV300.


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Apr 21 16:43:15 2008
@@ -722,7 +722,7 @@
 sc-formula-int-precision.diff, n#310706, i#86775, kohei
 
 # overwrite character level font attributes when changing them at cell level.
-#FIXME dev300: sc-overwrite-char-font-attrs.diff, n#374580, kohei
+sc-overwrite-char-font-attrs.diff, n#374580, kohei
 
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927

Modified: trunk/patches/src680/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/src680/sc-overwrite-char-font-attrs.diff	(original)
+++ trunk/patches/src680/sc-overwrite-char-font-attrs.diff	Mon Apr 21 16:43:15 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-09 07:28:41.000000000 -0400
-+++ sc/inc/attarray.hxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -45,6 +45,7 @@
  #endif
  
@@ -24,8 +24,8 @@
  								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-09 07:28:41.000000000 -0400
-+++ sc/inc/cell.hxx	2008-04-09 08:08:35.000000000 -0400
+--- 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
 @@ -39,6 +39,7 @@
  #include <stddef.h>
  
@@ -34,7 +34,7 @@
  
  #ifndef _SVMEMPOOL_HXX //autogen
  #include <tools/mempool.hxx>
-@@ -61,6 +62,8 @@
+@@ -67,6 +68,8 @@
  #include <vcl/fontcvt.hxx>
  #endif
  
@@ -43,7 +43,7 @@
  #define USE_MEMPOOL
  #define TEXTWIDTH_DIRTY		0xffff
  
-@@ -76,6 +79,7 @@ class ScCodeArray;
+@@ -82,6 +85,7 @@ class ScCodeArray;
  class ScTokenArray;
  class ScProgress;
  class ScPostIt;
@@ -51,7 +51,7 @@
  
  class ScMultipleReadHeader;
  class ScMultipleWriteHeader;
-@@ -230,8 +234,57 @@ public:
+@@ -241,8 +245,57 @@ public:
  	const EditTextObject* GetData() const	{ return pData; }
  
  	void			Save( SvStream& rStream ) const;
@@ -107,11 +107,12 @@
 +// ----------------------------------------------------------------------------
 +
  enum ScMatrixMode {
- 	MM_NONE		 = 0,					// keine Matrixformel
- 	MM_FORMULA	 = 1,					// Matrixformel
+     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-09 07:28:41.000000000 -0400
-+++ sc/inc/column.hxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -73,6 +73,7 @@ class ScAttrIterator;
  class ScAttrArray;
  class ScBaseCell;
@@ -140,9 +141,9 @@
  
  	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-09 07:28:41.000000000 -0400
-+++ sc/inc/document.hxx	2008-04-09 08:08:22.000000000 -0400
-@@ -1130,7 +1130,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
+--- 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
  									const ScPatternAttr& rAttr );
  	void			ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
  										SCCOL nEndCol, SCROW nEndRow,
@@ -152,7 +153,7 @@
  	void			ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow,
  											SCCOL nEndCol, SCROW nEndRow, SCTAB nTab,
  											const ScPatternAttr& rAttr );
-@@ -1197,7 +1198,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
+@@ -1204,7 +1205,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
  							SCCOL nVCol, SCROW nVRow, SCTAB nVTab,
  							const String& sValStr, double& nX);
  
@@ -162,30 +163,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/document.hxx.orig sc/inc/document.hxx.orig
---- sc.clean/inc/document.hxx.orig	2008-04-09 07:28:41.000000000 -0400
-+++ sc/inc/document.hxx.orig	2008-04-09 08:08:22.000000000 -0400
-@@ -162,6 +162,7 @@ class ScAutoNameCache;
- class ScTemporaryChartLock;
- class ScLookupCache;
- struct ScLookupCacheMapImpl;
-+struct ScTableViewOptions;
- 
- namespace com { namespace sun { namespace star {
-     namespace lang {
-@@ -1716,6 +1717,8 @@ public:
-                     /// an ID unique to each document instance
-     sal_uInt32      GetDocumentID() const;
- 
-+    ScTableViewOptions* GetTableViewOptions( SCTAB nTab ) const;
-+
-     void            InvalidateStyleSheetUsage()
-                         { bStyleSheetUsageInvalid = TRUE; }
- 	void GetSortParam( ScSortParam& rParam, SCTAB nTab );
 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-09 07:28:41.000000000 -0400
-+++ sc/inc/table.hxx	2008-04-09 08:08:22.000000000 -0400
-@@ -77,6 +77,7 @@ class ScAutoFormatData;
+--- 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;
  class ScBaseCell;
  class ScDocument;
  class ScDrawLayer;
@@ -193,7 +174,7 @@
  class ScFormulaCell;
  class ScOutlineTable;
  class ScPostIt;
-@@ -472,7 +473,8 @@ public:
+@@ -466,7 +467,8 @@ public:
  
  	void		ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr );
  	void		ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );
@@ -203,7 +184,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 );
-@@ -500,7 +502,7 @@ public:
+@@ -494,7 +496,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 );
  
@@ -212,45 +193,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/inc/table.hxx.orig sc/inc/table.hxx.orig
---- sc.clean/inc/table.hxx.orig	2008-04-09 07:28:41.000000000 -0400
-+++ sc/inc/table.hxx.orig	2008-04-09 08:08:22.000000000 -0400
-@@ -37,6 +37,7 @@
- #define SC_TABLE_HXX
- 
- #include <vector>
-+#include <memory>
- 
- #ifndef _GEN_HXX //autogen
- #include <tools/gen.hxx>
-@@ -91,6 +92,7 @@ class ScIndexMap;
- struct RowInfo;
- struct ScFunctionData;
- struct ScLineFlags;
-+struct ScTableViewOptions;
- class CollatorWrapper;
- 
- 
-@@ -167,6 +169,8 @@ private:
- 	USHORT			nScenarioFlags;
- 	BOOL			bActiveScenario;
- 
-+    ::std::auto_ptr<ScTableViewOptions> pViewOptions;
-+
- friend class ScDocument;					// fuer FillInfo
- friend class ScDocumentIterator;
- friend class ScValueIterator;
-@@ -184,6 +188,7 @@ public:
- 							BOOL bColInfo = TRUE, BOOL bRowInfo = TRUE );
- 				~ScTable();
- 
-+    ScTableViewOptions* GetViewOptions();
- 	ScOutlineTable*	GetOutlineTable()				{ return pOutlineTable; }
- 
- 	ULONG		GetCellCount() const;
 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-09 07:28:45.000000000 -0400
-+++ sc/source/core/data/attarray.cxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -46,6 +46,7 @@
  #include <svx/bolnitem.hxx>
  #include <svx/frmdiritem.hxx>
@@ -325,8 +270,8 @@
  				}
  				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-09 07:28:45.000000000 -0400
-+++ sc/source/core/data/cell2.cxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -61,7 +61,8 @@
  #include "editutil.hxx"
  #include "chgtrack.hxx"
@@ -365,7 +310,7 @@
  void ScEditCell::SetTextObject( const EditTextObject* pObject,
              const SfxItemPool* pFromPool )
  {
-@@ -236,6 +257,76 @@ void ScEditCell::SetTextObject( const Ed
+@@ -236,6 +258,76 @@ void ScEditCell::SetTextObject( const Ed
          pData = NULL;
  }
  
@@ -441,11 +386,11 @@
 +
  //---------------------------------------------------------------------
  
- void ScFormulaCell::GetEnglishFormula( String& rFormula, BOOL bCompileXML,
+ 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-09 07:28:45.000000000 -0400
-+++ sc/source/core/data/column.cxx	2008-04-09 08:08:22.000000000 -0400
-@@ -370,7 +370,7 @@ ULONG ScColumn::GetNumberFormat( SCROW n
+--- 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
  }
  
  
@@ -454,7 +399,7 @@
  {
      SCROW nTop = 0;
      SCROW nBottom = 0;
-@@ -381,7 +381,7 @@ SCsROW ScColumn::ApplySelectionCache( Sf
+@@ -385,7 +385,7 @@ SCsROW ScColumn::ApplySelectionCache( Sf
  		ScMarkArrayIter aMarkIter( rMark.GetArray() + nCol );
  		while (aMarkIter.Next( nTop, nBottom ))
  		{
@@ -463,7 +408,7 @@
  			bFound = TRUE;
  		}
  	}
-@@ -455,11 +455,12 @@ void ScColumn::ApplyPattern( SCROW nRow,
+@@ -459,11 +459,12 @@ void ScColumn::ApplyPattern( SCROW nRow,
  }
  
  
@@ -479,9 +424,9 @@
  
  
 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-09 07:28:45.000000000 -0400
-+++ sc/source/core/data/document.cxx	2008-04-09 08:08:22.000000000 -0400
-@@ -3049,12 +3049,13 @@ void ScDocument::ApplyPattern( SCCOL nCo
+--- 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
  void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
  						SCCOL nEndCol, SCROW nEndRow,
  						const ScMarkData& rMark,
@@ -497,7 +442,7 @@
  }
  
  
-@@ -4143,7 +4144,7 @@ void ScDocument::ApplyFrameAreaTab( cons
+@@ -4112,7 +4113,7 @@ void ScDocument::ApplyFrameAreaTab( cons
  }
  
  
@@ -506,7 +451,7 @@
  {
  	const SfxItemSet* pSet = &rAttr.GetItemSet();
  	BOOL bSet = FALSE;
-@@ -4160,7 +4161,7 @@ void ScDocument::ApplySelectionPattern( 
+@@ -4129,7 +4130,7 @@ void ScDocument::ApplySelectionPattern( 
  			ScRange aRange;
  			rMark.GetMarkArea( aRange );
  			ApplyPatternArea( aRange.aStart.Col(), aRange.aStart.Row(),
@@ -515,7 +460,7 @@
  		}
  		else
  		{
-@@ -4168,7 +4169,7 @@ void ScDocument::ApplySelectionPattern( 
+@@ -4137,7 +4138,7 @@ void ScDocument::ApplySelectionPattern( 
              for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
                  if (pTab[nTab])
                      if (rMark.GetTableSelect(nTab))
@@ -524,67 +469,9 @@
  		}
  	}
  }
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/document.cxx.orig sc/source/core/data/document.cxx.orig
---- sc.clean/source/core/data/document.cxx.orig	2008-04-09 07:28:45.000000000 -0400
-+++ sc/source/core/data/document.cxx.orig	2008-04-09 08:08:22.000000000 -0400
-@@ -3608,8 +3608,8 @@ BOOL ScDocument::IsBlockEditable( SCTAB 
- 										SCCOL nEndCol, SCROW nEndRow,
- 										BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
- {
--	// import into read-only document is possible - must be extended if other filters use api
--	if ( pShell && pShell->IsReadOnly() && !bImportingXML )
-+    // import into read-only document is possible
-+    if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
- 	{
- 		if ( pOnlyNotBecauseOfMatrix )
- 			*pOnlyNotBecauseOfMatrix = FALSE;
-@@ -3632,8 +3632,8 @@ BOOL ScDocument::IsSelectedBlockEditable
- 											SCCOL nEndCol, SCROW nEndRow,
- 											const ScMarkData& rMark ) const
- {
--	// import into read-only document is possible - must be extended if other filters use api
--	if ( pShell && pShell->IsReadOnly() && !bImportingXML )
-+    // import into read-only document is possible
-+    if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
- 		return FALSE;
- 
- 	BOOL bOk = TRUE;
-@@ -3650,8 +3650,8 @@ BOOL ScDocument::IsSelectedBlockEditable
- BOOL ScDocument::IsSelectionEditable( const ScMarkData& rMark,
- 			BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
- {
--	// import into read-only document is possible - must be extended if other filters use api
--	if ( pShell && pShell->IsReadOnly() && !bImportingXML )
-+    // import into read-only document is possible
-+    if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
- 	{
- 		if ( pOnlyNotBecauseOfMatrix )
- 			*pOnlyNotBecauseOfMatrix = FALSE;
-@@ -3701,8 +3701,8 @@ BOOL ScDocument::IsSelectionOrBlockEdita
- 										SCCOL nEndCol, SCROW nEndRow,
- 										const ScMarkData& rMark ) const
- {
--	// import into read-only document is possible - must be extended if other filters use api
--	if ( pShell && pShell->IsReadOnly() && !bImportingXML )
-+    // import into read-only document is possible
-+    if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
- 		return FALSE;
- 
- 	BOOL bOk = TRUE;
-@@ -3734,8 +3734,8 @@ BOOL ScDocument::IsSelectedOrBlockEditab
- 											SCCOL nEndCol, SCROW nEndRow,
- 											const ScMarkData& rMark ) const
- {
--	// import into read-only document is possible - must be extended if other filters use api
--	if ( pShell && pShell->IsReadOnly() && !bImportingXML )
-+    // import into read-only document is possible
-+    if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
- 		return FALSE;
- 
- 	BOOL bOk = TRUE;
 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-09 07:28:45.000000000 -0400
-+++ sc/source/core/data/table2.cxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -1657,14 +1657,14 @@ void ScTable::ApplyPattern( SCCOL nCol, 
  
  
@@ -616,10 +503,9 @@
  }
  
  
-Only in sc/source/filter/excel: xlocx.cxx.orig
 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-09 07:28:43.000000000 -0400
-+++ sc/source/ui/inc/undoblk.hxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -48,6 +48,10 @@
  #include "spellparam.hxx"
  #endif
@@ -652,8 +538,8 @@
  
  
 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-09 07:28:43.000000000 -0400
-+++ sc/source/ui/inc/undocell.hxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -43,6 +43,8 @@
  #include "postit.hxx"
  #endif
@@ -689,9 +575,9 @@
  
  
 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-09 07:28:44.000000000 -0400
-+++ sc/source/ui/undo/makefile.mk	2008-04-09 08:08:22.000000000 -0400
-@@ -89,6 +89,7 @@ SLOFILES =  \
+--- 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 =  \
  		$(SLO)$/undotab.obj
  
  EXCEPTIONSFILES= \
@@ -700,9 +586,9 @@
  
  # --- 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-09 07:28:44.000000000 -0400
-+++ sc/source/ui/undo/undoblk3.cxx	2008-04-09 08:08:22.000000000 -0400
-@@ -473,6 +473,12 @@ String __EXPORT ScUndoSelectionAttr::Get
+--- 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
  	return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
  }
  
@@ -715,7 +601,7 @@
  
  //----------------------------------------------------------------------------
  
-@@ -495,6 +501,8 @@ void ScUndoSelectionAttr::DoChange( cons
+@@ -482,6 +488,8 @@ void ScUndoSelectionAttr::DoChange( cons
  	USHORT nExtFlags = 0;
  	pDocShell->UpdatePaintExt( nExtFlags, aEffRange );
  
@@ -724,7 +610,7 @@
  	if (bUndo)	// nur bei Undo
  	{
  		ScRange aCopyRange = aRange;
-@@ -519,6 +527,24 @@ void ScUndoSelectionAttr::DoChange( cons
+@@ -506,6 +514,24 @@ void ScUndoSelectionAttr::DoChange( cons
  	ShowTable( aRange );
  }
  
@@ -749,59 +635,9 @@
  
  //----------------------------------------------------------------------------
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/undo/undoblk3.cxx.orig sc/source/ui/undo/undoblk3.cxx.orig
---- sc.clean/source/ui/undo/undoblk3.cxx.orig	2008-04-09 07:28:44.000000000 -0400
-+++ sc/source/ui/undo/undoblk3.cxx.orig	2008-04-09 08:08:22.000000000 -0400
-@@ -39,6 +39,7 @@
- // INCLUDE -------------------------------------------------------------------
- 
- #include "scitems.hxx"
-+#include <svx/algitem.hxx>
- #include <svx/boxitem.hxx>
- #include <svx/srchitem.hxx>
- #include <svx/linkmgr.hxx>
-@@ -772,13 +773,15 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(
- ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell,
- 							SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
- 							SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
--							BOOL bNewDoMerge, ScDocument* pNewUndoDoc )
-+							BOOL bNewDoMerge, ScDocument* pNewUndoDoc,
-+							BOOL bNewCenter )
- 		//
- 	:	ScSimpleUndo( pNewDocShell ),
- 		//
- 		aRange	( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- 		bDoMerge( bNewDoMerge ),
--		pUndoDoc( pNewUndoDoc )
-+		pUndoDoc( pNewUndoDoc ),
-+		bCenter ( bNewCenter )
- {
- }
- 
-@@ -825,9 +828,20 @@ void ScUndoMerge::DoChange( const BOOL b
- 			pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
- 		}
- 		else
-+		{
- /*!*/		pDoc->DoMergeContents( aRange.aStart.Tab(),
- 								   aRange.aStart.Col(), aRange.aStart.Row(),
- 								   aRange.aEnd.Col(),   aRange.aEnd.Row()   );
-+			if (bCenter)
-+			{
-+				pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
-+								 aRange.aStart.Tab(),
-+								 SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER ) );
-+				pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
-+								 aRange.aStart.Tab(),
-+								 SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER ) );
-+			}
-+		}
- 
- 	BOOL bDidPaint = FALSE;
- 	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 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-09 07:28:44.000000000 -0400
-+++ sc/source/ui/undo/undocell.cxx	2008-04-09 08:08:22.000000000 -0400
+--- 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
 @@ -66,6 +66,8 @@
  #include "chgtrack.hxx"
  #include "sc.hrc"
@@ -862,11 +698,10 @@
  	EndRedo();
  }
  
-Only in sc/source/ui/view: select.cxx.orig
 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-09 07:28:44.000000000 -0400
-+++ sc/source/ui/view/viewfunc.cxx	2008-04-09 08:08:22.000000000 -0400
-@@ -1294,6 +1294,8 @@ void ScViewFunc::ApplySelectionPattern( 
+--- 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( 
  		SCROW nEndRow = aMarkRange.aEnd.Row();
  		SCTAB nEndTab = aMarkRange.aEnd.Tab();
  
@@ -875,7 +710,7 @@
  		if (bRecord)
  		{
  			ScRange aCopyRange = aMarkRange;
-@@ -1310,15 +1312,14 @@ void ScViewFunc::ApplySelectionPattern( 
+@@ -1312,15 +1314,14 @@ void ScViewFunc::ApplySelectionPattern( 
  
  			aFuncMark.MarkToMulti();
  
@@ -897,7 +732,7 @@
  
  		pDocSh->PostPaint( nStartCol, nStartRow, nStartTab,
  						   nEndCol,   nEndRow,   nEndTab,
-@@ -1332,6 +1333,19 @@ void ScViewFunc::ApplySelectionPattern( 
+@@ -1334,6 +1335,19 @@ void ScViewFunc::ApplySelectionPattern( 
  		SCCOL nCol = pViewData->GetCurX();
  		SCROW nRow = pViewData->GetCurY();
  		SCTAB nTab = pViewData->GetTabNo();
@@ -916,8 +751,8 @@
 +
  		ScPatternAttr* pOldPat = new ScPatternAttr(*pDoc->GetPattern( nCol, nRow, nTab ));
  
- 		if (!bCursorOnly)
-@@ -1341,11 +1355,10 @@ void ScViewFunc::ApplySelectionPattern( 
+ 		pDoc->ApplyPattern( nCol, nRow, nTab, rAttr );
+@@ -1342,11 +1356,10 @@ void ScViewFunc::ApplySelectionPattern( 
  
  		if (bRecord)
  		{
@@ -933,15 +768,3 @@
  		}
  		delete pOldPat;		// wird im Undo kopiert (Pool)
  
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/viewfunc.cxx.orig sc/source/ui/view/viewfunc.cxx.orig
---- sc.clean/source/ui/view/viewfunc.cxx.orig	2008-04-09 07:28:44.000000000 -0400
-+++ sc/source/ui/view/viewfunc.cxx.orig	2008-04-09 08:08:22.000000000 -0400
-@@ -887,7 +887,7 @@ void ScViewFunc::EnterMatrix( const Stri
- 	if (pData->GetSimpleArea(aRange))
- 	{
- 		ScDocShell* pDocSh = pData->GetDocShell();
--		BOOL bSuccess = pDocSh->GetDocFunc().EnterMatrix( aRange, &rMark, rString, FALSE, FALSE );
-+        BOOL bSuccess = pDocSh->GetDocFunc().EnterMatrix( aRange, &rMark, NULL, rString, FALSE, FALSE );
- 		if (bSuccess)
- 			pDocSh->UpdateOle(GetViewData());
- 	}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]