diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 3 | ||||
| -rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 72877b359b3a..e271b3ea1c7f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -45,6 +45,9 @@ $(eval $(call gb_Library_set_include,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\ -DVCL_DLLIMPLEMENTATION \ + -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \ + -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,desktop_detector)\" \ + -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,tk)\" \ )) $(eval $(call gb_Library_use_sdk_api,vcl)) diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 7afd3f4670d8..5428d2bc4f79 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -277,7 +277,6 @@ #include <config_features.h> #include <config_folders.h> #include <config_graphite.h> -#include <config_libraries.h> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/factory.hxx> diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 50cda48010c6..a1c59ef0819b 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> -#include <config_libraries.h> #include "comphelper/processfactory.hxx" @@ -1404,7 +1403,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist ) if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate ) { #ifndef DISABLE_DYNLOADING - OUString aLibName(LIBO_LIBRARY(tk)); + OUString aLibName(TK_DLL_NAME); oslModule hTkLib = osl_loadModuleRelative( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hTkLib ) diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 5cdb7575579a..869800ace32d 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> -#include <config_libraries.h> #include <rtl/ustring.hxx> #include <osl/module.hxx> @@ -38,10 +37,13 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, LIBO_LIBRARY(cui), - SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) + if (aDialogLibrary.is() || + aDialogLibrary.loadRelative(&thisModule, CUI_DLL_NAME, + SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY)) + { fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ); + } #else fp = CreateDialogFactory; #endif diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 0fd81dc9ac18..ff0899d43099 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_libraries.h> - #include "osl/module.h" #include "osl/process.h" @@ -117,7 +115,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals static DesktopType get_desktop_environment() { - OUString aModule(LIBO_LIBRARY(desktop_detector)); + OUString aModule(DESKTOP_DETECTOR_DLL_NAME); oslModule aMod = osl_loadModuleRelative( reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, SAL_LOADMODULE_DEFAULT ); |