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

[Matúš Kukan]

 cppuhelper/source/component_context.cxx |   12 +++---------
 solenv/bin/native-code.py               |    1 -
 sw/source/ui/app/swdll.cxx              |    4 ++++
 sw/source/ui/app/swmodule.cxx           |    4 ++++
 4 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 11a3cb8682f618484640b336cc4b697e44cc419b
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Feb 18 09:35:36 2014 +0100

    native code: Remove deployment again.
    
    It implements extension manager which we hopefully don't need.
    
    After b14218e4709a7a5961f1564543da35788b578014 it should finally work.
    
    Change-Id: I366722cc77de69c4937d461fed917e350b1b5fa5

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0e39c67..c696ae6b 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -25,7 +25,6 @@ core_factory_list = [
     ("libchartcorelo.a", "chartcore_component_getFactory"),
     ("libcomphelper.a", "comphelp_component_getFactory"),
     ("libconfigmgrlo.a", "configmgr_component_getFactory"),
-    ("libdeployment.a", "deployment_component_getFactory"),
     ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
     ("libfsstoragelo.a", "fsstorage_component_getFactory"),
     ("libhyphenlo.a", "hyphen_component_getFactory"),
commit bac3b0c12e11438166e28358e04d4e175a3e09f2
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Feb 18 09:25:02 2014 +0100

    sw: Avoid linking in a lot of, mostly UI related, code for mobile platforms.
    
    Change-Id: Ic49a22140233e72e6f1e103558825970f1ee3df3

diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx
index a8a7dd2..cb6d19e 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/ui/app/swdll.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <svx/svdobj.hxx>
 
 #include "globdoc.hrc"
@@ -126,11 +128,13 @@ SwDLL::SwDLL()
     // register your view-factories here
     RegisterFactories();
 
+#if HAVE_FEATURE_DESKTOP
     // register your shell-interfaces here
     RegisterInterfaces();
 
     // register your controllers here
     RegisterControls();
+#endif
 }
 
 SwDLL::~SwDLL()
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 2536d86..e5231a6 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <hintids.hxx>
 #include <swerror.h>
 #include <vcl/wrkwin.hxx>
@@ -242,6 +244,7 @@ void SwDLL::RegisterFactories()
     if ( SvtModuleOptions().IsWriter() )
         SwView::RegisterFactory         ( 2 );
 
+#if HAVE_FEATURE_DESKTOP
     SwWebView::RegisterFactory        ( 5 );
 
     if ( SvtModuleOptions().IsWriter() )
@@ -249,6 +252,7 @@ void SwDLL::RegisterFactories()
         SwSrcView::RegisterFactory      ( 6 );
         SwPagePreview::RegisterFactory  ( 7 );
     }
+#endif
 }
 
 void SwDLL::RegisterInterfaces()
commit 3714d1c599308059db351b9867b9350aa533e3e3
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Mon Feb 17 18:12:30 2014 +0100

    Do not throw when a singleton can't be raised, only warn.
    
    This can happen for mobile platforms where we don't need singletons
    like com.sun.star.deployment.ExtensionManager.
    
    Change-Id: Iad6729539c7ed1ad2b3315c7b9a35647e92ebbff

diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index b6ebb3d..be4065d 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -600,22 +600,16 @@ Any ComponentContext::lookupMap( OUString const & rName )
     }
     catch (Exception & exc) // rethrow as WrappedTargetRuntimeException
     {
-        Any caught( getCaughtException() );
         OUStringBuffer buf;
         buf.append( "exception occurred raising singleton \"" );
         buf.append( rName );
         buf.append( "\": " );
         buf.append( exc.Message );
-        throw lang::WrappedTargetRuntimeException(
-            buf.makeStringAndClear(), static_cast<OWeakObject *>(this),caught );
+        SAL_WARN("cppuhelper", buf.makeStringAndClear());
     }
 
-    if (! xInstance.is())
-    {
-        throw RuntimeException(
-            "no service object raising singleton " + rName,
-            static_cast<OWeakObject *>(this) );
-    }
+    SAL_WARN_IF(!xInstance.is(),
+            "cppuhelper", "no service object raising singleton " << rName);
 
     Any ret;
     guard.reset();