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

[Stephan Bergmann]

 extensions/source/plugin/base/xplugin.cxx           |    2 +-
 extensions/source/plugin/inc/plugin/unx/sysplug.hxx |    2 +-
 extensions/source/plugin/unx/npnapi.cxx             |    2 +-
 extensions/source/plugin/unx/npwrap.cxx             |    4 ++--
 extensions/source/plugin/unx/npwrap.hxx             |    2 +-
 extensions/source/plugin/unx/sysplug.cxx            |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d66b757083ddbb14c7bc58f4c34512185abbc60a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 23 14:19:31 2014 +0200

    Leftover XLIB_Window -> Window
    
    Change-Id: I51aa3e3fbf440bbd16d43ab8113cd69937060bf3

diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index f2e4427..bf201a6 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -536,7 +536,7 @@ void XPlugin_Impl::loadPlugin()
             if( !socketpair( AF_UNIX, SOCK_STREAM, 0, sv ) )
                 pComm = new UnxPluginComm( m_aDescription.Mimetype,
                                            m_aDescription.PluginName,
-                                           (XLIB_Window)pEnvData->aWindow,
+                                           (Window)pEnvData->aWindow,
                                            sv[0],
                                            sv[1]
                                            );
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index 982c8ee..b12675f 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -41,7 +41,7 @@ private:
 public:
     UnxPluginComm( const OUString& mimetype,
                    const OUString& library,
-                   XLIB_Window aParent,
+                   Window aParent,
                    int nDescriptor1,
                    int nDescriptor2
                    );
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 8567b56..69b39b2 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -764,7 +764,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                 {
                     if( ! pInst->pWidget )
                     {
-                        pInst->pWidget = CreateNewShell( &(pInst->pShell), (XLIB_Window)pWindow->window );
+                        pInst->pWidget = CreateNewShell( &(pInst->pShell), (Window)pWindow->window );
                     }
 
                     // fill in NPWindow and NPCallbackStruct
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index d5d5fdc..7c7fe66 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -119,7 +119,7 @@ IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ )
 
 }
 
-Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParentWindow )
+Widget createSubWidget( char* /*pPluginText*/, Widget shell, Window aParentWindow )
 {
     Widget newWidget = XtVaCreateManagedWidget(
 #if defined USE_MOTIF
@@ -152,7 +152,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParent
     return newWidget;
 }
 
-void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow )
+void* CreateNewShell( void** pShellReturn, Window aParentWindow )
 {
     String n, c;
     XtGetApplicationNameAndClass(pXtAppDisplay, &n, &c);
diff --git a/extensions/source/plugin/unx/npwrap.hxx b/extensions/source/plugin/unx/npwrap.hxx
index d2b6c96..ffadf00 100644
--- a/extensions/source/plugin/unx/npwrap.hxx
+++ b/extensions/source/plugin/unx/npwrap.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/config.h>
 
-void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow );
+void* CreateNewShell( void** pShellReturn, Window aParentWindow );
 
 void LoadAdditionalLibs(const char*);
 
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index 6289ff8..b19c017 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -52,7 +52,7 @@
 UnxPluginComm::UnxPluginComm(
                              const OUString& /*mimetype*/,
                              const OUString& library,
-                             XLIB_Window aParent,
+                             Window aParent,
                              int nDescriptor1,
                              int nDescriptor2
                              ) :