summaryrefslogtreecommitdiff
path: root/svx/source/unodraw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-22 10:50:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-12-25 21:55:39 +0100
commit76e950bfafd8b44ee47d7a9573df1571652c52e1 (patch)
tree35c6ea2a240ba08ccf2c4faaaaed18c088f75763 /svx/source/unodraw
parent93c96ec5018f723748557975435eb6c27135b60c (diff)
various coverity exception warnings
Change-Id: I7b3588ad42e17f2f363b6a247e318f23c95e578e Reviewed-on: https://gerrit.libreoffice.org/46961 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx2
-rw-r--r--svx/source/unodraw/shapeimpl.hxx10
-rw-r--r--svx/source/unodraw/tableshape.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx4
-rw-r--r--svx/source/unodraw/unodtabl.cxx4
-rw-r--r--svx/source/unodraw/unogtabl.cxx4
-rw-r--r--svx/source/unodraw/unohtabl.cxx4
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/unodraw/unopage.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx46
-rw-r--r--svx/source/unodraw/unoshap3.cxx16
-rw-r--r--svx/source/unodraw/unoshap4.cxx18
-rw-r--r--svx/source/unodraw/unoshape.cxx6
-rw-r--r--svx/source/unodraw/unottabl.cxx4
14 files changed, 57 insertions, 67 deletions
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 29ded8f82530..f1f8e10dbb72 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -54,7 +54,7 @@ public:
SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw();
virtual ~SvxUnoNameItemTable() throw() override;
- virtual NameOrIndex* createItem() const throw() = 0;
+ virtual NameOrIndex* createItem() const = 0;
virtual bool isValid( const NameOrIndex* pItem ) const;
void dispose();
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index a78b6cc13dee..9b0a713184fa 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -23,7 +23,7 @@
class SvxShapeCaption : public SvxShapeText
{
public:
- explicit SvxShapeCaption( SdrObject* pObj ) throw();
+ explicit SvxShapeCaption(SdrObject* pObj);
virtual ~SvxShapeCaption() throw() override;
};
class SvxPluginShape : public SvxOle2Shape
@@ -34,7 +34,7 @@ protected:
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
public:
- explicit SvxPluginShape( SdrObject* pObj ) throw();
+ explicit SvxPluginShape(SdrObject* pObj);
virtual ~SvxPluginShape() throw() override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
@@ -52,7 +52,7 @@ protected:
virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
public:
- explicit SvxAppletShape( SdrObject* pObj ) throw();
+ explicit SvxAppletShape(SdrObject* pObj);
virtual ~SvxAppletShape() throw() override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
@@ -71,7 +71,7 @@ protected:
css::uno::Any& rValue) override;
public:
- explicit SvxFrameShape( SdrObject* pObj ) throw();
+ explicit SvxFrameShape(SdrObject* pObj);
virtual ~SvxFrameShape() throw() override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
@@ -95,7 +95,7 @@ protected:
public:
- explicit SvxTableShape( SdrObject* pObj ) throw();
+ explicit SvxTableShape(SdrObject* pObj);
virtual ~SvxTableShape() throw() override;
};
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 451cf396750e..a34815611bca 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
-SvxTableShape::SvxTableShape( SdrObject* pObj ) throw()
+SvxTableShape::SvxTableShape(SdrObject* pObj)
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) )
{
SetShapeType( "com.sun.star.drawing.TableShape" );
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index c2f0949b5c41..5e8c4ad39def 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -40,7 +40,7 @@ class SvxUnoBitmapTable : public SvxUnoNameItemTable
public:
explicit SvxUnoBitmapTable( SdrModel* pModel ) throw();
- virtual NameOrIndex* createItem() const throw() override;
+ virtual NameOrIndex* createItem() const override;
virtual bool isValid( const NameOrIndex* pItem ) const override;
// XServiceInfo
@@ -83,7 +83,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames(
return aSNS;
}
-NameOrIndex* SvxUnoBitmapTable::createItem() const throw()
+NameOrIndex* SvxUnoBitmapTable::createItem() const
{
return new XFillBitmapItem();
}
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 0fa393fc2ee6..0a7b66c217ef 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -38,7 +38,7 @@ class SvxUnoDashTable : public SvxUnoNameItemTable
public:
explicit SvxUnoDashTable( SdrModel* pModel ) throw();
- virtual NameOrIndex* createItem() const throw() override;
+ virtual NameOrIndex* createItem() const override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
@@ -64,7 +64,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( )
return aSNS;
}
-NameOrIndex* SvxUnoDashTable::createItem() const throw()
+NameOrIndex* SvxUnoDashTable::createItem() const
{
XLineDashItem* pNewItem = new XLineDashItem();
pNewItem->SetWhich( XATTR_LINEDASH ); // set which id for pooling
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 8021b2d16f88..25f845fc18c9 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -37,7 +37,7 @@ class SvxUnoGradientTable : public SvxUnoNameItemTable
public:
explicit SvxUnoGradientTable( SdrModel* pModel ) throw();
- virtual NameOrIndex* createItem() const throw() override;
+ virtual NameOrIndex* createItem() const override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
@@ -65,7 +65,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames
// XNameContainer
-NameOrIndex* SvxUnoGradientTable::createItem() const throw()
+NameOrIndex* SvxUnoGradientTable::createItem() const
{
return new XFillGradientItem();
}
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index ec056461db0f..1e272b371d41 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -37,7 +37,7 @@ class SvxUnoHatchTable : public SvxUnoNameItemTable
public:
explicit SvxUnoHatchTable( SdrModel* pModel ) throw();
- virtual NameOrIndex* createItem() const throw() override;
+ virtual NameOrIndex* createItem() const override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
@@ -63,7 +63,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames(
return aSNS;
}
-NameOrIndex* SvxUnoHatchTable::createItem() const throw()
+NameOrIndex* SvxUnoHatchTable::createItem() const
{
return new XFillHatchItem();
}
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index ff781cfb6b1a..aa52fb535b3a 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -687,7 +687,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNam
return aSeq;
}
-css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw()
+css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(SdrModel* pModel)
{
const SvxNumRule* pDefaultRule = nullptr;
if( pModel )
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index d437f4e07afe..0860ff9c6e6f 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::drawing;
UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage );
-SvxDrawPage::SvxDrawPage(SdrPage* pInPage) throw()
+SvxDrawPage::SvxDrawPage(SdrPage* pInPage)
: mrBHelper(getMutex())
, mpPage(pInPage)
, mpModel(mpPage->GetModel()) // register at broadcaster
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index da67f601a553..668e7f4a8c77 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -81,18 +81,16 @@ using namespace ::com::sun::star::container;
if( rType == cppu::UnoType<xint>::get() ) \
aAny <<= Reference< xint >(this)
-SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() :
- SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_GROUP), getSvxMapProvider().GetPropertySet(SVXMAP_GROUP, SdrObject::GetGlobalDrawObjectItemPool()) ),
- mxPage( pDrawPage )
+SvxShapeGroup::SvxShapeGroup(SdrObject* pObj, SvxDrawPage* pDrawPage)
+ : SvxShape(pObj, getSvxMapProvider().GetMap(SVXMAP_GROUP), getSvxMapProvider().GetPropertySet(SVXMAP_GROUP, SdrObject::GetGlobalDrawObjectItemPool()))
+ , mxPage(pDrawPage)
{
}
-
SvxShapeGroup::~SvxShapeGroup() throw()
{
}
-
void SvxShapeGroup::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
{
SvxShape::Create( pNewObj, pNewPage );
@@ -351,8 +349,8 @@ sal_Bool SAL_CALL SvxShapeGroup::hasElements()
return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0);
}
-SvxShapeConnector::SvxShapeConnector( SdrObject* pObj ) throw() :
- SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONNECTOR), getSvxMapProvider().GetPropertySet(SVXMAP_CONNECTOR, SdrObject::GetGlobalDrawObjectItemPool()) )
+SvxShapeConnector::SvxShapeConnector(SdrObject* pObj)
+ : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONNECTOR), getSvxMapProvider().GetPropertySet(SVXMAP_CONNECTOR, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
@@ -486,8 +484,8 @@ void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::X
mpModel->SetChanged();
}
-SvxShapeControl::SvxShapeControl( SdrObject* pObj ) throw() :
- SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONTROL), getSvxMapProvider().GetPropertySet(SVXMAP_CONTROL, SdrObject::GetGlobalDrawObjectItemPool()) )
+SvxShapeControl::SvxShapeControl(SdrObject* pObj)
+ : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONTROL), getSvxMapProvider().GetPropertySet(SVXMAP_CONTROL, SdrObject::GetGlobalDrawObjectItemPool()) )
{
setShapeKind( OBJ_UNO );
}
@@ -906,22 +904,20 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aProperty
}
}
-SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_DIMENSIONING), getSvxMapProvider().GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) )
+SvxShapeDimensioning::SvxShapeDimensioning(SdrObject* pObj)
+ : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_DIMENSIONING), getSvxMapProvider().GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
SvxShapeDimensioning::~SvxShapeDimensioning() throw()
{
}
-SvxShapeCircle::SvxShapeCircle( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CIRCLE), getSvxMapProvider().GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) )
+SvxShapeCircle::SvxShapeCircle(SdrObject* pObj)
+ : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CIRCLE), getSvxMapProvider().GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
SvxShapeCircle::~SvxShapeCircle() throw()
{
}
@@ -1171,18 +1167,16 @@ basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw()
}
}
-SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier( SdrObject* pObj , drawing::PolygonKind eNew ) throw()
-: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGONBEZIER), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGONBEZIER, SdrObject::GetGlobalDrawObjectItemPool()) )
-, mePolygonKind( eNew )
+SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier(SdrObject* pObj , drawing::PolygonKind eNew)
+ : SvxShapeText(pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGONBEZIER), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGONBEZIER, SdrObject::GetGlobalDrawObjectItemPool()))
+ , mePolygonKind(eNew)
{
}
-
SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw()
{
}
-
bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
{
switch( pProperty->nWID )
@@ -1285,8 +1279,8 @@ basegfx::B2DPolyPolygon SvxShapePolyPolygonBezier::GetPolygon() const throw()
}
}
-SvxGraphicObject::SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw()
-: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_GRAPHICOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_GRAPHICOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ), referer_(referer)
+SvxGraphicObject::SvxGraphicObject(SdrObject* pObj, OUString const & referer)
+ : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_GRAPHICOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_GRAPHICOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ), referer_(referer)
{
}
@@ -1684,7 +1678,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
}
-SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw()
+SvxShapeCaption::SvxShapeCaption(SdrObject* pObj)
: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CAPTION), getSvxMapProvider().GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
@@ -1693,17 +1687,15 @@ SvxShapeCaption::~SvxShapeCaption() throw()
{
}
-SvxCustomShape::SvxCustomShape( SdrObject* pObj ) throw() :
- SvxShapeText( pObj, getSvxMapProvider().GetMap( SVXMAP_CUSTOMSHAPE ), getSvxMapProvider().GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool()) )
+SvxCustomShape::SvxCustomShape(SdrObject* pObj)
+ : SvxShapeText( pObj, getSvxMapProvider().GetMap( SVXMAP_CUSTOMSHAPE ), getSvxMapProvider().GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
SvxCustomShape::~SvxCustomShape() throw()
{
}
-
uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType )
{
return SvxShapeText::queryInterface( rType );
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index db8fbdd03dd4..9b9897ee8a5f 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::container;
if( rType == cppu::UnoType<xint>::get() ) \
aAny <<= Reference< xint >(this)
-Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw()
+Svx3DSceneObject::Svx3DSceneObject(SdrObject* pObj, SvxDrawPage* pDrawPage)
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSCENEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSCENEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
, mxPage( pDrawPage )
{
@@ -446,7 +446,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
return aSeq;
}
-Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw()
+Svx3DCubeObject::Svx3DCubeObject(SdrObject* pObj)
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DCUBEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DCUBEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
@@ -567,8 +567,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
return aSeq;
}
-Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw()
-: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSPHEREOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
+Svx3DSphereObject::Svx3DSphereObject(SdrObject* pObj)
+ : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSPHEREOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
@@ -671,12 +671,12 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
"com.sun.star.drawing.Shape3DSphere"});
return aSeq;
}
-Svx3DLatheObject::Svx3DLatheObject( SdrObject* pObj ) throw()
+
+Svx3DLatheObject::Svx3DLatheObject(SdrObject* pObj)
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DLATHEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DLATHEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-
Svx3DLatheObject::~Svx3DLatheObject() throw()
{
}
@@ -870,7 +870,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
return aSeq;
}
-Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw()
+Svx3DExtrudeObject::Svx3DExtrudeObject(SdrObject* pObj)
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DEXTRUDEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DEXTRUDEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
@@ -971,7 +971,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
return aSeq;
}
-Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw()
+Svx3DPolygonObject::Svx3DPolygonObject(SdrObject* pObj)
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DPOLYGONOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 4386f9a59d7d..080a2cb154c9 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -63,13 +63,13 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
-SvxOle2Shape::SvxOle2Shape( SdrObject* pObject ) throw()
+SvxOle2Shape::SvxOle2Shape(SdrObject* pObject)
: SvxShapeText( pObject, getSvxMapProvider().GetMap(SVXMAP_OLE2),
getSvxMapProvider().GetPropertySet(SVXMAP_OLE2,SdrObject::GetGlobalDrawObjectItemPool()) )
{
}
-SvxOle2Shape::SvxOle2Shape( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw ()
+SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet)
: SvxShapeText( pObject, pPropertyMap, pPropertySet )
{
}
@@ -557,9 +557,8 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID)
return aClassName;
}
-
-SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw()
-: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) )
+SvxAppletShape::SvxAppletShape(SdrObject* pObject)
+ : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) )
{
SetShapeType( "com.sun.star.drawing.AppletShape" );
}
@@ -629,9 +628,8 @@ bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemP
}
}
-
-SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw()
-: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) )
+SvxPluginShape::SvxPluginShape(SdrObject* pObject)
+ : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) )
{
SetShapeType( "com.sun.star.drawing.PluginShape" );
}
@@ -702,7 +700,7 @@ bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemP
}
-SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw()
+SvxFrameShape::SvxFrameShape(SdrObject* pObject)
: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) )
{
SetShapeType( "com.sun.star.drawing.FrameShape" );
@@ -773,7 +771,7 @@ bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPro
return SvxOle2Shape::getPropertyValueImpl( rName, pProperty, rValue );
}
}
-SvxMediaShape::SvxMediaShape( SdrObject* pObj, OUString const & referer ) throw()
+SvxMediaShape::SvxMediaShape(SdrObject* pObj, OUString const & referer)
: SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_MEDIA), getSvxMapProvider().GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ),
referer_(referer)
{
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 0ecda838a695..fd9851588e3d 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3835,7 +3835,7 @@ void SvxShape::updateShapeKind()
}
}
-SvxShapeText::SvxShapeText( SdrObject* pObject ) throw ()
+SvxShapeText::SvxShapeText(SdrObject* pObject)
: SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
{
if( pObject && pObject->GetModel() )
@@ -3843,7 +3843,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw ()
}
-SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw ()
+SvxShapeText::SvxShapeText(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet)
: SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
{
if( pObject && pObject->GetModel() )
@@ -4041,7 +4041,7 @@ bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* p
return SvxShape::setPropertyToDefaultImpl( pProperty );
}
-SvxShapeRect::SvxShapeRect( SdrObject* pObj ) throw()
+SvxShapeRect::SvxShapeRect(SdrObject* pObj)
: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_SHAPE), getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool()))
{
}
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 3cc9843e2599..f1270f0da64e 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -37,7 +37,7 @@ class SvxUnoTransGradientTable : public SvxUnoNameItemTable
public:
explicit SvxUnoTransGradientTable( SdrModel* pModel ) throw();
- virtual NameOrIndex* createItem() const throw() override;
+ virtual NameOrIndex* createItem() const override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
@@ -63,7 +63,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService
return aSNS;
}
-NameOrIndex* SvxUnoTransGradientTable::createItem() const throw()
+NameOrIndex* SvxUnoTransGradientTable::createItem() const
{
XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem();
pNewItem->SetEnabled( true );