diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-06 10:28:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-06 10:28:58 +0100 |
| commit | ee567a63fad9e755b11ca28696da35f00ed3b0fc (patch) | |
| tree | 5afb2b0f3dbba8776cd90c62ebeb0a92aea8a616 /vcl | |
| parent | 5f5649420bb836094213f684830b062b3a800eb2 (diff) | |
Use SVLIBRARY instead of gb_Library_get_runtime_filename
Change-Id: I0d21d9685cdc801f7d6975a752999788c1f132e4
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 4 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e8df725ebe32..1595954956fc 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -46,10 +46,6 @@ $(eval $(call gb_Library_set_include,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\ -DVCL_DLLIMPLEMENTATION \ -DVCLOPENGL_DLLIMPLEMENTATION \ - -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/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index da30524932c3..9a4ce120faa2 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1389,7 +1389,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist ) { #ifndef DISABLE_DYNLOADING osl::Module aTkLib; - OUString aLibName(TK_DLL_NAME); + OUString aLibName(SVLIBRARY("tk")); aTkLib.loadRelative(&thisModule, aLibName, SAL_LOADMODULE_DEFAULT); if (aTkLib.is()) { diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 869800ace32d..652ac5ef7dfb 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -21,6 +21,7 @@ #include <rtl/ustring.hxx> #include <osl/module.hxx> +#include <tools/solar.h> #include <vcl/abstdlg.hxx> typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)(); @@ -38,7 +39,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; if (aDialogLibrary.is() || - aDialogLibrary.loadRelative(&thisModule, CUI_DLL_NAME, + aDialogLibrary.loadRelative(&thisModule, SVLIBRARY("cui"), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY)) { fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 80b5acf44722..0d829ae1d751 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -79,7 +79,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION ); // vclplug_svp is in libmerged if (rModuleBase == "svp") - aModule = VCLPLUG_SVP_DLL_NAME; + aModule = SVLIBRARY("vclplug_svp"); oslModule aMod = osl_loadModuleRelative( reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, @@ -141,7 +141,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals static DesktopType get_desktop_environment() { - OUString aModule(DESKTOP_DETECTOR_DLL_NAME); + OUString aModule(SVLIBRARY("desktop_detector")); oslModule aMod = osl_loadModuleRelative( reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, SAL_LOADMODULE_DEFAULT ); |