rpms/openoffice.org/devel openoffice.org-3.0.0.ooo94318.greekmenu.crash, NONE, 1.1 openoffice.org.spec, 1.1658, 1.1659

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo94318.greekmenu.crash 
Log Message:
Resolves: rhbz#463884 openoffice.org-3.0.0.ooo94318.greekmenu.crash


--- NEW FILE openoffice.org-3.0.0.ooo94318.greekmenu.crash ---
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: localize.sdf
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf	11 Apr 2008 13:44:48 -0000	1.45
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/localize.sdf	16 Apr 2008 13:29:11 -0000	1.46
@@ -143041,7 +144325,7 @@
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	da	~Rediger				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	de	~Bearbeiten				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	dz	ཞུན་དག(~E)				2002-02-02 02:02:02
-officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	el	~				2002-02-02 02:02:02
+officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	el	Ε~πεξεργασία				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	en-GB	~Edit				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	en-ZA	~Edit				2002-02-02 02:02:02
 officecfg	registry\data\org\openoffice\Office\UI\GenericCommands.xcu	0	value	..GenericCommands.UserInterface.Popups..uno:EditMenu	Label			0	eo	Redakti				2002-02-02 02:02:02


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1658
retrieving revision 1.1659
diff -u -r1.1658 -r1.1659
--- openoffice.org.spec	24 Sep 2008 07:39:55 -0000	1.1658
+++ openoffice.org.spec	25 Sep 2008 10:56:52 -0000	1.1659
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 7
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -115,6 +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
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1315,6 +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
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3679,6 +3681,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 25 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-7.2
+- Resolves: rhbz#463884 openoffice.org-3.0.0.ooo94318.greekmenu.crash
+
 * Sun Sep 21 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-7.1
 - Tswana, Ukrainian, Urdu spellcheckers
 - Resolves: rhbz#462833 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch