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

[Stephan Bergmann]

 vcl/unx/generic/plugadapt/salplug.cxx |    4 ++--
 vcl/unx/gtk/app/gtkinst.cxx           |    3 +--
 vcl/unx/kde/kdedata.cxx               |    3 +--
 vcl/unx/kde4/main.cxx                 |    2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 852c8e53d7bdb978951ab2703085341ee529a211
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Fri Jun 27 18:15:55 2014 +0200

    create_SalInstance does not need an oslModule parameter
    
    Change-Id: I658974102f544185bf27f985bc920d8d54b40656

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index ff0899d..cf7ff97 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -33,7 +33,7 @@
 #include <unistd.h>
 
 extern "C" {
-typedef SalInstance*(*salFactoryProc)( oslModule pModule);
+typedef SalInstance*(*salFactoryProc)();
 }
 
 static oslModule pCloseModule = NULL;
@@ -63,7 +63,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, 
bool bForce = fals
         salFactoryProc aProc = (salFactoryProc)osl_getAsciiFunctionSymbol( 
aMod, "create_SalInstance" );
         if( aProc )
         {
-            pInst = aProc( aMod );
+            pInst = aProc();
             SAL_INFO(
                 "vcl.plugadapt",
                 "sal plugin " << aModule << " produced instance " << pInst);
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 6389cf0..042d541 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -19,7 +19,6 @@
 
 #include <stack>
 #include <string.h>
-#include <osl/module.h>
 #include <osl/process.h>
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
@@ -58,7 +57,7 @@ extern "C"
         pYieldMutex->ThreadsLeave();
     }
 
-    VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance( oslModule )
+    VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance()
     {
         SAL_INFO(
             "vcl.gtk",
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index b9385ca..9ec9a28 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -35,7 +35,6 @@
 
 #include <osl/thread.h>
 #include <osl/process.h>
-#include <osl/module.h>
 #include <osl/mutex.hxx>
 
 #include "unx/kde/kdedata.hxx"
@@ -202,7 +201,7 @@ void KDEData::Init()
  **********************************************************************/
 
 extern "C" {
-    VCLPLUG_KDE_PUBLIC SalInstance* create_SalInstance( oslModule )
+    VCLPLUG_KDE_PUBLIC SalInstance* create_SalInstance()
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 38b5422..f4f9775 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -34,7 +34,7 @@
 
 /// entry point for the KDE4 VCL plugin
 extern "C" {
-    VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance( oslModule )
+    VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance()
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits