From 5c5edaef89e953d260501678c3d62c47ad9763ac Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Thu, 8 Jan 2015 21:14:04 +0100
Subject: Revert "Use SVLIBRARY instead of gb_Library_get_runtime_filename"

$(call gb_Library__get_name,foo) returns "libmerged" if library foo is merged.

This reverts commit ee567a63fad9e755b11ca28696da35f00ed3b0fc.

Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a
---
 sd/Library_sd.mk               | 1 +
 sd/source/ui/dlg/sdabstdlg.cxx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'sd')

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a38b6eb03ad4..2afcf9bd39d7 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\
 
 $(eval $(call gb_Library_add_defs,sd,\
 	-DSD_DLLIMPLEMENTATION \
+	-DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,sdui))\" \
 ))
 
 ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 4594295fef6a..acf4705329b9 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -42,7 +42,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
-    static const OUString sLibName(SVLIBRARY("sdui"));
+    static const OUString sLibName(SDUI_DLL_NAME);
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
         fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
             aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" );
-- 
cgit