rpms/openoffice.org/devel workspace.calc39.patch, NONE, 1.1 openoffice.org.spec, 1.888, 1.889 openoffice.org-2.0.4.ooo70064.sc.crashonalignment.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24523

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.calc39.patch 
Removed Files:
	openoffice.org-2.0.4.ooo70064.sc.crashonalignment.patch 
Log Message:
rename to match workspace

workspace.calc39.patch:
 inputhdl.cxx |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

--- NEW FILE workspace.calc39.patch ---
Index: inputhdl.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/app/inputhdl.cxx,v
retrieving revision 1.65
retrieving revision 1.65.62.1
diff -u -r1.65 -r1.65.62.1
--- openoffice.org.orig/sc/source/ui/app/inputhdl.cxx	21 Jul 2006 13:09:05 -0000	1.65
+++ openoffice.org/sc/source/ui/app/inputhdl.cxx	12 Sep 2006 16:18:13 -0000	1.65.62.1
@@ -2020,13 +2020,8 @@
 		const ScValidationData*	pData = pDoc->GetValidationEntry( nValidation );
 		if (pData && pData->HasErrMsg())
 		{
-			const ScPatternAttr* pPattern = pLastPattern;
-			if (!pPattern)
-			{
-				DBG_ERROR("kein Pattern !??!");
-				pPattern = pDoc->GetPattern( aCursorPos.Col(), aCursorPos.Row(),
-											  aCursorPos.Tab() );
-			}
+            // #i67990# don't use pLastPattern in EnterHandler
+            const ScPatternAttr* pPattern = pDoc->GetPattern( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab() );
 			BOOL bOk = pData->IsDataValid( aString, *pPattern, aCursorPos );
 
 			if (!bOk)
@@ -2067,12 +2062,14 @@
 		//	#i3820# If the spell checker flags numerical input as error,
 		//	it still has to be treated as number, not EditEngine object.
 
-		if ( pLastPattern && pActiveViewSh )
+        if ( pActiveViewSh )
 		{
 			ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocument();
+            // #i67990# don't use pLastPattern in EnterHandler
+            const ScPatternAttr* pPattern = pDoc->GetPattern( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab() );
 			SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
 			// without conditional format, as in ScColumn::SetString
-			sal_uInt32 nFormat = pLastPattern->GetNumberFormat( pFormatter );
+            sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter );
 			double nVal;
 			if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) )
 			{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -r1.888 -r1.889
--- openoffice.org.spec	4 Oct 2006 07:18:28 -0000	1.888
+++ openoffice.org.spec	4 Oct 2006 17:41:53 -0000	1.889
@@ -131,7 +131,7 @@
 Patch63: workspace.cmcfixes28.patch
 Patch64: openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch
 Patch65: openoffice.org-2.0.4.ooo69992.vcl.im_yield.patch
-Patch66: openoffice.org-2.0.4.ooo70064.sc.crashonalignment.patch
+Patch66: workspace.calc39.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -997,7 +997,7 @@
 %patch63 -p1 -b .workspace.cmcfixes28.patch
 %patch64 -p1 -b .ooo69236.slideshow.esccrash.patch
 %patch65 -p1 -b .ooo69992.vcl.im_yield.patch
-%patch66 -p1 -b .ooo70064.sc.crashonalignment.patch
+%patch66 -p1 -b .workspace.calc39.patch
 
 tar xzf %{SOURCE1}
 


--- openoffice.org-2.0.4.ooo70064.sc.crashonalignment.patch DELETED ---