diff options
Diffstat (limited to 'editors/openoffice.org-3-devel/files/patch-i66667')
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i66667 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/editors/openoffice.org-3-devel/files/patch-i66667 b/editors/openoffice.org-3-devel/files/patch-i66667 index 6e3a697c4bf0..26c0b1b4a88c 100644 --- a/editors/openoffice.org-3-devel/files/patch-i66667 +++ b/editors/openoffice.org-3-devel/files/patch-i66667 @@ -1,10 +1,10 @@ -Index: gtkinst.cxx +Index: vcl/unx/gtk/app/gtkinst.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v -retrieving revision 1.13 -diff -u -r1.13 gtkinst.cxx ---- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13 -+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000 +retrieving revision 1.14 +diff -u -r1.14 gtkinst.cxx +--- vcl/unx/gtk/app/gtkinst.cxx 19 Jun 2006 19:44:33 -0000 1.14 ++++ vcl/unx/gtk/app/gtkinst.cxx 27 Jun 2006 02:11:09 -0000 @@ -43,6 +43,7 @@ #include <plugins/gtk/atkbridge.hxx> @@ -13,7 +13,7 @@ diff -u -r1.13 gtkinst.cxx #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> -@@ -111,13 +112,28 @@ +@@ -111,13 +112,27 @@ GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX(); pYieldMutex->ThreadsLeave(); } @@ -38,14 +38,13 @@ diff -u -r1.13 gtkinst.cxx +#endif + return false; + } -+ GdkLockFn gdk_threads_set_lock_functions = -- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData ); +- (GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData ); + (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData ); if ( !gdk_threads_set_lock_functions ) { #if OSL_DEBUG_LEVEL > 1 -@@ -150,7 +166,7 @@ +@@ -150,7 +165,7 @@ if ( !g_thread_supported() ) g_thread_init( NULL ); |