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

[strba svn gnome org]

Author: strba
Date: Tue Mar 18 15:22:15 2008
New Revision: 11935
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11935&view=rev

Log:
add includes to be able to build on Solaris

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	Tue Mar 18 15:22:15 2008
@@ -271,12 +271,14 @@
 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-03-01 22:26:55.000000000 -0500
-@@ -86,6 +86,10 @@ Status XineramaGetInfo(Display*, int, XR
+@@ -86,6 +86,12 @@ Status XineramaGetInfo(Display*, int, XR
  #endif
  #endif
  
 +#if __XTestExtension__
 +#include <X11/extensions/XTest.h>
++#include <X11/extensions/XKB.h>
++#include <X11/XKBlib.h>
 +#endif
 +
  #include <postx.h>
@@ -301,7 +303,7 @@
 +
 +USHORT SalDisplay::GetIndicatorState() const
 +{
-+    unsigned int _state;
++    unsigned int _state = 0;
 +    USHORT nState = 0;
 +    XkbGetIndicatorState(pDisp_, XkbUseCoreKbd, &_state);
 +