ooo-build r11910 - in branches/sled-10-sp1-ooo-build-2-4: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Mar 14 21:41:14 2008
New Revision: 11910
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11910&view=rev

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

	* patches/src680/sc-sheet-protection-options.diff: fixed a crash by
	left-mouse click on the bottom-right corner of a cell.  This only 
	happened 1) on a protected sheet, 2) on an unprotected cell, which is
	3) merged and 4) surrounded by protected cells (n#371204).


Modified:
   branches/sled-10-sp1-ooo-build-2-4/ChangeLog
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/sc-sheet-protection-options.diff

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/sc-sheet-protection-options.diff
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/sc-sheet-protection-options.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/sc-sheet-protection-options.diff	Fri Mar 14 21:41:14 2008
@@ -852,7 +852,7 @@
 diff -u -b -I $Revision.*$ -I $Author.*$ -r1.18 -r1.18.166.1
 --- sc/source/ui/view/select.cxx	27 Feb 2007 13:56:10 -0000	1.18
 +++ sc/source/ui/view/select.cxx	5 Sep 2007 04:12:56 -0000	1.18.166.1
-@@ -327,6 +327,23 @@
+@@ -327,6 +327,26 @@
  {
  	ScTabView* pView = pViewData->GetView();
  	SCTAB nTab = pViewData->GetTabNo();
@@ -860,6 +860,9 @@
 +
 +    if ( pDoc->IsTabProtected(nTab) )
 +    {
++        if (nPosX < 0 || nPosY < 0) // n#371204
++            return FALSE;
++
 +        ScTableProtection& rProtect = pDoc->GetTabProtection(nTab);
 +        bool bSkipProtected   = !rProtect.isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS);
 +        bool bSkipUnprotected = !rProtect.isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);