rpms/openoffice.org/devel workspace.vcl95.patch, NONE, 1.1 openoffice.org.spec, 1.1661, 1.1662 openoffice.org-3.0.0.ooo94318.greekmenu.crash, 1.2, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl95.patch 
Removed Files:
	openoffice.org-3.0.0.ooo94318.greekmenu.crash 
Log Message:
resync patch

workspace.vcl95.patch:

--- NEW FILE workspace.vcl95.patch ---
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.242.2.1
diff -u -r1.242.2.1 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	26 Aug 2008 12:25:34 -0000	1.242.2.1
+++ openoffice.org/vcl/source/gdi/outdev3.cxx	25 Sep 2008 10:24:27 -0000
@@ -7083,20 +7084,23 @@
                 nMnemonicPos = nLen-1;
             }
 
-            sal_Int32* pCaretXArray = (sal_Int32*)alloca( 2 * sizeof(sal_Int32) * nLen );
-            /*BOOL bRet =*/ GetCaretPositions( aStr, pCaretXArray, nIndex, nLen );
-            long lc_x1 = pCaretXArray[ 2*(nMnemonicPos - nIndex) ];
-            long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
-            nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
-
-            Point aTempPos( Min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
-            if( bInvalidPos )  // #106952#, place behind the (last) character
-                aTempPos = Point( Max(lc_x1,lc_x2), GetFontMetric().GetAscent() );
-
-			aTempPos += rPos;
-            aTempPos = LogicToPixel( aTempPos );
-            nMnemonicX = mnOutOffX + aTempPos.X();
-            nMnemonicY = mnOutOffY + aTempPos.Y();
+            if ( nMnemonicPos != STRING_NOTFOUND )
+            {
+                sal_Int32* pCaretXArray = (sal_Int32*)alloca( 2 * sizeof(sal_Int32) * nLen );
+                /*BOOL bRet =*/ GetCaretPositions( aStr, pCaretXArray, nIndex, nLen );
+                long lc_x1 = pCaretXArray[ 2*(nMnemonicPos - nIndex) ];
+                long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
+                nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
+
+                Point aTempPos( Min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
+                if( bInvalidPos )  // #106952#, place behind the (last) character
+                    aTempPos = Point( Max(lc_x1,lc_x2), GetFontMetric().GetAscent() );
+    
+    			aTempPos += rPos;
+                aTempPos = LogicToPixel( aTempPos );
+                nMnemonicX = mnOutOffX + aTempPos.X();
+                nMnemonicY = mnOutOffY + aTempPos.Y();
+            }
         }
     }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1661
retrieving revision 1.1662
diff -u -r1.1661 -r1.1662
--- openoffice.org.spec	28 Sep 2008 21:04:39 -0000	1.1661
+++ openoffice.org.spec	28 Sep 2008 21:40:05 -0000	1.1662
@@ -115,7 +115,7 @@
 Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 Patch46: workspace.vcl94.patch
-Patch47: openoffice.org-3.0.0.ooo94318.greekmenu.crash
+Patch47: workspace.vcl95.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1316,7 +1316,7 @@
 %patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 %patch46 -p1 -b .workspace.vcl94.patch
-%patch47 -p1 -b .ooo94318.greekmenu.crash
+%patch47 -p1 -b .workspace.vcl95.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.0.0.ooo94318.greekmenu.crash DELETED ---