From 145dd11c95fcaaec4e3228f114e3bee677702abf Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Mon, 12 Dec 2011 14:48:57 +0200
Subject: Hardcode to try just the "svp" VCL plugin on Android for now

---
 vcl/unx/generic/plugadapt/salplug.cxx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'vcl')

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index a496b7cbda5d..9e6f47fd6a8e 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -76,6 +76,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
             {
                 pCloseModule = aMod;
 
+#ifndef ANDROID
                 /*
                  * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
                  * not access the 'gnome_accessibility_module_shutdown' anymore.
@@ -95,7 +96,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
                 {
                     pCloseModule = NULL;
                 }
-
+#endif
                 GetSalData()->m_pPlugin = aMod;
             }
             else
@@ -120,6 +121,8 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
     return pInst;
 }
 
+#ifndef ANDROID
+
 static DesktopType get_desktop_environment()
 {
     OUStringBuffer aModName( 128 );
@@ -142,6 +145,12 @@ static DesktopType get_desktop_environment()
     return ret;
 }
 
+#else
+
+#define get_desktop_environment() DESKTOP_NONE // For now...
+
+#endif
+
 static SalInstance* autodetect_plugin()
 {
     static const char* pKDEFallbackList[] =
-- 
cgit