ooo-build r11766 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Sun Mar  2 02:13:56 2008
New Revision: 11766
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11766&view=rev

Log:
2008-03-01  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/autocorrect-accidental-caps-lock-vcl.diff: fixed some
	silly mistake & removed CR from two lines I added while I was on 
	Windows.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff

Modified: trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff
==============================================================================
--- trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff	(original)
+++ trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff	Sun Mar  2 02:13:56 2008
@@ -295,7 +295,7 @@
      virtual void                SetBackgroundBitmap( SalBitmap* pBitmap );
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/source/app/saldisp.cxx vcl/unx/source/app/saldisp.cxx
 --- vcl.clean/unx/source/app/saldisp.cxx	2008-01-29 11:22:34.000000000 -0500
-+++ vcl/unx/source/app/saldisp.cxx	2008-02-28 13:17:22.000000000 -0500
++++ vcl/unx/source/app/saldisp.cxx	2008-03-01 21:10:56.000000000 -0500
 @@ -86,6 +86,10 @@ Status XineramaGetInfo(Display*, int, XR
  #endif
  #endif
@@ -318,7 +318,7 @@
 +    if (nKeyCode == KEY_CAPSLOCK)
 +    {
 +        XLIB_KeyCode keyCaps = XKeysymToKeycode(GetDisplay(), XK_Caps_Lock);
-+        if (!XTestFakeKeyEvent(GetDisplay(), keyCaps, true, CurrentTime) == XLIB_Success)
++        if (XTestFakeKeyEvent(GetDisplay(), keyCaps, true, CurrentTime) == XLIB_Success)
 +            XTestFakeKeyEvent(GetDisplay(), keyCaps, false, CurrentTime);
 +    }
 +#endif
@@ -379,7 +379,7 @@
      virtual void                SetBackgroundBitmap( SalBitmap* );
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/win/source/window/salframe.cxx vcl/win/source/window/salframe.cxx
 --- vcl.clean/win/source/window/salframe.cxx	2008-01-15 08:25:15.000000000 -0500
-+++ vcl/win/source/window/salframe.cxx	2008-03-01 20:49:02.000000000 -0500
++++ vcl/win/source/window/salframe.cxx	2008-03-01 21:12:23.000000000 -0500
 @@ -3177,6 +3177,41 @@ SalFrame::SalPointerState WinSalFrame::G
  
  // -----------------------------------------------------------------------
@@ -412,8 +412,8 @@
 +
 +    if (nVKey > 0 && nVKey < 255)
 +    {
-+        ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY, 0);
-+        ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY|KEYEVENTF_KEYUP, 0);
++        ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY, 0);
++        ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY|KEYEVENTF_KEYUP, 0);
 +    }
 +}
 +