summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-02-24 16:51:31 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-02-25 09:05:09 +0100
commitc47496fdf9f0ec396f15fb9ddde6bd8d244a1797 (patch)
tree739b259a6d79e53ddfc673c5c7d40ebc4c634387 /sd
parentgbuild: deduplicate by new gb_Helper_replace_if_different_and_touch (diff)
downloadcore-c47496fdf9f0ec396f15fb9ddde6bd8d244a1797.tar.gz
core-c47496fdf9f0ec396f15fb9ddde6bd8d244a1797.zip
Add config_libraries.h definitions to get library names easily.
Works for libmerged too, so we can get rid of LIBO_MERGELIBS. And remove few more #defines in vcl. It's generated by gbuild, so probably abusing config_host directory. Open to improvements. Change-Id: I87ab109bf109e42751766011daf076e9cdf8f5ee
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/sdabstdlg.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index cc57f68fc360..fc83a93248b5 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -18,12 +18,12 @@
*/
#include <config_features.h>
+#include <config_libraries.h>
#include "sdabstdlg.hxx"
#include <osl/module.hxx>
#include <rtl/ustring.hxx>
-#include <vcl/unohelp.hxx>
typedef SdAbstractDialogFactory* (SAL_CALL *SdFuncPtrCreateDialogFactory)();
@@ -43,7 +43,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
- static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", true));
+ static const OUString sLibName(LIBO_LIBRARY(sdui));
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" );