[Libreoffice-commits] .: sd/Library_sd.mk sd/source

[Caolán McNamara]

 sd/Library_sd.mk               |    6 ------
 sd/source/ui/dlg/sdabstdlg.cxx |    5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit ec873323ba1675bb20887a63deb0335067bcec43
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 26 00:00:34 2011 +0100

    recover impress presentation wizard

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 5663fd9..a96e3b8 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -517,10 +517,4 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 ))
 endif
 
-$(WORKDIR)/inc/sd/sduilib.hxx :
-	mkdir -p $(dir $@) && \
-		echo \#define DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sdui$(DLLPOSTFIX)$(DLLPOST)\" > $@
-
-$(call gb_CxxObject_get_target,sd/source/ui/dlg/sdabstdlg) : $(WORKDIR)/inc/sd/sduilib.hxx
-
 # vim: set noet ts=4 sw=4:
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 93f2b60..c4daa17 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -30,10 +30,10 @@
 #include "precompiled_sd.hxx"
 
 #include "sdabstdlg.hxx"
-#include "sduilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
+#include <vcl/unohelp.hxx>
 
 typedef SdAbstractDialogFactory* (__LOADONCALLAPI *SdFuncPtrCreateDialogFactory)();
 
@@ -43,7 +43,8 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 {
     SdFuncPtrCreateDialogFactory fp = 0;
     static ::osl::Module aDialogLibrary;
-    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+    static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True));
+    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
         fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
             aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
     if ( fp )