ooo-build r11876 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Mar 11 18:58:09 2008
New Revision: 11876
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11876&view=rev

Log:
2008-03-11  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-fix-paste-cellrange-selection.diff: fixed a 
	regression where a pasted cell range is no longer highlighted (i#86894).

	* patches/src680/apply: apply the above patch.


Added:
   trunk/patches/src680/sc-fix-paste-cellrange-selection.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Mar 11 18:58:09 2008
@@ -1711,6 +1711,8 @@
 # Toggle gridline display per sheet.
 sc-sheet-gridline-toggle.diff, kohei
 
+# Fix a regression where a pasted cell range is not highlighted.
+sc-fix-paste-cellrange-selection.diff, i#86894, kohei
 
 #[ OOXSTLport5 ]
 #

Added: trunk/patches/src680/sc-fix-paste-cellrange-selection.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sc-fix-paste-cellrange-selection.diff	Tue Mar 11 18:58:09 2008
@@ -0,0 +1,48 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/tabview.hxx sc/source/ui/inc/tabview.hxx
+--- sc.clean/source/ui/inc/tabview.hxx	2008-03-11 09:39:34.000000000 -0400
++++ sc/source/ui/inc/tabview.hxx	2008-03-11 14:15:22.000000000 -0400
+@@ -501,6 +501,8 @@ public:
+ 	void			PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+ 	void			PaintBlock( BOOL bReset = FALSE );
+ 
++    void            MarkDataChanged();
++
+ 	void			LockModifiers( USHORT nModifiers );
+ 	USHORT			GetLockedModifiers() const;
+ 	void			ViewOptionsHasChanged( BOOL bHScrollChanged,
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
+--- sc.clean/source/ui/view/tabview3.cxx	2008-03-11 09:39:35.000000000 -0400
++++ sc/source/ui/view/tabview3.cxx	2008-03-11 14:13:43.000000000 -0400
+@@ -1568,6 +1568,13 @@ void ScTabView::Unmark()
+ 	}
+ }
+ 
++void ScTabView::MarkDataChanged()
++{
++    // has to be called after making direct changes to mark data (not via MarkCursor etc)
++
++    UpdateSelectionOverlay();
++}
++
+ void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection )
+ {
+ 	if (!nDir) return;
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx
+--- sc.clean/source/ui/view/viewfun3.cxx	2008-03-11 09:39:35.000000000 -0400
++++ sc/source/ui/view/viewfun3.cxx	2008-03-11 14:24:13.000000000 -0400
+@@ -253,6 +253,7 @@ void ScViewFunc::CutToClip( ScDocument* 
+ 			DoneBlockMode();
+ 			InitOwnBlockMode();
+ 			rMark.SetMarkArea( aRange );
++            MarkDataChanged();
+ 		}
+ 
+ 		CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects );			// Ab ins Clipboard
+@@ -1039,6 +1040,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT n
+ 		InitOwnBlockMode();
+ 	}
+ 	rMark.SetMarkArea( aUserRange );
++    MarkDataChanged();
+ 
+ 	HideCursor();							// Cursor aendert sich !
+