[Libreoffice-commits] core.git: 3 commits - cppu/qa shell/source solenv/gbuild
Stephan Bergmann
sbergman at redhat.com
Wed Feb 26 23:39:50 PST 2014
cppu/qa/test_any.cxx | 6 ++---
cppu/qa/test_reference.cxx | 2 -
shell/source/backends/macbe/macbackend.hxx | 20 +++++++++---------
shell/source/backends/macbe/macbackend.mm | 10 ++++-----
solenv/gbuild/platform/com_GCC_class.mk | 32 +++++++++++++++++++++++++++++
5 files changed, 51 insertions(+), 19 deletions(-)
New commits:
commit b40d3ba4d3a15dfecdccd29dea7ba3350d9819b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 27 08:39:15 2014 +0100
Run COMPILER_PLUGIN_TOOL on Objective C code, too
Change-Id: I3eb9fb57e80b4600c11eef1c52986400478b4167
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index c8cd30a..df582ca 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -82,6 +82,22 @@ $(call gb_Helper_abbreviate_dirs,\
$(INCLUDE) \
)
endef
+define gb_ObjCObject__tool_command
+$(call gb_Output_announce,$(1).m,$(true),OCC,3)
+$(call gb_Helper_abbreviate_dirs,\
+ ICECC=no CCACHE_DISABLE=1 \
+ $(gb_CC) \
+ $(DEFS) \
+ $(gb_LTOFLAGS) \
+ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
+ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
+ $(gb_COMPILER_PLUGINS) \
+ $(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND) \
+ -c $(2) \
+ -I$(dir $(2)) \
+ $(INCLUDE) \
+ )
+endef
# Used to run a compiler plugin tool.
# $(call gb_CxxObject__tool_command,relative-source,source)
@@ -101,6 +117,22 @@ $(call gb_Helper_abbreviate_dirs,\
$(INCLUDE) \
)
endef
+define gb_ObjCxxObject__tool_command
+$(call gb_Output_announce,$(1).mm,$(true),OCX,3)
+$(call gb_Helper_abbreviate_dirs,\
+ ICECC=no CCACHE_DISABLE=1 \
+ $(gb_CXX) \
+ $(DEFS) \
+ $(gb_LTOFLAGS) \
+ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
+ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
+ $(gb_COMPILER_PLUGINS) \
+ $(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND) \
+ -c $(2) \
+ -I$(dir $(2)) \
+ $(INCLUDE) \
+ )
+endef
define gb_SrsPartTarget__command_dep
$(call gb_Helper_abbreviate_dirs,\
commit 72ef2d526b3df881647791ca5ea4b1815b508d3b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 27 08:38:48 2014 +0100
std::exception retrofit sequel
Change-Id: I7461c320e98b9a3605db26f4d58200789e1477df
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index 386582d..d7c3fab 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -40,13 +40,13 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (uno::RuntimeException);
+ throw (uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName)
- throw (uno::RuntimeException);
+ throw (uno::RuntimeException, std::exception);
virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (uno::RuntimeException);
+ throw (uno::RuntimeException, std::exception);
/**
Provides the implementation name.
@@ -64,7 +64,7 @@ public:
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo() throw (css::uno::RuntimeException)
+ getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
{ return css::uno::Reference< css::beans::XPropertySetInfo >(); }
virtual void SAL_CALL setPropertyValue(
@@ -73,20 +73,20 @@ public:
css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException, css::uno::RuntimeException);
+ css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
virtual css::uno::Any SAL_CALL getPropertyValue(
OUString const & PropertyName)
throw (
css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException);
+ css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
virtual void SAL_CALL addPropertyChangeListener(
OUString const &,
css::uno::Reference< css::beans::XPropertyChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException)
+ css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{}
virtual void SAL_CALL removePropertyChangeListener(
@@ -94,7 +94,7 @@ public:
css::uno::Reference< css::beans::XPropertyChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException)
+ css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{}
virtual void SAL_CALL addVetoableChangeListener(
@@ -102,7 +102,7 @@ public:
css::uno::Reference< css::beans::XVetoableChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException)
+ css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{}
virtual void SAL_CALL removeVetoableChangeListener(
@@ -110,7 +110,7 @@ public:
css::uno::Reference< css::beans::XVetoableChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException, css::uno::RuntimeException)
+ css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{}
protected:
diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index 25bbe8d..578295b 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -205,7 +205,7 @@ void MacOSXBackend::setPropertyValue(
throw (
css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException)
+ css::uno::RuntimeException, std::exception)
{
throw css::lang::IllegalArgumentException(
rtl::OUString(
@@ -217,7 +217,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
rtl::OUString const & PropertyName)
throw (
css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException)
+ css::uno::RuntimeException, std::exception)
{
if ( PropertyName == "WorkPathVariable" )
{
@@ -443,7 +443,7 @@ rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void)
rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void)
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return getBackendName();
}
@@ -457,13 +457,13 @@ uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void
}
sal_Bool SAL_CALL MacOSXBackend::supportsService(const rtl::OUString& aServiceName)
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, aServiceName);
}
uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void)
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return getBackendServiceNames();
}
commit c6d114be1fcf9f73c638e52f33278ca3dd53e2aa
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 27 08:38:36 2014 +0100
std::exception retrofit sequel
Change-Id: Ide9234c50592fe4f12eb1f6ea836ad60ce4697df
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index f9acf9d..b1cdd53 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -88,7 +88,7 @@ private:
class Impl1: public Interface1, private Base {
public:
virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
if (type
== getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -116,7 +116,7 @@ public:
class Impl2: public Interface2a, public Interface3, private Base {
public:
virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
if (type
== getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -152,7 +152,7 @@ public:
class Impl2b: public Interface2b, private Base {
public:
virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
if (type
== getCppuType< css::uno::Reference< css::uno::XInterface > >())
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index ab3bac5..e49c316 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -48,7 +48,7 @@ public:
}
virtual Any SAL_CALL queryInterface(const Type & _type)
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
Any aInterface;
if (_type == getCppuType< Reference< XInterface > >())
More information about the Libreoffice-commits
mailing list