[Libreoffice-commits] core.git: extensions/source

[Stephan Bergmann]

 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |   17 +++--------------
 extensions/source/plugin/unx/npwrap.cxx             |    2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 15c609f33da44c24e1d0cf19670b0da43738ce0c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 23 09:29:35 2014 +0200

    Use prex.h/postx.h
    
    Change-Id: I055ae0426df86a1ea49385bc8c0b176cc4b9d940

diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 14ed547..b505bda 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -39,13 +39,8 @@
 #    define USE_MOTIF
 #endif
 
-#define Window      XLIB_Window
-#define Font        XLIB_Font
-#define Time        XLIB_Time
-#define Region      XLIB_Region
-#define String      XLIB_String
-#define Boolean     XLIB_Boolean
-#define XPointer    XLIB_XPointer
+#include <prex.h>
+
 #include <X11/Xlib.h>
 extern "C" {
 #include <X11/Intrinsic.h>
@@ -100,13 +95,7 @@ extern "C" {
 #define GtkWidget void
 #endif
 
-#undef Window
-#undef Font
-#undef Time
-#undef String
-#undef Region
-#undef Boolean
-#undef XPointer
+#include <postx.h>
 
 class ConnectorInstance
 {
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 196d913..d5d5fdc 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -154,7 +154,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParent
 
 void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow )
 {
-    XLIB_String n, c;
+    String n, c;
     XtGetApplicationNameAndClass(pXtAppDisplay, &n, &c);
 
     Widget newShell =