diff options
Diffstat (limited to 'vcl/unx/gtk/app/gtkinst.cxx')
-rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 159820ec3dbd..3eb410e0dbcd 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ void GtkHookedYieldMutex::release() SalYieldMutex::release(); } -extern "C" +extern "C" { #define GET_YIELD_MUTEX() static_cast<GtkHookedYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex()) static void GdkThreadsEnter( void ) @@ -161,7 +161,7 @@ extern "C" pYieldMutex = new GtkHookedYieldMutex(); else pYieldMutex = new GtkYieldMutex(); - + gdk_threads_init(); GtkInstance* pInstance = new GtkInstance( pYieldMutex ); @@ -205,7 +205,7 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind // so we need the X11SalObject in that case if( pWindowData ) return X11SalObject::CreateObject( pParent, pWindowData, bShow ); - + return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow ); } @@ -224,8 +224,8 @@ void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r #else static getDefaultFnc sym_gtk_recent_manager_get_default = (getDefaultFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_get_default" ); - - static addItemFnc sym_gtk_recent_manager_add_item = + + static addItemFnc sym_gtk_recent_manager_add_item = (addItemFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_add_item"); if (sym_gtk_recent_manager_get_default && sym_gtk_recent_manager_add_item) { @@ -307,13 +307,13 @@ sal_Bool GtkYieldMutex::tryToAcquire() // how to we do a try_lock without having a gdk_threads_try_enter ? if( ! g_mutex_trylock( gdk_threads_mutex ) ) return sal_False; - + // obtained gdk mutex, now lock count is one by definition SolarMutexObject::acquire(); mnCount = 1; mnThreadId = aCurrentThread; SolarMutexObject::release(); - + return sal_True; } |