extensions/source/propctrlr/formcomponenthandler.cxx | 2 +- extensions/source/propctrlr/formcomponenthandler.hxx | 2 +- include/svx/unoshape.hxx | 6 +++--- oovbaapi/ooo/vba/word/XFields.idl | 2 +- oox/source/ppt/slidefragmenthandler.cxx | 2 +- svx/source/unodraw/unoshap4.cxx | 2 +- svx/source/unodraw/unoshape.cxx | 4 ++-- sw/source/filter/ww8/docxattributeoutput.cxx | 3 +-- sw/source/ui/vba/vbafield.cxx | 2 +- sw/source/ui/vba/vbafield.hxx | 2 +- ucbhelper/source/client/content.cxx | 10 ---------- 11 files changed, 13 insertions(+), 24 deletions(-)
New commits: commit abd5786847811ed1f10d8d7433b52ab795b4f263 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 17 21:06:59 2014 +0100 coverity#1202901 Uncaught exception and probably gadzillions of other uncaught exception warnings this exception can't actually be thrown because all possible InsertOperation conditions are already handled. Change-Id: I176c5e253e8b1092a060fc066c2e03dae3cea343 diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 4cb7628..c8ccd88 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -1016,16 +1016,6 @@ bool Content::transferContent( const Content& rSourceContent, sCommand = "checkin"; bCheckIn = true; break; - - default: - ucbhelper::cancelCommandExecution( - makeAny( IllegalArgumentException( - OUString( - "Unknown transfer operation!" ), - get(), - -1 ) ), - m_xImpl->getEnvironment() ); - // Unreachable } Command aCommand; aCommand.Name = sCommand; commit b35ea8b0fe7773f4bd09590d482fb49a2ebc3440 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 17 20:39:38 2014 +0100 coverity#1202900 Uncaught exception Change-Id: I53e7bd12701ca4d30fdbf36fe525076d53f86edc diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index a44f63c..853348d 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -60,7 +60,7 @@ SlideFragmentHandler::SlideFragmentHandler( XmlFilterBase& rFilter, const OUStri getFilter(), aVMLDrawingFragmentPath, *pPersistPtr->getDrawing() ) ); } -SlideFragmentHandler::~SlideFragmentHandler() throw() +SlideFragmentHandler::~SlideFragmentHandler() { // convert and insert all VML shapes (mostly form controls) mpSlidePersistPtr->getDrawing()->convertAndInsert(); commit 747a56821ed615158b91367c70cc7ad530e58160 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 17 18:41:42 2014 +0100 coverity#1202899 Uncaught exception Change-Id: I1fd4e8bad535db1b787eac231ab02ed34ee09445 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 7c3195d..937ecce 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -328,7 +328,7 @@ protected: protected: // overide these for special property handling in subcasses. Return true if property is handled virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; @@ -567,7 +567,7 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText protected: // overide these for special property handling in subcasses. Return true if property is handled virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void resetModifiedState(); diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 7de6b35..f8ac4c8 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -204,7 +204,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro throw IllegalArgumentException(); } -bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 6180492..808c82b 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4149,7 +4149,7 @@ bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::setPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if( pProperty->nWID == SDRATTR_TEXTDIRECTION ) { commit 297394e9268d35745e98179bc46dc43dcfe1bd18 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 17 18:40:21 2014 +0100 coverity#1202898 Uncaught exception Change-Id: Ib5294ae8c450ba8213e5a62dfd8c12562e8b3323 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index a500224..7c3195d 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -160,7 +160,7 @@ protected: // overide these for special property handling in subcasses. Return true if property is handled virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 471db26..6180492 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2577,7 +2577,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl -bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { commit 4394c6b95c062426a08e90c94559d02095d28069 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 17 18:38:38 2014 +0100 coverity#707375 Uncaught exception Change-Id: I7fc84a17637d6dd4191525e91d49dd4e24bd3a26 diff --git a/oovbaapi/ooo/vba/word/XFields.idl b/oovbaapi/ooo/vba/word/XFields.idl index 3d87a89d..ddab2d7 100644 --- a/oovbaapi/ooo/vba/word/XFields.idl +++ b/oovbaapi/ooo/vba/word/XFields.idl @@ -31,7 +31,7 @@ interface XFields { interface ooo::vba::XCollection; - XField Add([in] XRange Range, [in] any Type, [in] any Text,[in] any PreserveFormatting); + XField Add([in] XRange Range, [in] any Type, [in] any Text,[in] any PreserveFormatting) raises (com::sun::star::script::BasicErrorException); long Update(); }; diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 0fdcb3a..c4c4288 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -310,7 +310,7 @@ SwVbaFields::SwVbaFields( const uno::Reference< XHelperInterface >& xParent, con } uno::Reference< word::XField > SAL_CALL -SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) throw (css::uno::RuntimeException, std::exception) +SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) { sal_Int32 nType = word::WdFieldType::wdFieldEmpty; Type >>= nType; diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 24bc643..922ca89 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -56,7 +56,7 @@ private: public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); // XFields - virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; commit cf4f433dfb221e0d35b83bd5ff5e68c95ffbbb35 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 17 18:34:59 2014 +0100 coverity#706522 Uncaught exception Change-Id: If5638fa4c35a642791088f8ecda7dd0c13ac5a81 diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index ab7f34e..aa59f0b 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -814,7 +814,7 @@ namespace pcr } - void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); FormComponentPropertyHandler_Base::addPropertyChangeListener( _rxListener ); diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 0753d82..b83b2f7 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -119,7 +119,7 @@ namespace pcr virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; commit a7a775da71e0d9908bf21b419b5db1550a94eb8b Author: Caolán McNamara <caol...@redhat.com> Date: Thu Apr 17 21:11:25 2014 +0100 coverity#1202835 Resource leak Change-Id: I2507c7741e803fcf3e4b81193dfafb144d50a0a8 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 801c0ac..3de5f8b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2078,8 +2078,6 @@ void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle ) static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, const SvxBorderLine* pBorderLine, sal_uInt16 nDist, bool bWriteShadow = false, const table::BorderLine2* rStyleProps = NULL ) { - FastAttributeList* pAttr = pSerializer->createAttrList(); - // Compute val attribute value // Can be one of: // single, double, @@ -2156,6 +2154,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co pBorderLine->GetWidth() == convertMm100ToTwip( rStyleProps->LineWidth ) ) return; + FastAttributeList* pAttr = pSerializer->createAttrList(); pAttr->add( FSNS( XML_w, XML_val ), OString( pVal ) ); if ( pBorderLine && !pBorderLine->isEmpty() )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits