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

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Mar 19 20:54:05 2009
New Revision: 15583
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15583&view=rev

Log:
2009-03-19  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-remove-merge-flags-on-row-insert.diff:
	* patches/dev300/apply: remove all merge flags when a new row is 
	inserted, or else it will create a phantom button if the old row 
	contained a datapilot button. (n#484599)


Added:
   trunk/patches/dev300/calc-remove-merge-flags-on-row-insert.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Mar 19 20:54:05 2009
@@ -2101,6 +2101,10 @@
 calc-html-import-custom-lang-filter.diff, n#484272, kohei
 calc-html-import-custom-lang-sc.diff,     n#484272, kohei
 
+# Don't duplicate merge flags when inserting a new row, to avoid merge flag 
+# corruption.
+calc-remove-merge-flags-on-row-insert.diff, n#484599, kohei
+
 [ CalcRowLimit ]
 # The work to increase Calc's row size limit, and any work associated with it.
 SectionOwner => kohei

Added: trunk/patches/dev300/calc-remove-merge-flags-on-row-insert.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-remove-merge-flags-on-row-insert.diff	Thu Mar 19 20:54:05 2009
@@ -0,0 +1,16 @@
+diff --git sc/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
+index 3d0e5de..c02d595 100644
+--- sc/source/core/data/attarray.cxx
++++ sc/source/core/data/attarray.cxx
+@@ -2135,9 +2135,8 @@ void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize )
+ 		//	im eingefuegten Bereich ist nichts zusammengefasst
+ 	}
+ 
+-	//	Flags nicht duplizieren
+-	//!	direkt am Pattern testen ??
+-	RemoveFlags( nStartRow, nStartRow+nSize-1, SC_MF_HOR | SC_MF_VER | SC_MF_AUTO );
++    // Don't duplicate the merge flags in the inserted row.
++    RemoveFlags( nStartRow, nStartRow+nSize-1, SC_MF_ALL );
+ }
+ 
+