diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-03 17:58:18 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-03 17:58:18 +0200 |
| commit | 155250b64550030864994a1fee40132944b7cac6 (patch) | |
| tree | 42e5c0bfb3f41f4d94295803a6862389084a5102 | |
| parent | 964eb7decfe7898c6e0518bf99fb2a9790ffecef (diff) | |
CWS gnumake2: getting rid of swuilib.hxx hack
| -rw-r--r-- | sw/prj/target_lib_swui.mk | 16 | ||||
| -rw-r--r-- | sw/source/ui/dialog/makefile.mk | 20 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swabstdlg.cxx | 5 |
3 files changed, 3 insertions, 38 deletions
diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk index e33956b9f400..12227c9a0ae8 100644 --- a/sw/prj/target_lib_swui.mk +++ b/sw/prj/target_lib_swui.mk @@ -166,22 +166,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/utlui/swrenamexnameddlg \ )) -$(WORKDIR)/Misc/sw/swuilib.hxx : - $(call gb_Helper_announce,Creating swuilib.hxx ...) - mkdir -p `dirname $@` && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ - -.PHONY : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx -$(WORKDIR)/Clean/Misc/sw/swuilib.hxx : - $(call gb_Helper_announce,Cleaning up swuilib.hxx ...) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(WORKDIR)/Misc/sw/swuilib.hxx) - - -$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) \ -$(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx - -$(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx - ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,swui,\ advapi32 \ diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk index 54b7784946e8..35bc3022909e 100644 --- a/sw/source/ui/dialog/makefile.mk +++ b/sw/source/ui/dialog/makefile.mk @@ -81,23 +81,3 @@ LIB1OBJFILES = \ # --- Tagets ------------------------------------------------------- .INCLUDE : target.mk -$(INCCOM)$/swuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libswui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE -.IF "$(USE_SHELL)"!="4nt" - echo \#define DLL_NAME \"swui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE # "$(USE_SHELL)"!="4nt" - echo #define DLL_NAME "swui$(DLLPOSTFIX)$(DLLPOST)" >$@ -.ENDIF # "$(USE_SHELL)"!="4nt" -.ENDIF - -$(SLO)$/swabstdlg.obj : $(INCCOM)$/swuilib.hxx - - - - - - - diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index a39c1866b717..b873d8028024 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -29,10 +29,10 @@ #include "precompiled_sw.hxx" #include "swabstdlg.hxx" -#include "swuilib.hxx" #include <osl/module.hxx> #include <tools/string.hxx> +#include <vcl/unohelp.hxx> typedef SwAbstractDialogFactory* (__LOADONCALLAPI *SwFuncPtrCreateDialogFactory)(); @@ -42,7 +42,8 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() { SwFuncPtrCreateDialogFactory 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("swui", TRUE)); + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ) ) ) fp = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") ); if ( fp ) |