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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Mar 11 22:43:39 2008
New Revision: 11880
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11880&view=rev

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

	* patches/src680/sc-paste-on-enter.diff: fixed a crash bug when TAB is
	pressed while a single cell is highlighted.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-paste-on-enter.diff

Modified: trunk/patches/src680/sc-paste-on-enter.diff
==============================================================================
--- trunk/patches/src680/sc-paste-on-enter.diff	(original)
+++ trunk/patches/src680/sc-paste-on-enter.diff	Tue Mar 11 22:43:39 2008
@@ -201,22 +201,26 @@
  
  // #114409#
  #ifndef _SV_SALBTYPE_HXX
-@@ -2941,12 +2986,26 @@ void ScGridWindow::SelectForContextMenu(
+@@ -2941,12 +2986,30 @@ void ScGridWindow::SelectForContextMenu(
      }
  }
  
 +static void ClearSingleSelection( ScViewData* pViewData )
 +{
-+	SCCOL nX;
-+	SCROW nY;
-+	ScDocument* pClipDoc = ScTransferObj::GetOwnClipboard( 
-+			pViewData->GetActiveWin() )->GetDocument();
-+	pClipDoc->GetClipArea( nX, nY, TRUE );
-+	if (nX == 0 && nY == 0)
-+	{
-+		ScTabView* pView = pViewData->GetView();
-+		pView->Unmark();
-+	}
++    SCCOL nX;
++    SCROW nY;
++    ScTransferObj* pTransObj = ScTransferObj::GetOwnClipboard( 
++        pViewData->GetActiveWin() );
++    if (!pTransObj)
++        return;
++
++    ScDocument* pClipDoc = pTransObj->GetDocument();
++    pClipDoc->GetClipArea( nX, nY, TRUE );
++    if (nX == 0 && nY == 0)
++    {
++        ScTabView* pView = pViewData->GetView();
++        pView->Unmark();
++    }
 +}
 +
  void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)