diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-05-26 00:00:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-26 00:00:34 +0100 |
| commit | 4e681e94fd49314a1351312fa62fdac8da8a8814 (patch) | |
| tree | f3b4dbf195476a8c940fca2a68d0798224c9cd9e /sd | |
| parent | 9770dac1dfe25997e933b01e7a1137ec7cb3fa05 (diff) | |
recover impress presentation wizard
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 6 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdabstdlg.cxx | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 5663fd97c7fa..a96e3b8e2594 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 e9497cc3ea26..61f4647502b6 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 ) |