[Libreoffice-commits] core.git: 2 commits - desktop/source solenv/gbuild

[Stephan Bergmann]

 desktop/source/deployment/registry/dp_backend.cxx |    4 ++--
 solenv/gbuild/platform/com_GCC_defs.mk            |    8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 30a2355f5203f31d8452e92ee18d5d245c1b826f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 11 16:46:13 2015 +0200

    Improve exception message
    
    Change-Id: Idce206e0ddebbc9398297f15999579a71f9401c9

diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 3627a9d..720e8ab 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -635,10 +635,10 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered(
     catch (const deployment::DeploymentException &) {
         throw;
     }
-    catch (const Exception &) {
+    catch (const Exception & e) {
         Any exc( ::cppu::getCaughtException() );
         throw deployment::DeploymentException(
-            "unexpected exception occurred!",
+            "unexpected " + exc.getValueTypeName() + ": " + e.Message,
             static_cast<OWeakObject *>(this), exc );
     }
 }
commit f14cedc4fd7ba784da3f7ca067a1af18b758e368
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 11 16:45:56 2015 +0200

    Silence Clang -Werror,-Wreturn-type-c-linkage
    
    ...after 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c "Switch VclBuilder constructors to use VclPtr."
    
    Change-Id: Ifc556c471bfbe3d0abf921ce3556ce75ad7a82ce

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 5b5a2bd..1bb4017 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -72,6 +72,14 @@ gb_CXXFLAGS_COMMON := \
 	-fno-common \
 	-pipe \
 
+# VCL_BUILDER_DECL_FACTORY (include/vcl/builderfactory.hxx) routinely causes
+# "'make...' has C-linkage specified, but returns user-defined type
+# 'VclPtr<vcl::Window>' which is incompatible with C
+# [-Werror,-Wreturn-type-c-linkage]":
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+gb_CXXFLAGS_COMMON += -Wno-return-type-c-linkage
+endif
+
 gb_CXXFLAGS_Wundef = -Wno-undef
 
 ifneq ($(HAVE_THREADSAFE_STATICS),TRUE)