diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-12 14:48:57 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-12 22:14:52 +0200 |
| commit | 145dd11c95fcaaec4e3228f114e3bee677702abf (patch) | |
| tree | cc5c80806a4c099e66580a1da2b34f21644bdd3e /vcl | |
| parent | 9201704ede70498a850bee6d15f0340d58f3889c (diff) | |
Hardcode to try just the "svp" VCL plugin on Android for now
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
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[] = |