rpms/openoffice.org/F-7 openoffice.org.spec, 1.1176, 1.1177 workspace.tl37.patch, 1.1, 1.2

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu May 31 16:17:01 UTC 2007


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19817

Modified Files:
	openoffice.org.spec workspace.tl37.patch 
Log Message:
Resolves: rhbz#241875 get script detection right for range vs point in svx


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1176
retrieving revision 1.1177
diff -u -r1.1176 -r1.1177
--- openoffice.org.spec	22 May 2007 11:57:04 -0000	1.1176
+++ openoffice.org.spec	31 May 2007 16:14:00 -0000	1.1177
@@ -2638,9 +2638,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue May 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.10
+* Thu May 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.10
 - add workspace.cmcfixes34.patch for int(0) not being promoted to long
   NULL in ellipsed methods
+- Resolves: rhbz#241875 get script detection right for range vs point
+  in drawing objects ooo#72349
 
 * Thu May 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.9
 - ooo#77470 Because Liberation fonts will be included in FC-7 we need

workspace.tl37.patch:

Index: workspace.tl37.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/workspace.tl37.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.tl37.patch	1 Feb 2007 11:40:38 -0000	1.1
+++ workspace.tl37.patch	31 May 2007 16:14:00 -0000	1.2
@@ -2,31 +2,29 @@
 ===================================================================
 RCS file: /cvs/graphics/svx/source/editeng/impedit2.cxx,v
 retrieving revision 1.114
-retrieving revision 1.114.180.1
-diff -u -r1.114 -r1.114.180.1
+diff -u -r1.114 impedit2.cxx
 --- openoffice.org.orig/svx/source/editeng/impedit2.cxx	12 Oct 2006 12:39:14 -0000	1.114
-+++ openoffice.org/svx/source/editeng/impedit2.cxx	1 Feb 2007 10:09:05 -0000	1.114.180.1
-@@ -1762,11 +1762,14 @@
++++ openoffice.org/svx/source/editeng/impedit2.cxx	31 May 2007 15:56:08 -0000
+@@ -1764,9 +1764,21 @@
  
- 		ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
- 
-+		// find the first(!) script type position that holds the
-+		// complete selection. Thus it will work for selections as
-+		// well as with just moving the cursor from char to char.
  		USHORT nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
  		USHORT nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
++
++		// Find all the scripts types that intersect the selection.
++		// For moving cursor from char to char then we have no selection,
++		// so use a selection over the previous character if there was one.
++		// If there is no previous character, then we'll eventually fallback
++		// to the input language.
++    		if ( !rSel.HasRange() && nS )
++		{
++    			DBG_ASSERT( nS == nE && nStartPara == nEndPara, "Move in sich selbst ?" );
++			--nS;
++		}
++
  		for ( USHORT n = 0; n < rTypes.Count(); n++ )
  		{
 -			if ( ( rTypes[n].nStartPos <= nE ) && ( rTypes[n].nEndPos >= nS ) )
-+            if (rTypes[n].nStartPos <= nS  &&  nE <= rTypes[n].nEndPos)
++			if ( ( nS < rTypes[n].nEndPos ) && ( nE > rTypes[n].nStartPos ) )
  		   	{
  				if ( rTypes[n].nScriptType != i18n::ScriptType::WEAK )
  				{
-@@ -1780,6 +1783,7 @@
-                         nScriptType = rTypes[n-1].nScriptType;
-                     }
- 				}
-+				break;
- 			}
- 		}
- 	}




More information about the fedora-extras-commits mailing list