diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-12-22 10:50:40 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-25 21:55:39 +0100 |
commit | 76e950bfafd8b44ee47d7a9573df1571652c52e1 (patch) | |
tree | 35c6ea2a240ba08ccf2c4faaaaed18c088f75763 /sd | |
parent | 93c96ec5018f723748557975435eb6c27135b60c (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 'sd')
-rw-r--r-- | sd/source/ui/inc/SdUnoDrawView.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/unopage.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/inc/unosrch.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unolayer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unolayer.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unoobj.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopback.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopback.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopool.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unosrch.cxx | 2 |
15 files changed, 25 insertions, 25 deletions
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 > (); |