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

[kyoshida svn gnome org]

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

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

	* patches/src680/apply: moved AutoCorrectCapsLock section from 
	NovellBase to Common.
	
	* patches/src680/autocorrect-accidental-caps-lock-vcl.diff: enabled 
	autocorrection of accidental cAPS LOCK USE on Windows.


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

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Sun Mar  2 02:06:21 2008
@@ -14,7 +14,7 @@
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
-	 OOXML, SVGImport
+	 OOXML, SVGImport, AutoCorrectCapsLock
 
 LinuxCommon : Common, EMFPlus, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
@@ -40,7 +40,7 @@
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, CalcSolver, Split, Shrink, \
-	     CalcDataPilotDrillDown, AutoCorrectCapsLock
+	     CalcDataPilotDrillDown
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase

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:06:21 2008
@@ -379,8 +379,8 @@
      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-02-28 12:59:31.000000000 -0500
-@@ -3177,6 +3177,19 @@ SalFrame::SalPointerState WinSalFrame::G
++++ vcl/win/source/window/salframe.cxx	2008-03-01 20:49:02.000000000 -0500
+@@ -3177,6 +3177,41 @@ SalFrame::SalPointerState WinSalFrame::G
  
  // -----------------------------------------------------------------------
  
@@ -388,11 +388,33 @@
 +{
 +    SalIndicatorState aState;
 +    aState.mnState = 0;
++    if (::GetKeyState(VK_CAPITAL))
++        aState.mnState |= INDICATOR_CAPSLOCK;
++
++    if (::GetKeyState(VK_NUMLOCK))
++        aState.mnState |= INDICATOR_NUMLOCK;
++
++    if (::GetKeyState(VK_SCROLL))
++        aState.mnState |= INDICATOR_SCROLLLOCK;
++
 +    return aState;
 +}
 +
-+void WinSalFrame::SimulateKeyPress( USHORT /*nKeyCode*/ )
++void WinSalFrame::SimulateKeyPress( USHORT nKeyCode )
 +{
++    BYTE nVKey = 0;
++    switch (nKeyCode)
++    {
++        case KEY_CAPSLOCK:
++            nVKey = VK_CAPITAL;
++        break;
++    }
++
++    if (nVKey > 0 && nVKey < 255)
++    {
++        ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY, 0);
++        ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY|KEYEVENTF_KEYUP, 0);
++    }
 +}
 +
 +// -----------------------------------------------------------------------
@@ -400,3 +422,4 @@
  void WinSalFrame::SetBackgroundBitmap( SalBitmap* )
  {
  }
+Only in vcl/win/source/window: salframe.cxx.orig