diff options
52 files changed, 152 insertions, 168 deletions
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index dfdc218ad1fc..9c0dca69df4c 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -85,7 +85,7 @@ unsigned short ConvertUnoAdjust( SvxAdjust eAdjust ) UNO3_GETIMPLEMENTATION_IMPL( SvxUnoNumberingRules ); -SvxUnoNumberingRules::SvxUnoNumberingRules( const SvxNumRule& rRule ) throw() +SvxUnoNumberingRules::SvxUnoNumberingRules(const SvxNumRule& rRule) : maRule( rRule ) { } @@ -473,7 +473,7 @@ const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule ) return pRule->getNumRule(); } -css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw() +css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxNumRule* pRule) { DBG_ASSERT( pRule, "No default SvxNumRule!" ); if( pRule ) @@ -539,7 +539,7 @@ Reference< XAnyCompare > SvxCreateNumRuleCompare() throw() return new SvxUnoNumberingRulesCompare; } -css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule() throw() +css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule() { SvxNumRule aTempRule( SvxNumRuleFlags::NONE, 10, false ); return SvxCreateNumRule( &aTempRule ); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index aced15ee0f53..75b9d339c7cf 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -207,12 +207,12 @@ void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) throw() UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextRangeBase ); -SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw() -: mpEditSource(nullptr) , mpPropSet(_pSet) +SvxUnoTextRangeBase::SvxUnoTextRangeBase(const SvxItemPropertySet* _pSet) + : mpEditSource(nullptr) , mpPropSet(_pSet) { } -SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw() +SvxUnoTextRangeBase::SvxUnoTextRangeBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet) : mpPropSet(_pSet) { SolarMutexGuard aGuard; @@ -230,7 +230,7 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxEditSource* pSource, const Sv } } -SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) throw() +SvxUnoTextRangeBase::SvxUnoTextRangeBase(const SvxUnoTextRangeBase& rRange) : text::XTextRange() , beans::XPropertySet() , beans::XMultiPropertySet() @@ -1510,7 +1510,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< } } -SvxUnoTextRange::SvxUnoTextRange( const SvxUnoTextBase& rParent, bool bPortion /* = false */ ) throw() +SvxUnoTextRange::SvxUnoTextRange(const SvxUnoTextBase& rParent, bool bPortion /* = false */) :SvxUnoTextRangeBase( rParent.GetEditSource(), bPortion ? ImplGetSvxTextPortionSvxPropertySet() : rParent.getPropertySet() ), mbPortion( bPortion ) { @@ -1611,13 +1611,13 @@ OUString SAL_CALL SvxUnoTextRange::getImplementationName() // class SvxUnoText -SvxUnoTextBase::SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw() -: SvxUnoTextRangeBase( _pSet ) +SvxUnoTextBase::SvxUnoTextBase(const SvxItemPropertySet* _pSet) + : SvxUnoTextRangeBase(_pSet) { } -SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, uno::Reference < text::XText > const & xParent ) throw() -: SvxUnoTextRangeBase( pSource, _pSet ) +SvxUnoTextBase::SvxUnoTextBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, uno::Reference < text::XText > const & xParent) + : SvxUnoTextRangeBase(pSource, _pSet) { xParentText = xParent; ESelection aSelection; @@ -1625,7 +1625,7 @@ SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPrope SetSelection( aSelection ); } -SvxUnoTextBase::SvxUnoTextBase( const SvxUnoTextBase& rText ) throw() +SvxUnoTextBase::SvxUnoTextBase(const SvxUnoTextBase& rText) : SvxUnoTextRangeBase( rText ) , text::XTextAppend() , text::XTextCopy() diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 857745bdce56..8e059941c0d2 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -375,7 +375,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames() // class SvxUnoTextRangeEnumeration -SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_Int32 nPara, const ESelection& rSel ) throw() +SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rText, sal_Int32 nPara, const ESelection& rSel) : mxParentText( const_cast<SvxUnoTextBase*>(&rText) ), mrParentText( rText ), mnParagraph( nPara ), diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx index 307c56deb5d0..bc750254ae67 100644 --- a/include/editeng/unonrule.hxx +++ b/include/editeng/unonrule.hxx @@ -31,8 +31,8 @@ #include <comphelper/servicehelper.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw(); -EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule() throw(); +EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxNumRule* pRule); +EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(); /// @throws css::lang::IllegalArgumentException const SvxNumRule& SvxGetNumRule( css::uno::Reference< css::container::XIndexReplace > const & xRule ); EDITENG_DLLPUBLIC css::uno::Reference< css::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw(); @@ -43,7 +43,7 @@ class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< css::container:: private: SvxNumRule maRule; public: - SvxUnoNumberingRules( const SvxNumRule& rRule ) throw(); + SvxUnoNumberingRules(const SvxNumRule& rRule); virtual ~SvxUnoNumberingRules() throw() override; UNO3_GETIMPLEMENTATION_DECL( SvxUnoNumberingRules ) diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index db20ac34c695..73e2afdf366d 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -302,9 +302,9 @@ protected: /// @throws css::lang::IllegalArgumentException void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ); - SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw(); - SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw(); - SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) throw(); + SvxUnoTextRangeBase(const SvxItemPropertySet* _pSet); + SvxUnoTextRangeBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet); + SvxUnoTextRangeBase(const SvxUnoTextRangeBase& rRange); virtual ~SvxUnoTextRangeBase() throw(); public: @@ -388,7 +388,7 @@ private: bool mbPortion; public: - SvxUnoTextRange( const SvxUnoTextBase& rParent, bool bPortion = false ) throw(); + SvxUnoTextRange(const SvxUnoTextBase& rParent, bool bPortion = false); virtual ~SvxUnoTextRange() throw() override; // css::uno::XInterface @@ -418,9 +418,9 @@ class EDITENG_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase, protected: css::uno::Reference< css::text::XText > xParentText; - SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw(); - SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, css::uno::Reference < css::text::XText > const & xParent ) throw(); - SvxUnoTextBase( const SvxUnoTextBase& rText ) throw(); + SvxUnoTextBase(const SvxItemPropertySet* _pSet); + SvxUnoTextBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, css::uno::Reference < css::text::XText > const & xParent); + SvxUnoTextBase(const SvxUnoTextBase& rText); virtual ~SvxUnoTextBase() throw() override; public: @@ -613,7 +613,7 @@ private: const ESelection mnSel; public: - SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_Int32 nPara, const ESelection& rSel ) throw(); + SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rText, sal_Int32 nPara, const ESelection& rSel); virtual ~SvxUnoTextRangeEnumeration() throw() override; // css::container::XEnumeration diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx index 1afd0e9e7c45..a1f0bc9bf7dd 100644 --- a/include/oox/ppt/layoutfragmenthandler.hxx +++ b/include/oox/ppt/layoutfragmenthandler.hxx @@ -34,8 +34,8 @@ namespace oox { namespace ppt { class LayoutFragmentHandler : public SlideFragmentHandler { public: - LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw(); - virtual ~LayoutFragmentHandler() throw() override; + LayoutFragmentHandler(::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr); + virtual ~LayoutFragmentHandler() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; }; diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 18dfe2c35fe1..cb7c45412c4e 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -41,7 +41,7 @@ namespace oox { namespace ppt { class PresentationFragmentHandler final : public ::oox::core::FragmentHandler2 { public: - PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw(); + PresentationFragmentHandler(::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath); virtual ~PresentationFragmentHandler() throw() override; virtual void finalizeImport() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx index 805f6c040b7e..630c51ce52e4 100644 --- a/include/svx/unomod.hxx +++ b/include/svx/unomod.hxx @@ -28,7 +28,7 @@ class SdrHint; class SdrModel; -SVX_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw(); +SVX_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(SdrModel* pModel); class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public css::lang::XMultiServiceFactory { diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index e91f2125afbf..6f84e72b8e66 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -78,7 +78,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin virtual void disposing() throw(); public: - SvxDrawPage( SdrPage* pPage ) throw(); + SvxDrawPage(SdrPage* pPage); virtual ~SvxDrawPage() throw() override; // Internals diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 678ee0abeffc..2e81df0ea8af 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -363,8 +363,8 @@ protected: virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) override; public: - SvxShapeText( SdrObject* pObj ) throw (); - SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); + SvxShapeText(SdrObject* pObj); + SvxShapeText(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet); virtual ~SvxShapeText() throw () override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; @@ -397,7 +397,7 @@ public: class SvxShapeRect : public SvxShapeText { public: - SvxShapeRect( SdrObject* pObj ) throw (); + SvxShapeRect(SdrObject* pObj); virtual ~SvxShapeRect() throw () override; // XInterface @@ -424,7 +424,7 @@ private: void addUnoShape( const css::uno::Reference< css::drawing::XShape >& xShape, size_t nPos ); public: - SvxShapeGroup( SdrObject* pObj,SvxDrawPage* pDrawPage ) throw (); + SvxShapeGroup(SdrObject* pObj,SvxDrawPage* pDrawPage); virtual ~SvxShapeGroup() throw () override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; @@ -475,7 +475,7 @@ class SvxShapeConnector : public css::drawing::XConnectorShape, public SvxShapeText { public: - SvxShapeConnector( SdrObject* pObj ) throw(); + SvxShapeConnector(SdrObject* pObj); virtual ~SvxShapeConnector() throw() override; // XInterface @@ -514,7 +514,7 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; public: - SvxShapeControl( SdrObject* pObj ) throw(); + SvxShapeControl(SdrObject* pObj); virtual ~SvxShapeControl() throw() override; // XInterface @@ -556,7 +556,7 @@ public: class SvxShapeDimensioning : public SvxShapeText { public: - SvxShapeDimensioning( SdrObject* pObj ) throw(); + SvxShapeDimensioning(SdrObject* pObj); virtual ~SvxShapeDimensioning() throw() override; }; @@ -566,7 +566,7 @@ public: class SvxShapeCircle : public SvxShapeText { public: - SvxShapeCircle( SdrObject* pObj ) throw (); + SvxShapeCircle(SdrObject* pObj); virtual ~SvxShapeCircle() throw () override; }; @@ -586,8 +586,8 @@ protected: const SvGlobalName GetClassName_Impl(OUString& rHexCLSID); public: - SvxOle2Shape( SdrObject* pObj ) throw(); - SvxOle2Shape( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); + SvxOle2Shape(SdrObject* pObj); + SvxOle2Shape(SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet); virtual ~SvxOle2Shape() throw() override; bool createObject( const SvGlobalName &aClassName ); @@ -642,7 +642,7 @@ public: virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; - SvxShapePolyPolygonBezier( SdrObject* pObj, css::drawing::PolygonKind eNew ) throw(); + SvxShapePolyPolygonBezier(SdrObject* pObj, css::drawing::PolygonKind eNew); virtual ~SvxShapePolyPolygonBezier() throw() override; // Local support functions @@ -665,7 +665,7 @@ protected: virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: - SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw(); + SvxGraphicObject(SdrObject* pObj, OUString const & referer); virtual ~SvxGraphicObject() throw() override; private: @@ -685,7 +685,7 @@ protected: using SvxShape::getPropertyValue; public: - Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw(); + Svx3DSceneObject(SdrObject* pObj, SvxDrawPage* pDrawPage); // 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 ) override; virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, @@ -731,7 +731,7 @@ protected: virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: - Svx3DCubeObject( SdrObject* pObj ) throw(); + Svx3DCubeObject(SdrObject* pObj); virtual ~Svx3DCubeObject() throw() override; // XServiceInfo @@ -744,7 +744,7 @@ public: class Svx3DSphereObject : public SvxShape { public: - Svx3DSphereObject( SdrObject* pObj ) throw(); + Svx3DSphereObject(SdrObject* pObj); 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 ) override; @@ -767,7 +767,7 @@ protected: virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: - Svx3DLatheObject( SdrObject* pObj ) throw(); + Svx3DLatheObject(SdrObject* pObj); virtual ~Svx3DLatheObject() throw() override; // XServiceInfo @@ -780,7 +780,7 @@ public: class Svx3DExtrudeObject : public SvxShape { public: - Svx3DExtrudeObject( SdrObject* pObj ) throw(); + Svx3DExtrudeObject(SdrObject* pObj); 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 ) override; @@ -803,7 +803,7 @@ protected: virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: - Svx3DPolygonObject( SdrObject* pObj ) throw(); + Svx3DPolygonObject(SdrObject* pObj); virtual ~Svx3DPolygonObject() throw() override; // XServiceInfo @@ -824,7 +824,7 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; public: - SvxCustomShape( SdrObject* pObj ) throw (); + SvxCustomShape(SdrObject* pObj); // override these for special property handling in subcasses. Return true if property is handled virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; @@ -858,7 +858,7 @@ public: class SvxMediaShape : public SvxShape { public: - SvxMediaShape( SdrObject* pObj, OUString const & referer ) throw(); + SvxMediaShape(SdrObject* pObj, OUString const & referer); virtual ~SvxMediaShape() throw() override; protected: diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 886d494f726b..836faa309eca 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -34,7 +34,6 @@ namespace oox { namespace drawingml { DiagramDataFragmentHandler::DiagramDataFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) - throw( ) : FragmentHandler2( rFilter, rFragmentPath ) , mpDataPtr( rDataPtr ) { @@ -68,7 +67,6 @@ DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement, DiagramLayoutFragmentHandler::DiagramLayoutFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) - throw( ) : FragmentHandler2( rFilter, rFragmentPath ) , mpDataPtr( rDataPtr ) { diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index a26ce533c3ec..7783fdfd8f3c 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2 { public: - DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw(); + DiagramDataFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr); virtual ~DiagramDataFragmentHandler() throw() override; virtual void SAL_CALL endDocument() override; @@ -42,7 +42,7 @@ private: class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2 { public: - DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw(); + DiagramLayoutFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr); virtual ~DiagramLayoutFragmentHandler() throw() override; virtual void SAL_CALL endDocument() override; diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index 7d1a3cf6a4a7..a0d40ea0412c 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -25,7 +25,6 @@ ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter, const oox::ppt::ShapeLocation eShapeLocation, oox::drawingml::ShapePtr const & pGroupShapePtr, oox::drawingml::ShapePtr const & pShapePtr) - throw( ) : FragmentHandler2( rFilter, rFragmentPath ), mpSlidePersistPtr (rSlidePersistPtr ), meShapeLocation( eShapeLocation ), diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx index 7b1fe76de519..48a1f614c0c8 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.hxx +++ b/oox/source/ppt/extdrawingfragmenthandler.hxx @@ -25,7 +25,7 @@ public: const oox::ppt::SlidePersistPtr& rSlidePersistPtr, const oox::ppt::ShapeLocation eShapeLocation, oox::drawingml::ShapePtr const & pGroupShapePtr, - oox::drawingml::ShapePtr const & pShapePtr ) throw(); + oox::drawingml::ShapePtr const & pShapePtr ); virtual ~ExtDrawingFragmentHandler() throw() override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override; diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx index 89e82bcb8db2..39bfa34bb912 100644 --- a/oox/source/ppt/layoutfragmenthandler.cxx +++ b/oox/source/ppt/layoutfragmenthandler.cxx @@ -42,14 +42,12 @@ namespace oox { namespace ppt { // CT_SlideLayout -LayoutFragmentHandler::LayoutFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) - throw() +LayoutFragmentHandler::LayoutFragmentHandler(XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr) : SlideFragmentHandler( rFilter, rFragmentPath, std::move(pMasterPersistPtr), Layout ) { } LayoutFragmentHandler::~LayoutFragmentHandler() - throw() { } diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 3c4a3c109b78..d68d3331c062 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -80,10 +80,10 @@ static std::map<PredefinedClrSchemeId, sal_Int32> PredefinedClrTokens = { folHlink, XML_folHlink } }; -PresentationFragmentHandler::PresentationFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw() -: FragmentHandler2( rFilter, rFragmentPath ) -, mpTextListStyle( new TextListStyle ) -, mbCommentAuthorsRead(false) +PresentationFragmentHandler::PresentationFragmentHandler(XmlFilterBase& rFilter, const OUString& rFragmentPath) + : FragmentHandler2( rFilter, rFragmentPath ) + , mpTextListStyle( new TextListStyle ) + , mbCommentAuthorsRead(false) { TextParagraphPropertiesVector& rParagraphDefaulsVector( mpTextListStyle->getListStyle() ); TextParagraphPropertiesVector::iterator aParagraphDefaultIter( rParagraphDefaulsVector.begin() ); diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx index d6a7e96cc1cb..b26bbd7f992a 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx @@ -16,9 +16,9 @@ using namespace com::sun::star; namespace oox { namespace shape { -ShapeDrawingFragmentHandler::ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr ) throw() - : FragmentHandler2(rFilter, rFragmentPath), - mpGroupShapePtr(pGroupShapePtr) +ShapeDrawingFragmentHandler::ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr) + : FragmentHandler2(rFilter, rFragmentPath) + , mpGroupShapePtr(pGroupShapePtr) { } diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx index 674a15d8f844..b0711f8878a3 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx @@ -19,7 +19,7 @@ namespace oox { namespace shape { class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2 { public: - ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr ) throw(); + ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr); virtual ~ShapeDrawingFragmentHandler() throw() override; virtual void SAL_CALL endDocument() override; virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override; diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index eadc506bedd1..9dbd1a9a3fb7 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -85,7 +85,7 @@ public: The returned value may be empty when the internal state of this view is not valid (like during destruction.) */ - css::uno::Reference< css::drawing::XLayer> getActiveLayer() throw (); + css::uno::Reference< css::drawing::XLayer> getActiveLayer(); private: bool getMasterPageMode() const throw(); diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 404c34c49b72..03924470f724 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -129,8 +129,8 @@ private: sd::DrawViewShell* GetViewShell(); public: - SdXImpressDocument( ::sd::DrawDocShell* pShell, bool bClipBoard ) throw(); - SdXImpressDocument( SdDrawDocument* pDoc, bool bClipBoard ) throw(); + SdXImpressDocument(::sd::DrawDocShell* pShell, bool bClipBoard); + SdXImpressDocument(SdDrawDocument* pDoc, bool bClipBoard); virtual ~SdXImpressDocument() throw() override; static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument const * pDoc ); diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index 3838b0f0de52..eb49638d7ec1 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -98,7 +98,7 @@ protected: void throwIfDisposed() const; public: - SdGenericDrawPage( SdXImpressDocument* pModel, SdPage* pInPage, const SvxItemPropertySet* pSet ) throw(); + SdGenericDrawPage(SdXImpressDocument* pModel, SdPage* pInPage, const SvxItemPropertySet* pSet); virtual ~SdGenericDrawPage() throw() override; // intern @@ -172,9 +172,9 @@ private: protected: virtual void setBackground( const css::uno::Any& rValue ) override; - virtual void getBackground( css::uno::Any& rValue ) throw() override; + virtual void getBackground( css::uno::Any& rValue ) override; public: - SdDrawPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); + SdDrawPage(SdXImpressDocument* pModel, SdPage* pInPage); virtual ~SdDrawPage() throw() override; UNO3_GETIMPLEMENTATION_DECL( SdDrawPage ) @@ -235,7 +235,7 @@ protected: virtual void getBackground( css::uno::Any& rValue ) override; public: - SdMasterPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); + SdMasterPage(SdXImpressDocument* pModel, SdPage* pInPage); virtual ~SdMasterPage() throw() override; UNO3_GETIMPLEMENTATION_DECL(SdMasterPage) diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 4945366e01a8..48c00e0b01cd 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -45,7 +45,7 @@ class SdUnoSearchReplaceShape : public css::util::XReplaceable protected: css::drawing::XDrawPage* mpPage; - css::uno::Reference< css::text::XTextRange > Search( const css::uno::Reference< css::text::XTextRange >& xText, SdUnoSearchReplaceDescriptor* pDescr ) throw(); + css::uno::Reference< css::text::XTextRange > Search( const css::uno::Reference< css::text::XTextRange >& xText, SdUnoSearchReplaceDescriptor* pDescr ); bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); static ESelection GetSelection( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(); static css::uno::Reference< css::drawing::XShape > GetShape( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(); diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 1c5ce5e83bc0..02e541d4b572 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -92,7 +92,7 @@ void SdUnoDrawView::setLayerMode (bool bLayerMode) throw() } } -Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() throw () +Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() { Reference<drawing::XLayer> xCurrentLayer; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 2350be144d91..546e724af0fc 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -131,7 +131,7 @@ OUString SdLayer::convertToExternalName( const OUString& rName ) } } -SdLayer::SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw() +SdLayer::SdLayer(SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_) : mxLayerManager(pLayerManager_) , pLayer(pSdrLayer_) , pPropSet(ImplGetSdLayerPropertySet()) diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 22724d3a7693..8217337a5b5d 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -49,7 +49,7 @@ class SdLayer : public ::cppu::WeakImplHelper< css::drawing::XLayer, css::lang::XComponent > { public: - SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw(); + SdLayer(SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_); virtual ~SdLayer() throw() override; // intern diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 2699b62bb97f..4216ff32874a 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -220,7 +220,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() } // this ctor is used from the DocShell -SdXImpressDocument::SdXImpressDocument (::sd::DrawDocShell* pShell, bool bClipBoard ) throw() +SdXImpressDocument::SdXImpressDocument(::sd::DrawDocShell* pShell, bool bClipBoard) : SfxBaseModel( pShell ), mpDocShell( pShell ), mpDoc( pShell ? pShell->GetDoc() : nullptr ), @@ -239,7 +239,7 @@ SdXImpressDocument::SdXImpressDocument (::sd::DrawDocShell* pShell, bool bClipBo } } -SdXImpressDocument::SdXImpressDocument( SdDrawDocument* pDoc, bool bClipBoard ) throw() +SdXImpressDocument::SdXImpressDocument(SdDrawDocument* pDoc, bool bClipBoard) : SfxBaseModel( nullptr ), mpDocShell( nullptr ), mpDoc( pDoc ), diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 754aa3782080..6dd5c89a1a90 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -262,7 +262,7 @@ const SvEventDescription* ImplGetSupportedMacroItems() return aMacroDescriptionsImpl; } -SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw() +SdXShape::SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) : mpShape( pShape ), mpPropSet( pModel? lcl_ImplGetShapePropertySet(pModel->IsImpressDocument(), pShape->getShapeKind() == OBJ_GRAF ) diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index e7a2f956cf99..6db3862c30a6 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -67,7 +67,7 @@ private: OUString GetPlaceholderText() const; public: - SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw(); + SdXShape(SvxShape* pShape, SdXImpressDocument* pModel); virtual ~SdXShape() throw(); virtual bool queryAggregation( const css::uno::Type & rType, css::uno::Any& aAny ) override; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 12450239f32b..6aeedfd081eb 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -339,7 +339,7 @@ sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sa } } -SdGenericDrawPage::SdGenericDrawPage( SdXImpressDocument* _pModel, SdPage* pInPage, const SvxItemPropertySet* _pSet ) throw() +SdGenericDrawPage::SdGenericDrawPage(SdXImpressDocument* _pModel, SdPage* pInPage, const SvxItemPropertySet* _pSet) : SvxFmDrawPage( static_cast<SdrPage*>(pInPage) ), SdUnoSearchReplaceShape(this), mpModel ( _pModel ), @@ -2038,8 +2038,8 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() } // SdDrawPage -SdDrawPage::SdDrawPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() -: SdGenericDrawPage( pModel, pPage, ImplGetDrawPagePropertySet( pModel->IsImpressDocument(), pPage->GetPageKind() ) ) +SdDrawPage::SdDrawPage(SdXImpressDocument* pModel, SdPage* pPage) + : SdGenericDrawPage( pModel, pPage, ImplGetDrawPagePropertySet( pModel->IsImpressDocument(), pPage->GetPageKind() ) ) { } @@ -2552,7 +2552,7 @@ Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotation return ::sd::createAnnotationEnumeration( GetPage()->getAnnotations() ); } -void SdDrawPage::getBackground( Any& rValue ) throw() +void SdDrawPage::getBackground(Any& rValue) { const SfxItemSet& rFillAttributes = GetPage()->getSdrPageProperties().GetItemSet(); @@ -2663,7 +2663,7 @@ Any SdGenericDrawPage::getNavigationOrder() } // class SdMasterPage -SdMasterPage::SdMasterPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() +SdMasterPage::SdMasterPage(SdXImpressDocument* pModel, SdPage* pPage) : SdGenericDrawPage(pModel, pPage, ImplGetMasterPagePropertySet(pPage->GetPageKind())) { } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index e26eb5d43d2d..97f6c5e984f7 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -52,7 +52,7 @@ UNO3_GETIMPLEMENTATION_IMPL( SdUnoPageBackground ); SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc /* = NULL */, - const SfxItemSet* pSet /* = NULL */) throw() + const SfxItemSet* pSet /* = NULL */) : mpPropSet(ImplGetPageBackgroundPropertySet()), mpDoc(pDoc) { diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index 642ceee2ef0f..bbf5dc959b5a 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -52,7 +52,7 @@ class SdUnoPageBackground final : public ::cppu::WeakImplHelper< const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) const throw(); public: - SdUnoPageBackground( SdDrawDocument* pDoc = nullptr, const SfxItemSet* pSet = nullptr) throw(); + SdUnoPageBackground( SdDrawDocument* pDoc = nullptr, const SfxItemSet* pSet = nullptr); virtual ~SdUnoPageBackground() throw() override; // internal diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index d53886373b4b..bee9100319e4 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -45,7 +45,7 @@ LanguageType SdUnoGetLanguage( const lang::Locale& rLocale ) class SdUnoDrawPool : public SvxUnoDrawPool { public: - explicit SdUnoDrawPool(SdDrawDocument* pModel) throw(); + explicit SdUnoDrawPool(SdDrawDocument* pModel); protected: virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) override; @@ -54,7 +54,7 @@ private: SdDrawDocument* mpDrawModel; }; -SdUnoDrawPool::SdUnoDrawPool( SdDrawDocument* pModel ) throw() +SdUnoDrawPool::SdUnoDrawPool(SdDrawDocument* pModel) : SvxUnoDrawPool( pModel ), mpDrawModel( pModel ) { } diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index a254bbe4a8b6..1f488005e000 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -441,7 +441,7 @@ uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetNextShape( const return xFound; } -uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( const uno::Reference< text::XTextRange >& xText, SdUnoSearchReplaceDescriptor* pDescr ) throw() +uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( const uno::Reference< text::XTextRange >& xText, SdUnoSearchReplaceDescriptor* pDescr ) { if(!xText.is()) return uno::Reference< text::XTextRange > (); 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 ); diff --git a/sw/source/uibase/uno/unodefaults.cxx b/sw/source/uibase/uno/unodefaults.cxx index 33eae5cb4152..6daaeee4edc1 100644 --- a/sw/source/uibase/uno/unodefaults.cxx +++ b/sw/source/uibase/uno/unodefaults.cxx @@ -23,9 +23,9 @@ #include <doc.hxx> #include <IDocumentDrawModelAccess.hxx> -SwSvxUnoDrawPool::SwSvxUnoDrawPool( SwDoc* pDoc ) throw() : - SvxUnoDrawPool(pDoc->getIDocumentDrawModelAccess().GetDrawModel(), SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER), - m_pDoc(pDoc) +SwSvxUnoDrawPool::SwSvxUnoDrawPool(SwDoc* pDoc) + : SvxUnoDrawPool(pDoc->getIDocumentDrawModelAccess().GetDrawModel(), SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER) + , m_pDoc(pDoc) { } diff --git a/sw/source/uibase/uno/unodefaults.hxx b/sw/source/uibase/uno/unodefaults.hxx index 78e4ea63e558..23bd6b543e10 100644 --- a/sw/source/uibase/uno/unodefaults.hxx +++ b/sw/source/uibase/uno/unodefaults.hxx @@ -27,7 +27,7 @@ class SwSvxUnoDrawPool : public SvxUnoDrawPool { SwDoc* m_pDoc; public: - SwSvxUnoDrawPool( SwDoc* pDoc ) throw(); + SwSvxUnoDrawPool(SwDoc* pDoc); virtual ~SwSvxUnoDrawPool() throw() override; virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() override; diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index 45756e5343b2..d10d9c8f9bd0 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -39,7 +39,7 @@ public: // XMLMetaImportComponent() throw(); explicit XMLMetaImportComponent( const css::uno::Reference< css::uno::XComponentContext >& xContext - ) throw(); + ); protected: @@ -63,7 +63,7 @@ XMLMetaImportComponent_get_implementation( } XMLMetaImportComponent::XMLMetaImportComponent( - const uno::Reference< uno::XComponentContext >& xContext) throw() + const uno::Reference< uno::XComponentContext >& xContext) : SvXMLImport(xContext, ""), mxDocProps() { } diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 2a21108b81b0..b1059c1ae5c6 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -47,7 +47,7 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_AUTO_TEXT_EVENTS; XMLAutoTextEventImport::XMLAutoTextEventImport( - const css::uno::Reference< css::uno::XComponentContext >& xContext) throw() + const css::uno::Reference< css::uno::XComponentContext >& xContext) : SvXMLImport(xContext, "") { } diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx index 6413033dee4a..6a7e04b4f83e 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextEventImport.hxx @@ -41,8 +41,7 @@ class XMLAutoTextEventImport : public SvXMLImport public: explicit XMLAutoTextEventImport( - const css::uno::Reference< css::uno::XComponentContext >& xContext - ) throw(); + const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~XMLAutoTextEventImport() throw() override; |