[Libreoffice-commits] core.git: 3 commits - cppuhelper/source solenv/bin

[Tor Lillqvist]

 cppuhelper/source/shlib.cxx |    8 ++++++++
 solenv/bin/native-code.py   |    3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 838d749ceb152de40d03538a0448bf709264ccdb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 25 12:50:27 2014 +0300

    Add css_comp_chart2_ChartDocumentWrapper_get_implementation
    
    At least with my test documents, this is the only component we now need
    from the chartcontroller library.
    
    Change-Id: Ia2c203413a585f4d9207bb22fa5f548eda3fb9a8

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 309a3c0..c2917c40 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -50,6 +50,8 @@ core_factory_list = [
     ]
 
 core_constructor_list = [
+# chart2/source/controller/chartcontroller.component
+    "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
 # framework/util/fwk.component
     "com_sun_star_comp_framework_AutoRecovery_get_implementation",
     "com_sun_star_comp_framework_Desktop_get_implementation",
commit 606b19f84350095ecbf0274590fca0026cb11301
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 25 12:14:49 2014 +0300

    Drop libchartcontrollerlo.a in preparation for vmiklos's rework
    
    Change-Id: Ic8ce9b91e666774eff7e452ec9f07c6053dce03b

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index f29a7879..309a3c0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -20,7 +20,6 @@ core_factory_list = [
     ("libembobj.a", "embobj_component_getFactory"),
     ("libreflectionlo.a", "reflection_component_getFactory"),
     ("libstocserviceslo.a", "stocservices_component_getFactory"),
-    ("libchartcontrollerlo.a", "chartcontroller_component_getFactory"),
     ("libchartcorelo.a", "chartcore_component_getFactory"),
     ("libcomphelper.a", "comphelp_component_getFactory"),
     ("libconfigmgrlo.a", "configmgr_component_getFactory"),
commit ab07f81d0b5ffc4297d5f15d2458c5cc9217800f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 25 12:12:22 2014 +0300

    Print the important failure messages on iOS even in a non-debug build
    
    It might be that having fprintfs leftover in an app submitted to the
    App Store is a no-go, but will fix that then if/when it happens.
    
    Change-Id: Ic671fcce567c655a06fd4ed139100dc9b6f435be

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 9218581..debbdb0 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -197,6 +197,10 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
         }
         if (fp == 0) {
             SAL_WARN("cppuhelper", "unknown factory name \"" << name << "\"");
+#if defined IOS && !defined SAL_LOG_WARN
+            // If the above SAL_WARN expanded to nothing, print to stderr...
+            fprintf(stderr, "Unknown factory name %s\n", OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr());
+#endif
             throw css::loader::CannotActivateFactoryException(
                 "unknown factory name \"" + name + "\"",
                 css::uno::Reference<css::uno::XInterface>());
@@ -217,6 +221,10 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
             }
         }
         SAL_WARN("cppuhelper", "unknown constructor name \"" << constructor << "\"");
+#if defined IOS && !defined SAL_LOG_WARN
+            // If the above SAL_WARN expanded to nothing, print to stderr...
+            fprintf(stderr, "Unknown constructor name %s\n", OUStringToOString(constructor, RTL_TEXTENCODING_UTF8).getStr());
+#endif
         throw css::loader::CannotActivateFactoryException(
             "unknown constructor name \"" + constructor + "\"",
             css::uno::Reference<css::uno::XInterface>());