diff options
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | RepositoryExternal.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 | ||||
-rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
-rw-r--r-- | vcl/Library_vclplug_svp.mk | 65 | ||||
-rw-r--r-- | vcl/Module_vcl.mk | 1 | ||||
-rw-r--r-- | vcl/headless/svpdata.cxx | 2 | ||||
-rw-r--r-- | vcl/inc/headless/svpinst.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 7 |
10 files changed, 7 insertions, 79 deletions
diff --git a/Repository.mk b/Repository.mk index 1dda9f4214c3..7b6f7d673a50 100644 --- a/Repository.mk +++ b/Repository.mk @@ -450,7 +450,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ vclplug_gen \ $(if $(ENABLE_TDE),vclplug_tde) \ - $(if $(ENABLE_HEADLESS),,vclplug_svp) \ ) \ writerperfect \ xmlscript \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 44036ddbb1cb..e3dc039a2b54 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3813,9 +3813,6 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ ,$(call gb_ComponentTarget_get_target_for_build,$(component))) \ $(call gb_AllLangResTarget_get_target,ofa) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ - $(call gb_Library_get_target,vclplug_svp) \ - )) \ $(call gb_Package_get_target_for_build,postprocess_images) \ $(call gb_Package_get_target_for_build,postprocess_registry) \ $(call gb_Rdb_get_target_for_build,ure/services) \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index f7c857713cbe..970e8b909474 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -168,7 +168,6 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstr ifeq ($(GUIBASE),unx) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,desktop_detector) $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \ - $(call gb_Library_get_target,vclplug_svp), \ $(call gb_Library_get_target,vclplug_gen) \ $(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \ $(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 3c73485ccaf5..ea2b600963d1 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -153,9 +153,6 @@ gb_MERGEDLIBS := \ utl \ uui \ vcl \ - $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ - $(if $(ENABLE_HEADLESS),,vclplug_svp) \ - ) \ xmlscript \ xo \ xstor \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 08b08e9c022d..a1a2d7fbd874 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -49,7 +49,6 @@ $(eval $(call gb_Library_add_defs,vcl,\ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \ -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \ -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \ - -DVCLPLUG_SVP_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,vclplug_svp))\" \ )) $(eval $(call gb_Library_use_sdk_api,vcl)) diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk deleted file mode 100644 index 3084ec8d06fd..000000000000 --- a/vcl/Library_vclplug_svp.mk +++ /dev/null @@ -1,65 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_Library_Library,vclplug_svp)) - -$(eval $(call gb_Library_set_include,vclplug_svp,\ - $$(INCLUDE) \ - -I$(SRCDIR)/vcl/inc \ -)) - -$(eval $(call gb_Library_add_defs,vclplug_svp,\ - -DVCLPLUG_SVP_IMPLEMENTATION \ -)) - -$(eval $(call gb_Library_use_sdk_api,vclplug_svp)) - -$(eval $(call gb_Library_use_libraries,vclplug_svp,\ - vcl \ - tl \ - utl \ - sot \ - ucbhelper \ - basegfx \ - basebmp \ - comphelper \ - cppuhelper \ - i18nlangtag \ - i18nutil \ - $(if $(ENABLE_JAVA), \ - jvmaccess) \ - cppu \ - sal \ -)) - -$(eval $(call gb_Library_use_externals,vclplug_svp,\ - boost_headers \ - freetype_headers \ - icuuc \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_libs,vclplug_svp,\ - -lm \ - -ldl \ - -lpthread \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 3be0ae4512cb..2cee4380c86c 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_l10n_targets,vcl,\ ifeq ($(GUIBASE),unx) $(eval $(call gb_Module_add_targets,vcl,\ - Library_vclplug_svp \ Library_vclplug_gen \ Library_desktop_detector \ StaticLibrary_glxtest \ diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index 1dcb8cabd897..f5b25a1150f7 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -21,7 +21,7 @@ public: // plugin factory function extern "C" { - SAL_DLLPUBLIC_EXPORT SalInstance* create_SalInstance() + SalInstance* svp_create_SalInstance() { SvpSalInstance* pInstance = new SvpSalInstance( new SalYieldMutex() ); new SvpSalData( pInstance ); diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 63fa483df951..d68d22b547c5 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -57,6 +57,8 @@ public: class SvpSalFrame; class GenPspGraphics; +extern "C" SalInstance* svp_create_SalInstance(); + class VCL_DLLPUBLIC SvpSalInstance : public SalGenericInstance { timeval m_aTimeout; 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, |