[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                |    3 -
 patches/dev300/calc-single-click-unselect-tabs.diff |   55 --------------------
 2 files changed, 58 deletions(-)

New commits:
commit 2e64c31aed451289e0ee9db6a60b5837407eccaa
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 14:09:32 2009 +0300

    calc-single-click-unselect-tabs.diff is upstream
    
    * patches/dev300/calc-single-click-unselect-tabs.diff: Delete, is
      upstream. i#70320 is fixed and closed.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4af3904..d7dd903 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1907,9 +1907,6 @@ calc-sheet-tab-color-sc.diff,        i#5560, kohei/danielbw
 
 calc-sheet-tab-color-filter.diff,    i#5560, kohei/danielbw
 
-# Make it easier to un-select tabs when multiple tabs are selected.
-calc-single-click-unselect-tabs.diff, i#70320, kohei/rail
-
 # Support finding and replacing empty cells.
 calc-find-replace-empty-cells-sc.diff  i#49380, n#415352, kohei
 calc-find-replace-empty-cells-svx.diff i#49380, n#415352, kohei
diff --git a/patches/dev300/calc-single-click-unselect-tabs.diff b/patches/dev300/calc-single-click-unselect-tabs.diff
deleted file mode 100644
index 8d49bd1..0000000
--- a/patches/dev300/calc-single-click-unselect-tabs.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index c06fa78..a888435 100644
---- sc/source/ui/view/tabview3.cxx
-+++ sc/source/ui/view/tabview3.cxx
-@@ -1679,31 +1679,31 @@ 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
--            BOOL bAllSelected = TRUE;
--            for( SCTAB nSelTab = 0; bAllSelected && (nSelTab < nTabCount); ++nSelTab )
--                bAllSelected = !pDoc->IsVisible( nSelTab ) || rMark.GetTableSelect( nSelTab );
--            if( bAllSelected )
-+        bool bAllSelected = true;
-+        for (SCTAB nSelTab = 0; nSelTab < nTabCount; ++nSelTab)
-+        {    
-+            if (!pDoc->IsVisible(nSelTab) || rMark.GetTableSelect(nSelTab))
-+            {    
-+                if (nTab == nSelTab)
-+                    // This tab is already in selection.  Keep the current 
-+                    // selection.
-+                    bExtendSelection = true;
-+            }
-+            else
-             {
--                bExtendSelection = FALSE;
--                bSelectOneTable = TRUE;
-+                bAllSelected = false;
-+                if (bExtendSelection)
-+                    // We got what we need.  No need to stay in the loop.
-+                    break;
-             }
-         }
--        else
--        {
--            // move from multi-selection to unselected table
--            bSelectOneTable = !rMark.GetTableSelect( nTab );
--        }
-+        if (bAllSelected)
-+            // #i6327# if all tables are selected, a selection event (#i6330#) will deselect all
-+            bExtendSelection = false;
- 
-         if (bExtendSelection)
--        {
--            // #i6330# multi-selection with keyboard
-             rMark.SelectTable( nTab, TRUE );
--        }
--        else if (bSelectOneTable)
-+        else
- 		{
- 			rMark.SelectOneTable( nTab );
- 			rBindings.Invalidate( FID_FILL_TAB );