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

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri May 30 21:22:35 2008
New Revision: 12734
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12734&view=rev

Log:
2008-05-30  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/cws-scsheetprotection02-sc.diff: fixed a missing '}'
	in gridwin.cxx that caused a build failure.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-scsheetprotection02-sc.diff

Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff	(original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff	Fri May 30 21:22:35 2008
@@ -66,7 +66,7 @@
  	void				FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount,
  										SCCOL nX1, SCCOL nX2 ) const;
 diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
-index ae82233..17cf7b0 100644
+index 4195038..29c53e1 100644
 --- sc/inc/sc.hrc
 +++ sc/inc/sc.hrc
 @@ -1649,6 +1649,11 @@
@@ -6678,7 +6678,7 @@
 +
 +#endif
 diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
-index 38a581e..286e5fe 100644
+index 38a581e..0fe5796 100644
 --- sc/source/ui/view/gridwin.cxx
 +++ sc/source/ui/view/gridwin.cxx
 @@ -140,6 +140,7 @@
@@ -6704,10 +6704,21 @@
  
              // Check for header drill-down first.
              sheet::DataPilotTableHeaderData aData;
-@@ -2106,6 +2108,23 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
+@@ -2106,17 +2108,35 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
  			return;
  		}
  
+-		//	edit cell contents
+-		pViewData->GetViewShell()->UpdateInputHandler();
+-		pScMod->SetInputMode( SC_INPUT_TABLE );
+-		if (pViewData->HasEditView(eWhich))
+-		{
+-			//	Text-Cursor gleich an die geklickte Stelle setzen
+-			EditView* pEditView = pViewData->GetEditView( eWhich );
+-			MouseEvent aEditEvt( rMEvt.GetPosPixel(), 1, MOUSE_SYNTHETIC, MOUSE_LEFT, 0 );
+-			pEditView->MouseButtonDown( aEditEvt );
+-			pEditView->MouseButtonUp( aEditEvt );
+-		}
 +        // Check for cell protection attribute.
 +        ScTableProtection* pProtect = pDoc->GetTabProtection( nTab );
 +        bool bEditAllowed = true;
@@ -6725,9 +6736,21 @@
 +
 +        if ( bEditAllowed )
 +        {
- 		//	edit cell contents
- 		pViewData->GetViewShell()->UpdateInputHandler();
- 		pScMod->SetInputMode( SC_INPUT_TABLE );
++            //  edit cell contents
++            pViewData->GetViewShell()->UpdateInputHandler();
++            pScMod->SetInputMode( SC_INPUT_TABLE );
++            if (pViewData->HasEditView(eWhich))
++            {
++                //  Text-Cursor gleich an die geklickte Stelle setzen
++                EditView* pEditView = pViewData->GetEditView( eWhich );
++                MouseEvent aEditEvt( rMEvt.GetPosPixel(), 1, MOUSE_SYNTHETIC, MOUSE_LEFT, 0 );
++                pEditView->MouseButtonDown( aEditEvt );
++                pEditView->MouseButtonUp( aEditEvt );
++            }
++        }
+         return;
+ 	}
+ 
 diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
 index a803f6e..3ab9e7b 100644
 --- sc/source/ui/view/scextopt.cxx