[Libreoffice-commits] .: vcl/unx

[Tor Lillqvist]

 vcl/unx/generic/plugadapt/salplug.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 38b097840f1139ada4abf11c5ce7a4691fa29c0b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Dec 15 08:18:28 2011 +0200

    The "generic" thing is X11-specific

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 9bd9781..8b4488d 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -52,12 +52,12 @@ static oslModule pCloseModule = NULL;
 static SalInstance* tryInstance( const OUString& rModuleBase )
 {
     SalInstance* pInst = NULL;
-
+#ifndef ANDROID
     // Disable gtk3 plugin load except in experimental mode for now.
     if( rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gtk3" ) ) &&
         !SalGenericSystem::enableExperimentalFeatures() )
         return NULL;
-
+#endif
     OUStringBuffer aModName( 128 );
     aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
     aModName.append( rModuleBase );