Fold URE: Windows

Desktop / LibreOffice - Stephan Bergmann [redhat.com] - 3 December 2014 08:19 UTC

...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is no longer necessary and loading of cppuhelper from the program dir cannot fail regardless in whatever scenario the cli_cppuhelper library itself is loaded.

827430c Fold URE: Windows
RepositoryExternal.mk | 4 -
bridges/Jar_java_uno.mk | 3 +-
cli_ure/source/native/native_bootstrap.cxx | 261 --------------------
cli_ure/source/native/path.cxx | 163 ------------
configure.ac | 10 +-
desktop/Executable_soffice.mk | 2 +-
desktop/Executable_soffice_bin.mk | 5 -
desktop/Executable_unopkg.mk | 2 +-
desktop/Module_desktop.mk | 2 +-
desktop/StaticLibrary_winextendloaderenv.mk | 17 --
desktop/StaticLibrary_winloader.mk | 17 ++
desktop/win32/source/extendloaderenvironment.cxx | 142 -----------
desktop/win32/source/extendloaderenvironment.hxx | 87 -------
desktop/win32/source/guiloader/genericloader.cxx | 4 +-
desktop/win32/source/loader.cxx | 72 ++++++
desktop/win32/source/loader.hxx | 85 +++++++
desktop/win32/source/officeloader/officeloader.cxx | 4 +-
desktop/win32/source/unoinfo.cxx | 30 +--
external/libxml2/ExternalPackage_xml2_win32.mk | 26 --
external/libxml2/Module_libxml2.mk | 1 -
include/tools/pathutils.hxx | 13 -
instsetoo_native/CustomTarget_setup.mk | 8 +-
javaunohelper/Jar_juh.mk | 3 +-
jurt/Jar_jurt.mk | 3 +-
jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk | 2 +-
odk/config/cfgWin.js | 20 +-
odk/settings/settings.mk | 4 +-
pyuno/zipcore/python.cxx | 21 +-
scp2/inc/macros.inc | 17 +-
scp2/source/ooo/common_brand.scp | 4 -
scp2/source/ooo/ure.scp | 46 +---
tools/source/misc/pathutils.cxx | 101 --------
ure/Package_install.mk | 2 -
ure/source/ure-link | 1 -
34 files changed, 214 insertions(+), 968 deletions(-)

Upstream: cgit.freedesktop.org

  • Share