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

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Feb 12 22:53:25 2009
New Revision: 15327
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15327&view=rev

Log:
2009-02-12  Rail Aliev  <rail openoffice org>

	* patches/dev300/calc-single-click-unselect-tabs.diff:
	* patches/dev300/apply: in Calc, switching current sheet should 
	un-select multi-selected tabs. (i#70320)


Added:
   trunk/patches/dev300/calc-single-click-unselect-tabs.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Feb 12 22:53:25 2009
@@ -1791,12 +1791,15 @@
 chart-odf-export-assert-removal.diff, i#97563, kohei
 
 # Support custom sheet tab colors option (by Daniel Watson).
-calc-sheet-tab-color-officecfg.diff, kohei
-calc-sheet-tab-color-svtools.diff, kohei
-calc-sheet-tab-color-sc.diff, kohei
+calc-sheet-tab-color-officecfg.diff, kohei/danielbw
+calc-sheet-tab-color-svtools.diff, kohei/danielbw
+calc-sheet-tab-color-sc.diff, kohei/danielbw
 
 # Fix error on xls 2003 xml export (by Daniel Watson)
-filter-xls2003-xml-export-fix.diff, i#99097, kohei
+filter-xls2003-xml-export-fix.diff, i#99097, kohei/danielbw
+
+calc-single-click-unselect-tabs.diff, i#70320, kohei/rail
+
 
 [ CalcRowLimit ]
 # The work to increase Calc's row size limit, and any work associated with it.

Added: trunk/patches/dev300/calc-single-click-unselect-tabs.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-single-click-unselect-tabs.diff	Thu Feb 12 22:53:25 2009
@@ -0,0 +1,35 @@
+diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
+index c06fa78..9f7ccc3 100644
+--- sc/source/ui/view/tabview3.cxx
++++ sc/source/ui/view/tabview3.cxx
+@@ -1679,7 +1679,6 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
+ 		SfxBindings& rBindings = aViewData.GetBindings();
+ 		ScMarkData& rMark = aViewData.GetMarkData();
+ 
+-        BOOL bSelectOneTable = FALSE;
+         if (bExtendSelection)
+         {
+             // #i6327# if all tables are selected, a selection event (#i6330#) will deselect all
+@@ -1689,21 +1688,15 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
+             if( bAllSelected )
+             {
+                 bExtendSelection = FALSE;
+-                bSelectOneTable = TRUE;
+             }
+         }
+-        else
+-        {
+-            // move from multi-selection to unselected table
+-            bSelectOneTable = !rMark.GetTableSelect( nTab );
+-        }
+ 
+         if (bExtendSelection)
+         {
+             // #i6330# multi-selection with keyboard
+             rMark.SelectTable( nTab, TRUE );
+         }
+-        else if (bSelectOneTable)
++        else
+ 		{
+ 			rMark.SelectOneTable( nTab );
+ 			rBindings.Invalidate( FID_FILL_TAB );