[Libreoffice-commits] core.git: 3 commits - filter/source i18npool/inc i18npool/source include/svx svx/source
Caolán McNamara
caolanm at redhat.com
Sat Jan 14 11:14:29 UTC 2017
filter/source/config/cache/filtercache.cxx | 4 ++--
filter/source/config/cache/filtercache.hxx | 4 ++--
i18npool/inc/localedata.hxx | 2 +-
i18npool/source/localedata/localedata.cxx | 4 +---
include/svx/unoshape.hxx | 10 +++++-----
svx/source/unodraw/shapeimpl.hxx | 2 +-
svx/source/unodraw/tableshape.cxx | 4 +---
svx/source/unodraw/unoshap3.cxx | 28 +++++++++-------------------
8 files changed, 22 insertions(+), 36 deletions(-)
New commits:
commit 773ec34047ea5e94720debb42a2115958665b24c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 14 11:06:02 2017 +0000
coverity#1398585 Uncaught exception
and
coverity#1398587 Uncaught exception
coverity#1398588 Uncaught exception
coverity#1398589 Uncaught exception
coverity#1398590 Uncaught exception
coverity#1398592 Uncaught exception
Change-Id: I603fc492df9215e0d67419640afc3d6a2af28c10
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 8bf31b5..bc3d0aa5 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -697,7 +697,7 @@ class Svx3DCubeObject : public SvxShape
{
protected:
// override these for special property handling in subcasses. Return true if property is handled
- virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
public:
@@ -717,7 +717,7 @@ public:
Svx3DSphereObject( SdrObject* pObj ) throw();
protected:
// override these for special property handling in subcasses. Return true if property is handled
- virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual ~Svx3DSphereObject() throw() override;
@@ -733,7 +733,7 @@ class Svx3DLatheObject : public SvxShape
{
protected:
// override these for special property handling in subcasses. Return true if property is handled
- virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
public:
@@ -753,7 +753,7 @@ public:
Svx3DExtrudeObject( SdrObject* pObj ) throw();
protected:
// override these for special property handling in subcasses. Return true if property is handled
- virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual ~Svx3DExtrudeObject() throw() override;
@@ -769,7 +769,7 @@ class Svx3DPolygonObject : public SvxShape
{
protected:
// override these for special property handling in subcasses. Return true if property is handled
- virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
public:
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index a75a7e5..7bf1662 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -91,7 +91,7 @@ class SvxTableShape : public SvxShape
{
protected:
// override these for special property handling in subcasses. Return true if property is handled
- virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual void lock() override;
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index d21db1a..fcf589c 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -41,17 +41,15 @@ SvxTableShape::SvxTableShape( SdrObject* pObj ) throw()
SetShapeType( "com.sun.star.drawing.TableShape" );
}
-
SvxTableShape::~SvxTableShape() throw()
{
}
-
bool SvxTableShape::setPropertyValueImpl(
const OUString& rName,
const SfxItemPropertySimpleEntry* pProperty,
const css::uno::Any& rValue )
- throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
{
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 3b28ea9..8a59d73 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -459,18 +459,17 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3DScene"} );
return aSeq;
}
+
Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw()
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DCUBEOBJEKT), getSvxMapProvider().GetPropertySet(SVXMAP_3DCUBEOBJEKT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
Svx3DCubeObject::~Svx3DCubeObject() throw()
{
}
-
-bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -525,7 +524,6 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem
throw IllegalArgumentException();
}
-
bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
@@ -583,18 +581,17 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
"com.sun.star.drawing.Shape3DCube"});
return aSeq;
}
+
Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw()
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSPHEREOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
Svx3DSphereObject::~Svx3DSphereObject() throw()
{
}
-
-bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
{
@@ -638,7 +635,6 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt
throw IllegalArgumentException();
}
-
bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
@@ -789,8 +785,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon&
rValue <<= aRetval;
}
-
-bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
{
@@ -836,7 +831,6 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte
throw IllegalArgumentException();
}
-
bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
@@ -892,18 +886,17 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
"com.sun.star.drawing.Shape3DLathe"});
return aSeq;
}
+
Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw()
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DEXTRUDEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DEXTRUDEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
Svx3DExtrudeObject::~Svx3DExtrudeObject() throw()
{
}
-
-bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
{
@@ -938,7 +931,6 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI
throw IllegalArgumentException();
}
-
bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
@@ -996,18 +988,17 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
"com.sun.star.drawing.Shape3DExtrude"});
return aSeq;
}
+
Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw()
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DPOLYGONOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
Svx3DPolygonObject::~Svx3DPolygonObject() throw()
{
}
-
-bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
{
@@ -1080,7 +1071,6 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
throw IllegalArgumentException();
}
-
bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
switch( pProperty->nWID )
commit 996edbce872ae6c239aa3c82582c0c6c37baa715
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 14 11:02:54 2017 +0000
coverity#1398584 Uncaught exception
Change-Id: Ic5a269bee9cf1e481cd107d36dc190adc9715af5
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 636b627..58e1f79 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -142,7 +142,7 @@ private:
const sal_Int16 nCalendar,
const css::lang::Locale & rLocale,
const css::uno::Sequence< css::i18n::Calendar2 > & calendarsSeq )
- throw( css::uno::RuntimeException );
+ throw( css::uno::RuntimeException, std::exception );
};
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index f57b953..1051e11 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -657,12 +657,11 @@ Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString&
}
}
-
Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems(
sal_Unicode const * const * const allCalendars, sal_Int16 & rnOffset,
const sal_Int16 nWhichItem, const sal_Int16 nCalendar,
const Locale & rLocale, const Sequence< Calendar2 > & calendarsSeq )
- throw(RuntimeException)
+ throw(RuntimeException, std::exception)
{
Sequence< CalendarItem2 > aItems;
if ( OUString( allCalendars[rnOffset] ) == "ref" )
@@ -706,7 +705,6 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems(
return aItems;
}
-
Sequence< Calendar2 > SAL_CALL
LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException, std::exception)
{
commit 44ffbca37c93074b8574b51bffdc44b8461510df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 14 11:00:33 2017 +0000
coverity#1398586 Uncaught exception
and
coverity#1398591 Uncaught exception
Change-Id: Id46cb66ea8e26af480234703cafd26ff7b7271f0
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 671b0ba..5b0d6db 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1603,7 +1603,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
EItemType eType ,
const OUString& sItem ,
EReadOption eOption)
- throw(css::uno::Exception)
+ throw(css::uno::Exception, std::exception)
{
// try to get an API object, which points directly to the
// requested item. If it fail an exception should occur and
@@ -2167,7 +2167,7 @@ void FilterCache::impl_readOldFormat()
CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet ,
EItemType eType,
const OUString& sItem)
- throw(css::uno::Exception)
+ throw(css::uno::Exception, std::exception)
{
css::uno::Reference< css::container::XNameAccess > xItem;
xSet->getByName(sItem) >>= xItem;
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 650f996..d2bd7ad 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -771,7 +771,7 @@ class FilterCache : public BaseLock
EItemType eType ,
const OUString& sItem ,
EReadOption eOption)
- throw(css::uno::Exception);
+ throw(css::uno::Exception, std::exception);
/** @short try to load the requested item on demand from the underlying configuration
@@ -876,7 +876,7 @@ class FilterCache : public BaseLock
CacheItem impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet ,
EItemType eType,
const OUString& sItem)
- throw(css::uno::Exception);
+ throw(css::uno::Exception, std::exception);
/** TODO */
More information about the Libreoffice-commits
mailing list