rpms/openoffice.org/devel openoffice.org.spec, 1.1929, 1.1930 workspace.calc51.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16242

Modified Files:
	openoffice.org.spec workspace.calc51.patch 
Removed Files:
	openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch 
Log Message:
merged into single upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1929
retrieving revision 1.1930
diff -u -p -r1.1929 -r1.1930
--- openoffice.org.spec	10 Jun 2009 20:28:44 -0000	1.1929
+++ openoffice.org.spec	11 Jun 2009 09:37:37 -0000	1.1930
@@ -149,7 +149,6 @@ Patch71: openoffice.org-3.1.0.ooo102490.
 Patch72: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
 Patch73: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
 Patch74: workspace.calc51.patch
-Patch75: openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1656,7 +1655,6 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch72 -p0 -b .ooo102061.sc.cellanchoring.patch
 %patch73 -p0 -b .ooo102142.sd.resleak.patch
 %patch74 -p0 -b .workspace.calc51.patch
-%patch75 -p0 -b .ooo97726.sc.misspelling.repeat.disallowed.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4166,7 +4164,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Jun 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.4
+* Thu Jun 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.4
 - Resolves: rhbz#504419  openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 - add openoffice.org-3.1.0.ooo102142.sd.resleak.patch
 - Resolves (partially): rhbz#498590 improve svg import

workspace.calc51.patch:

Index: workspace.calc51.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.calc51.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.calc51.patch	10 Jun 2009 20:28:44 -0000	1.1
+++ workspace.calc51.patch	11 Jun 2009 09:37:37 -0000	1.2
@@ -43,3 +43,45 @@ diff -ru sc.orig/source/core/tool/progre
  			pInterpretDoc = pDoc;
  		}
  	}
+--- sc.orig/source/ui/view/viewfunc.cxx	2009-06-10 13:59:18.000000000 +0100
++++ sc/source/ui/view/viewfunc.cxx	2009-06-10 13:59:23.000000000 +0100
+@@ -753,12 +751,13 @@
+ 		ScPatternAttr* pCellAttrs = NULL;
+ 		EditTextObject* pNewData = NULL;
+ 		String aString;
++
++		const ScPatternAttr* pOldPattern = pDoc->GetPattern( nCol, nRow, nTab );
++		ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool() );
++		aEngine.SetText(*pData);
++
+ 		if (bTestSimple)					// Testen, ob einfacher String ohne Attribute
+ 		{
+-			const ScPatternAttr* pOldPattern = pDoc->GetPattern( nCol, nRow, nTab );
+-			ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool() );
+-			aEngine.SetText(*pData);
+-
+ 			ScEditAttrTester aAttrTester( &aEngine );
+ 			bSimple = !aAttrTester.NeedsObject();
+ 			bCommon = aAttrTester.NeedsCellAttr();
+@@ -779,10 +778,9 @@
+ 				pCellAttrs->GetFromEditItemSet( &aAttrTester.GetAttribs() );
+ 				//!	remove common attributes from EditEngine?
+ 			}
++		}
+ 
+-			if (bSimple)
+-				aString = aEngine.GetText();
+-		}
++		aString = ScEditUtil::GetSpaceDelimitedString(aEngine);
+ 
+ 		//
+ 		// 		Undo
+@@ -840,7 +838,7 @@
+ 			{	// wg. ChangeTrack erst jetzt
+ 				pDocSh->GetUndoManager()->AddUndoAction(
+ 					new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nPos, pTabs,
+-										ppOldCells, NULL, NULL, String(),
++										ppOldCells, NULL, NULL, aString,
+ 										pUndoData ) );
+ 			}
+ 


--- openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch DELETED ---