rpms/openoffice.org/devel openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch, NONE, 1.1 openoffice.org.spec, 1.1927, 1.1928

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch 
Log Message:
Resolves: rhbz#504967 openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch

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

--- NEW FILE openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch ---
--- 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 = aEngine.GetText();
 
 		//
 		// 		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 ) );
 			}
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1927
retrieving revision 1.1928
diff -u -p -r1.1927 -r1.1928
--- openoffice.org.spec	9 Jun 2009 16:38:24 -0000	1.1927
+++ openoffice.org.spec	10 Jun 2009 13:17:44 -0000	1.1928
@@ -149,6 +149,7 @@ 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: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.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}
@@ -1655,6 +1656,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch72 -p0 -b .ooo102061.sc.cellanchoring.patch
 %patch73 -p0 -b .ooo102142.sd.resleak.patch
 %patch74 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
+%patch75 -p0 -b .ooo97726.sc.misspelling.repeat.disallowed.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4164,10 +4166,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jun 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.4
+* Wed 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
+- Resolves: rhbz#504967 openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch
 
 * Sat Jun 06 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.3
 - don't over-write en_ZA auto-correct file