[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann]

 vcl/unx/generic/app/saldisp.cxx |   78 ++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

New commits:
commit e4274443340cc73695622dfa94fa09c32217a69e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 11 10:56:39 2013 +0200

    -Werror,-Wunused-const-variable
    
    Change-Id: Id8a5df0151fa07ca36fc84206501b94a3405b114

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 713e9c3..a068967 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -82,45 +82,6 @@ using namespace vcl_sal;
 #define SALCOLOR_WHITE      MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
 #define SALCOLOR_BLACK      MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
 
-static const char* const EventNames[] =
-{
-    NULL,
-    NULL,
-    "KeyPress",
-    "KeyRelease",
-    "ButtonPress",
-    "ButtonRelease",
-    "MotionNotify",
-    "EnterNotify",
-    "LeaveNotify",
-    "FocusIn",
-    "FocusOut",
-    "KeymapNotify",
-    "Expose",
-    "GraphicsExpose",
-    "NoExpose",
-    "VisibilityNotify",
-    "CreateNotify",
-    "DestroyNotify",
-    "UnmapNotify",
-    "MapNotify",
-    "MapRequest",
-    "ReparentNotify",
-    "ConfigureNotify",
-    "ConfigureRequest",
-    "GravityNotify",
-    "ResizeRequest",
-    "CirculateNotify",
-    "CirculateRequest",
-    "PropertyNotify",
-    "SelectionClear",
-    "SelectionRequest",
-    "SelectionNotify",
-    "ColormapNotify",
-    "ClientMessage",
-    "MappingNotify"
-};
-
 inline const char *Null( const char *p ) { return p ? p : ""; }
 inline const char *GetEnv( const char *p ) { return Null( getenv( p ) ); }
 inline const char *KeyStr( KeySym n ) { return Null( XKeysymToString( n ) ); }
@@ -2013,6 +1974,45 @@ long SalX11Display::Dispatch( XEvent *pEvent )
 #ifdef DBG_UTIL
 void SalDisplay::DbgPrintDisplayEvent(const char *pComment, XEvent *pEvent) const
 {
+    static const char* const EventNames[] =
+    {
+        NULL,
+        NULL,
+        "KeyPress",
+        "KeyRelease",
+        "ButtonPress",
+        "ButtonRelease",
+        "MotionNotify",
+        "EnterNotify",
+        "LeaveNotify",
+        "FocusIn",
+        "FocusOut",
+        "KeymapNotify",
+        "Expose",
+        "GraphicsExpose",
+        "NoExpose",
+        "VisibilityNotify",
+        "CreateNotify",
+        "DestroyNotify",
+        "UnmapNotify",
+        "MapNotify",
+        "MapRequest",
+        "ReparentNotify",
+        "ConfigureNotify",
+        "ConfigureRequest",
+        "GravityNotify",
+        "ResizeRequest",
+        "CirculateNotify",
+        "CirculateRequest",
+        "PropertyNotify",
+        "SelectionClear",
+        "SelectionRequest",
+        "SelectionNotify",
+        "ColormapNotify",
+        "ClientMessage",
+        "MappingNotify"
+    };
+
     if( pEvent->type <= MappingNotify )
     {
         fprintf( stderr, "[%s] %s s=%d w=%ld\n",