cppuhelper/source/shlib.cxx | 2 ++ include/sal/log-areas.dox | 6 +++++- ios/CustomTarget_Lo_Xcconfig.mk | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit 09ce5fe4acaf2330d7419f15e132da62747c408d Author: Tor Lillqvist <[email protected]> Date: Fri Jan 24 17:44:27 2014 +0200 Add cppuhelper.shlib Change-Id: I61579c7f84bb3df0d9c493cb93b47a00b0d174b4 diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 8a1c305..6d1311d 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -79,6 +79,11 @@ certain functionality. @li @c comphelper @li @c comphelper.container +@section cppuhelper + +@li @c cppuhelper +@li @c cppuhelper.shlib + @section cui @li @c cui.customize @@ -430,7 +435,6 @@ certain functionality. @li @c cppcanvas @li @c cppcanvas.emf @li @c cppu -@li @c cppuhelper @li @c helpcompiler @li @c linguistic @li @c oox commit 24386ce4e3903cbbc235eb7e1dacb1a5326e966e Author: Tor Lillqvist <[email protected]> Date: Fri Jan 24 16:40:53 2014 +0200 Log what we are about to "load" in the DISABLE_DYNLOADING case Change-Id: I75b9511e82d57da453527e7bc497ec1523ab2216 diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 2d1d1df..9218581 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -186,6 +186,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory( std::abort();//TODO } rtl::OUString name(prefix == "direct" ? implementation : uri); + SAL_INFO("cppuhelper.shlib", "prefix=" << prefix << " implementation=" << implementation << " uri=" << uri); lib_to_factory_mapping const * map = lo_get_factory_map(); component_getFactoryFunc fp = 0; for (int i = 0; map[i].name != 0; ++i) { @@ -205,6 +206,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory( getEnvironment(environment, implementation), fp, uri, implementation, serviceManager); } else { + SAL_INFO("cppuhelper.shlib", "constructor=" << constructor); lib_to_constructor_mapping const * map = lo_get_constructor_map(); for (int i = 0; map[i].name != 0; ++i) { if (constructor.equalsAscii(map[i].name)) { commit f3f77f5562b24591e25750eacd5baf676a84c243 Author: Tor Lillqvist <[email protected]> Date: Fri Jan 24 15:48:14 2014 +0200 Produce a ld map file, too Change-Id: Ieded05eb402e3d87ad039cd06b86e99114ff5afe diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk index 31a6973..d8e3712 100644 --- a/ios/CustomTarget_Lo_Xcconfig.mk +++ b/ios/CustomTarget_Lo_Xcconfig.mk @@ -21,7 +21,7 @@ $(LO_XCCONFIG) : # all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \ \ - sed -e "s,^\(LINK_LDFLAGS =\).*$$,\1 $$all_libs," \ + sed -e "s;^\(LINK_LDFLAGS =\).*$$;\1 -Wl,-map,$(WORKDIR)/\$$(TARGET_NAME).map $$all_libs;" \ -e "s,^\(OTHER_CFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \ -e "s,^\(OTHER_CPLUSPLUSFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \ < $(LO_XCCONFIG) > $(LO_XCCONFIG).new && mv $(LO_XCCONFIG).new $(LO_XCCONFIG) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
