diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-04 16:11:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:50 +0200 |
| commit | 1817366cb5f61337b34b5284615d3d4e0a8aa68a (patch) | |
| tree | 03ac5b051b6367567c66c6aa6741d63ef9ff7ef1 /vcl/source | |
| parent | 2aab2f4b7b0736e19b76abad652bbb055b18b857 (diff) | |
gbuild: remove config_libraries.h and gb_Helper_generate_config_libraries
This much ugly complexity, generating a header on every gbuild startup
etc. is really not warranted for 6 callers of the generated macros.
Also, the Win32 make has problems with the quoting.
Change-Id: If945e09c1730e52174a6084677842dc611d66b2f
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 8 |
2 files changed, 6 insertions, 5 deletions
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 |