GNOME.org
 

ooo-build r12583 - in branches/ooo-build-2-4-1: . patches/src680

Author: kyoshida
Date: Sun May 18 06:21:00 2008
New Revision: 12583
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12583&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:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/sc-overwrite-char-font-attrs.diff

Modified: branches/ooo-build-2-4-1/patches/src680/sc-overwrite-char-font-attrs.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/sc-overwrite-char-font-attrs.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/sc-overwrite-char-font-attrs.diff	Sun May 18 06:21:00 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
+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-09 07:28:41.000000000 -0400
-+++ sc/inc/cell.hxx	2008-04-09 08:08:35.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,7 @@
  #include <stddef.h>
  
@@ -109,9 +109,9 @@
  enum ScMatrixMode {
  	MM_NONE		 = 0,					// keine Matrixformel
  	MM_FORMULA	 = 1,					// Matrixformel
-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
+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;
@@ -139,9 +139,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/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
+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,
@@ -162,29 +162,9 @@
  	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
+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;
@@ -212,45 +192,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
+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>
@@ -278,27 +222,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);
++                            }
 +                        }
 +                    }
 +                }
@@ -306,7 +255,7 @@
                  nCount++;
              }
  		}
-@@ -715,7 +738,7 @@ void ScAttrArray::ApplyLineStyleArea( SC
+@@ -715,7 +743,7 @@ void ScAttrArray::ApplyLineStyleArea( SC
  #undef SET_LINE
  
  
@@ -315,7 +264,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;
@@ -324,9 +273,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-09 07:28:45.000000000 -0400
-+++ sc/source/core/data/cell2.cxx	2008-04-09 08:08:22.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"
@@ -365,7 +314,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;
  }
  
@@ -442,9 +391,9 @@
  //---------------------------------------------------------------------
  
  void ScFormulaCell::GetEnglishFormula( String& rFormula, BOOL bCompileXML,
-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
+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
  }
  
@@ -478,9 +427,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
+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,
@@ -524,67 +473,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
+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, 
  
  
@@ -616,10 +507,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
+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
@@ -651,9 +541,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-09 07:28:43.000000000 -0400
-+++ sc/source/ui/inc/undocell.hxx	2008-04-09 08:08:22.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
@@ -688,9 +578,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
+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
  
@@ -699,9 +589,9 @@
      $(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-09 07:28:44.000000000 -0400
-+++ sc/source/ui/undo/undoblk3.cxx	2008-04-09 08:08:22.000000000 -0400
+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 );
  }
@@ -749,59 +639,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
+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"
@@ -862,10 +702,9 @@
  	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
+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();
@@ -933,15 +772,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]