rpms/openoffice.org/FC-6 openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch, 1.2, 1.3 openoffice.org.spec, 1.897, 1.898

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8412

Modified Files:
	openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch 
	openoffice.org.spec 
Log Message:
fix 213329

openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch:
 gtkframe.cxx |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

Index: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch	19 Sep 2006 10:53:19 -0000	1.2
+++ openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch	1 Nov 2006 12:02:57 -0000	1.3
@@ -1,14 +1,21 @@
 diff -ru vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
 --- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	2006-08-29 10:35:14.000000000 +0100
 +++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	2006-08-29 11:07:27.000000000 +0100
-@@ -2816,7 +2816,9 @@
+@@ -2816,7 +2832,16 @@
      
              if( checkSingleKeyCommitHack( rKP.keyval, aOrigCode ) )
              {
 -                pThis->m_pFrame->doKeyCallback( rKP.state, rKP.keyval, rKP.hardware_keycode, rKP.group, rKP.time, aOrigCode, true, true );
-+		pThis->m_pFrame->doKeyCallback( rKP.state, gdk_unicode_to_keyval(aOrigCode), 0, 0,
-+			gdk_x11_display_get_user_time(pThis->m_pFrame->getGdkDisplay()),
-+			aOrigCode, true, true );
++		if (aOrigCode == '.')
++		{
++                	pThis->m_pFrame->doKeyCallback( rKP.state, rKP.keyval, rKP.hardware_keycode, rKP.group, 
++				rKP.time, aOrigCode, true, true );
++		}
++		else
++		{
++			pThis->m_pFrame->doKeyCallback( rKP.state, gdk_unicode_to_keyval(aOrigCode), 0, 0, 
++				gdk_x11_display_get_user_time(pThis->m_pFrame->getGdkDisplay()), aOrigCode, true, true );
++		}
                  bSingleCommit = true;
              }
          }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -r1.897 -r1.898
--- openoffice.org.spec	31 Oct 2006 17:07:55 -0000	1.897
+++ openoffice.org.spec	1 Nov 2006 12:02:57 -0000	1.898
@@ -2542,6 +2542,7 @@
 - Resolves: rhbz#212009 add workspace.fwk53.patch
 - Resolves: rhbz#212141 add openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch
 - Resolves: rhbz#212988 try /tmp if /home fails, and abort with a message instead of segv
+- Resolves: rhbz#213329 "." from numeric keypad not converted to "," in appropiate locales
 
 * Thu Oct 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.4
 - add openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch for rh#210440#