diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-03-20 16:57:22 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-03-20 17:55:08 +0200 |
| commit | 41c66312885393614c274897fd75a25c2ddf6ba0 (patch) | |
| tree | 32b0daca01dc17aba0c03c029890e05eb9c21b47 /vcl/unx/generic/plugadapt | |
| parent | 9527eeec237f5d797a6420371c76f95246adeb84 (diff) | |
The 'svp' "plug-in" library is empty so don't build it at all
Its code is in the vcl library nowadays.
Change-Id: Idb659e541226724004660102f6641c38a2312c27
Diffstat (limited to 'vcl/unx/generic/plugadapt')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 69e3f6080856..038951bd5280 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -26,6 +26,7 @@ #include "salinst.hxx" #include "generic/gensys.h" #include "generic/gendata.hxx" +#include "headless/svpinst.hxx" #include "unx/desktops.hxx" #include "vcl/printerinfomanager.hxx" #include <config_vclplug.h> @@ -63,6 +64,9 @@ static oslModule pCloseModule = NULL; static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false ) { + if (rModuleBase == "svp") + return svp_create_SalInstance(); + SalInstance* pInst = NULL; // Disable gtk3 plugin for now unless explicitly requested via // SAL_USE_VCLPLUGIN=gtk3 (would ideally depend on experimental mode, but @@ -77,9 +81,6 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals SAL_DLLPREFIX #endif "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION ); - // vclplug_svp is in libmerged - if (rModuleBase == "svp") - aModule = VCLPLUG_SVP_DLL_NAME; oslModule aMod = osl_loadModuleRelative( reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, |