include/svx/unopool.hxx | 2 +- include/svx/unoshape.hxx | 10 +++++----- include/vbahelper/vbacollectionimpl.hxx | 2 +- sc/source/ui/vba/vbaformatcondition.cxx | 11 ++++++++++- sc/source/ui/vba/vbaformatcondition.hxx | 7 ++++++- sc/source/ui/vba/vbahyperlink.cxx | 2 +- sc/source/ui/vba/vbahyperlink.hxx | 2 +- sc/source/ui/vba/vbarange.cxx | 2 +- sc/source/ui/vba/vbarange.hxx | 2 +- sc/source/ui/vba/vbastyle.cxx | 2 +- sc/source/ui/vba/vbastyle.hxx | 2 +- sc/source/ui/vba/vbaworksheet.cxx | 2 +- sc/source/ui/vba/vbaworksheet.hxx | 2 +- sc/source/ui/vba/vbaworksheets.cxx | 2 +- sc/source/ui/vba/vbaworksheets.hxx | 2 +- sd/source/ui/unoidl/unoobj.cxx | 2 +- sd/source/ui/unoidl/unoobj.hxx | 3 ++- sd/source/ui/unoidl/unopool.cxx | 5 +++-- sfx2/source/appl/macroloader.cxx | 2 +- sfx2/source/inc/macroloader.hxx | 3 ++- starmath/inc/unomodel.hxx | 4 ++-- starmath/source/unomodel.cxx | 4 ++-- svx/source/table/cell.cxx | 2 +- svx/source/table/cell.hxx | 2 +- svx/source/unodraw/XPropertyTable.cxx | 16 ++++++++-------- svx/source/unodraw/shapeimpl.hxx | 2 +- svx/source/unodraw/unopool.cxx | 2 +- svx/source/unodraw/unoshap2.cxx | 4 ++-- svx/source/unodraw/unoshap4.cxx | 2 +- svx/source/unodraw/unoshape.cxx | 6 +++--- sw/inc/unocrsrhelper.hxx | 5 +++-- sw/source/core/unocore/unoobj.cxx | 4 ++-- 32 files changed, 69 insertions(+), 51 deletions(-)
New commits: commit 76032655c3a2c763e27f5fb57da4b1214c284aab Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 10:48:51 2014 +0200 cid#706962 Uncaught exception Change-Id: I29a28a13f7cd8f9965db97247bbf377f9937213c diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 160e255..28e5e30 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -31,7 +31,16 @@ lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return pFormatConditions; } -ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const uno::Reference< excel::XStyle >& _xStyle, const uno::Reference< excel::XFormatConditions >& _xFormatConditions, const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException ) : ScVbaFormatCondition_BASE( xParent, xContext, uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ), moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet ) + +ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterface >& xParent, + const uno::Reference< uno::XComponentContext > & xContext, + const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, + const uno::Reference< excel::XStyle >& _xStyle, + const uno::Reference< excel::XFormatConditions >& _xFormatConditions, + const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ) + : ScVbaFormatCondition_BASE( xParent, xContext, + uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ), + moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet ) { mxSheetConditionalEntries = lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getSheetConditionalEntries(); diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index db96d65..8110606 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -39,7 +39,12 @@ protected: css::uno::Reference< ov::excel::XStyle > mxStyle; css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet; public: - ScVbaFormatCondition( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const css::uno::Reference< ov::excel::XStyle >&, const css::uno::Reference< ov::excel::XFormatConditions >& _xFormatConditions, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException ); + ScVbaFormatCondition( const css::uno::Reference< ov::XHelperInterface >& xParent, + const css::uno::Reference< css::uno::XComponentContext > & xContext, + const css::uno::Reference< css::sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, + const css::uno::Reference< ov::excel::XStyle >&, + const css::uno::Reference< ov::excel::XFormatConditions >& _xFormatConditions, + const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); void notifyRange() throw ( css::script::BasicErrorException ); static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ) throw( css::script::BasicErrorException ); commit a6e2a8f737b08e861f7e37f285b8ce33ec95b19e Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 10:25:28 2014 +0200 cid#706965 Uncaught exception Change-Id: I8e21e567459d39b454264603ca8e6a4d5cd79356 diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 71c75fa..0958fef 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -31,7 +31,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, - const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException) : + const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException, uno::RuntimeException) : HyperlinkImpl_BASE( getXSomethingFromArgs< XHelperInterface >( rArgs, 0 ), rxContext ), mxCell( getXSomethingFromArgs< table::XCell >( rArgs, 1, false ) ), mnType( office::MsoHyperlinkType::msoHyperlinkRange ) diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 117b87f..45991a2 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -34,7 +34,7 @@ class ScVbaHyperlink : public HyperlinkImpl_BASE public: ScVbaHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::lang::IllegalArgumentException); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); ScVbaHyperlink( const css::uno::Reference< ov::XHelperInterface >& rxAnchor, commit 31bc94719d11b113046ad015c2a056740e6063d8 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 10:20:41 2014 +0200 cid#707024 Uncaught exception Change-Id: If294a1ad9c8364e0651305321cd42d9afc927233 diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 9af01d0..fd2ca29 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1433,7 +1433,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno } ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args, - uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false ) + uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false ) { mxRange.set( mxPropertySet, uno::UNO_QUERY ); mxRanges.set( mxPropertySet, uno::UNO_QUERY ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 655a772..57c5935 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -120,7 +120,7 @@ protected: public: ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException ); ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException ); - ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException ); + ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); ScDocument* getScDocument() throw (css::uno::RuntimeException); ScDocShell* getScDocShell() throw (css::uno::RuntimeException); commit 5dbafd168d7c51e6a588b3cb7802ff0dc9abc2ef Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 10:14:54 2014 +0200 cid#707029 Uncaught exception Change-Id: I139ae90a8bee40914d4c4f67084952dd0017ebd1 diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 3a9f8b6..932cda0 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -42,7 +42,7 @@ lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XMod } -void ScVbaStyle::initialise() throw ( uno::RuntimeException ) +void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorException ) { if (!mxModel.is() ) DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index a44f5e2..98f42a6 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -35,7 +35,7 @@ protected: css::uno::Reference< css::style::XStyle > mxStyle; css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer; - void initialise() throw ( css::uno::RuntimeException ); + void initialise() throw ( css::uno::RuntimeException, css::script::BasicErrorException ); public: ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); commit bce8ded6ca029ecd3e7ec2cccda300ce84259b2f Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 10:12:57 2014 +0200 cid#707057 Uncaught exception Change-Id: I13e8499eb1911d479d42293b68785c54ffeded71 diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 7cad848..b367e36 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -184,7 +184,7 @@ ScVbaWorksheet::ScVbaWorksheet(const uno::Reference< XHelperInterface >& xParent } ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args, - uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) : WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false ) + uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false ) { if ( args.getLength() < 3 ) throw lang::IllegalArgumentException(); diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 97e91fb..a250cde 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -68,7 +68,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet, const css::uno::Reference< css::frame::XModel >& xModel )throw (css::uno::RuntimeException) ; - ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException ); + ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); virtual ~ScVbaWorksheet(); commit f9c3bc18feb44170de307b6a5062ab403dd7cc61 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 10:11:15 2014 +0200 cid#707058 Uncaught exception Change-Id: I410716be297a1355bc48539198ec65c2a33a181e diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 6f8f9a9..7a88275 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -487,7 +487,7 @@ ScVbaWorksheets::getServiceNames() return sNames; } -bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) +bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) { if (!xSpreadDoc.is()) throw lang::IllegalArgumentException( "nameExists() xSpreadDoc is null", uno::Reference< uno::XInterface >(), 1 ); diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index 724a9e1..c3101cd 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -69,7 +69,7 @@ public: virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; - static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); + static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX commit 035c6fbe3680a0660d9454c70e017d7375a9cd15 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 10:01:23 2014 +0200 cid#707134 Uncaught exception Change-Id: I5f4f71df60defe2a2849b40a4eddeb48bfe3a2c9 diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 078a8aa..2305df2 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1087,7 +1087,7 @@ void SdXShape::SetMasterDepend( bool bDepend ) throw() } } -void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumentException, beans::UnknownPropertyException ) +void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException ) { SdrObject* pObj = mpShape->GetSdrObject(); if( pObj == NULL ) diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 4f81a12..ac8353d 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -47,7 +47,8 @@ private: const SfxItemPropertyMapEntry* mpMap; SdXImpressDocument* mpModel; - void SetStyleSheet( const ::com::sun::star::uno::Any& rAny ) throw( ::com::sun::star::lang::IllegalArgumentException, css::beans::UnknownPropertyException ); + void SetStyleSheet( const ::com::sun::star::uno::Any& rAny ) + throw( ::com::sun::star::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException ); ::com::sun::star::uno::Any GetStyleSheet() const throw( ::com::sun::star::beans::UnknownPropertyException ); // Intern commit 74ccf05ef627d33ec9becb1c63297968301d705c Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:59:28 2014 +0200 cid#707135 Uncaught exception Change-Id: I49d85f11bfe3a7cfdf3fd6cf252473a3f25bebe3 diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 6b3cc2c..078a8aa 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1087,7 +1087,7 @@ void SdXShape::SetMasterDepend( bool bDepend ) throw() } } -void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumentException ) +void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumentException, beans::UnknownPropertyException ) { SdrObject* pObj = mpShape->GetSdrObject(); if( pObj == NULL ) diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 12e10d4..4f81a12 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -47,7 +47,7 @@ private: const SfxItemPropertyMapEntry* mpMap; SdXImpressDocument* mpModel; - void SetStyleSheet( const ::com::sun::star::uno::Any& rAny ) throw( ::com::sun::star::lang::IllegalArgumentException ); + void SetStyleSheet( const ::com::sun::star::uno::Any& rAny ) throw( ::com::sun::star::lang::IllegalArgumentException, css::beans::UnknownPropertyException ); ::com::sun::star::uno::Any GetStyleSheet() const throw( ::com::sun::star::beans::UnknownPropertyException ); // Intern commit 9b6b260bcc236d109546758796519bca0dd02eba Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:56:28 2014 +0200 cid#707139 Uncaught exception Change-Id: I4d821c576fef09ca7935a931b1632238ae550df9 diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index e327cc7..5914559 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -78,7 +78,7 @@ protected: void init(); virtual void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException); - virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException); + virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException); protected: SdrModel* mpModel; diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 857874b..b586580 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -50,7 +50,8 @@ public: virtual ~SdUnoDrawPool() throw(); protected: - virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) + throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException ) SAL_OVERRIDE; private: SdDrawDocument* mpDrawModel; @@ -66,7 +67,7 @@ SdUnoDrawPool::~SdUnoDrawPool() throw() } void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue ) - throw(beans::UnknownPropertyException, lang::IllegalArgumentException) + throw(beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException) { switch( pEntry->mnHandle ) { diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index bd92c96..b86da09 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -149,7 +149,7 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn } void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue ) - throw(beans::UnknownPropertyException, lang::IllegalArgumentException) + throw(beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException) { uno::Any aValue( rValue ); commit 56c4dbe523bd7c0d30f7d7590ac8eaf519e8490d Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:48:15 2014 +0200 cid#707147 Uncaught exception Change-Id: Ie49e70c3fa7704727129e613814aaf559d1a7fb6 diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 3560779..f51b7a0 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -188,7 +188,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener( } ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) - throw ( uno::RuntimeException ) + throw ( ucb::ContentCreationException, uno::RuntimeException ) { #ifdef DISABLE_SCRIPTING (void) rURL; diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx index 6c729ee..2cfa7ed 100644 --- a/sfx2/source/inc/macroloader.hxx +++ b/sfx2/source/inc/macroloader.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp> #include <com/sun/star/uno/Exception.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/implbase4.hxx> @@ -62,7 +63,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( css::uno::RuntimeException ); + static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( css::uno::RuntimeException, css::ucb::ContentCreationException ); virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, commit 437a1f3925998a56d15f874358cca31552943225 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:41:39 2014 +0200 cid#707192 Uncaught exception Change-Id: Ibf6f8a4a405d089eb8bbdcf46269f2f78b2222a9 diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 0f610de..90d876b 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -257,7 +257,7 @@ protected: return createCollectionObject( m_xNameAccess->getByName( sIndex ) ); } - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException) { if ( !m_xIndexAccess.is() ) throw css::uno::RuntimeException("ScVbaCollectionBase numeric index access not supported by this object" ); commit 9fb54d62b13b50e6a270a70183a86a0d8f6cdbfa Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:33:02 2014 +0200 cid#707198 Uncaught exception Change-Id: Ibfe57b366207550b0f3c0e9cb7e8da1078531742 diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index b923ae7..5bb952f 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -61,7 +61,7 @@ protected: virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw( css::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; public: SmModel( SfxObjectShell *pObjSh = 0 ); virtual ~SmModel() throw (); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 9d4d1fe..330ce3c 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -718,7 +718,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* } void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValue ) - throw( UnknownPropertyException, WrappedTargetException ) + throw( RuntimeException, UnknownPropertyException, WrappedTargetException ) { SmDocShell *pDocSh = static_cast < SmDocShell * > (GetObjectShell()); commit 2d5d98e12d15cb9f455d0333ff67f1538fdc706f Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:31:12 2014 +0200 cid#707199 Uncaught exception Change-Id: I4ff6cdf0f7d48318a948865784c66f992fe52e3d diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index d9b9502..b923ae7 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -59,7 +59,7 @@ class SmModel : public SfxBaseModel, SmPrintUIOptions* m_pPrintUIOptions; protected: virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; public: diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 26ac825..9d4d1fe 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -433,7 +433,7 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames_Static(void) } void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues) - throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException) + throw( RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException) { SolarMutexGuard aGuard; commit dab10217ee81eb956195a37dd4e6a9bbd6c88b58 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:27:37 2014 +0200 cid#707232 Uncaught exception Change-Id: I834cde0d59f9d283fa31eb5bd0fc8dd89736e064 diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 3ab9b68..d26d70c 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -348,7 +348,7 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* -Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw() +Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException) : SdrText( rTableObj, pOutlinerParaObject ) , SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) , mpPropSet( ImplGetSvxCellPropertySet() ) diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index c5a0078..82d717d 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -211,7 +211,7 @@ protected: SVX_DLLPRIVATE ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ); private: - SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(); + SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException); SVX_DLLPRIVATE virtual ~Cell() throw(); const SvxItemPropertySet* mpPropSet; commit 7c81ce73deaae70cc498f39a66decae85bcb38d0 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:25:45 2014 +0200 cid#707234 Uncaught exception Change-Id: I1c6bf752deafeb445bbe7132c851fe5e84be3ca4 diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 908b032..15bc1ec 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -54,7 +54,7 @@ public: virtual ~SvxUnoXPropertyTable() throw(); - virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() = 0; + virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) = 0; virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(uno::RuntimeException, lang::IllegalArgumentException) = 0; // XServiceInfo @@ -635,7 +635,7 @@ public: SvxUnoXBitmapTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {}; // SvxUnoXPropertyTable - virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() SAL_OVERRIDE; + virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) SAL_OVERRIDE; virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(uno::RuntimeException) SAL_OVERRIDE; // XElementAccess @@ -652,7 +652,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP } // SvxUnoXPropertyTable -uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw() +uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) { OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); const GraphicObject& rGraphicObject(((XBitmapEntry*)pEntry)->GetGraphicObject()); commit 63727c2f0fd1eebc01ab4d104486982bcfaa4c5a Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:24:27 2014 +0200 cid#707235 Uncaught exception Change-Id: I62e9691fb7e583c2c8a097bcba389fb6a5b0bd3a diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 2a716c0..908b032 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -55,7 +55,7 @@ public: virtual ~SvxUnoXPropertyTable() throw(); virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() = 0; - virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(lang::IllegalArgumentException) = 0; + virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(uno::RuntimeException, lang::IllegalArgumentException) = 0; // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -636,7 +636,7 @@ public: // SvxUnoXPropertyTable virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() SAL_OVERRIDE; - virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw() SAL_OVERRIDE; + virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(uno::RuntimeException) SAL_OVERRIDE; // XElementAccess virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -663,7 +663,7 @@ uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw( return aAny; } -XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno::Any& rAny ) const throw() +XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno::Any& rAny ) const throw(uno::RuntimeException) { OUString aURL; if(!(rAny >>= aURL)) commit 0eab01c2ed2f6c8fd547475f2b261bb474df5b11 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:22:52 2014 +0200 cid#707236 Uncaught exception Change-Id: I96d69c4ed7a28f5197507e26eaee68134df2988f diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 22c30fe..2a716c0 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -55,7 +55,7 @@ public: virtual ~SvxUnoXPropertyTable() throw(); virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() = 0; - virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw() = 0; + virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(lang::IllegalArgumentException) = 0; // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -318,7 +318,7 @@ public: // SvxUnoXPropertyTable virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() SAL_OVERRIDE; - virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw() SAL_OVERRIDE; + virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(lang::IllegalArgumentException) SAL_OVERRIDE; // XElementAccess virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -345,7 +345,7 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw return aAny; } -XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno::Any& rAny ) const throw() +XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno::Any& rAny ) const throw(lang::IllegalArgumentException) { if( !rAny.getValue() || rAny.getValueType() != cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()) commit 4a150c2d0c0b16cb3646c7a5fc534043a456f758 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:20:54 2014 +0200 cid#707249 Uncaught exception Change-Id: Ib8ae83da27b24962769737626a9b55489239bda9 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 247b3e1..868724b 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -612,7 +612,7 @@ public: // Local support functions ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw(); - void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(); + void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 19930f9..cafb6b5 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1268,7 +1268,7 @@ drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw() } -void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw() +void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; commit f7679803dae2ea72b7c51d2d02f41afa971a43f2 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:13:59 2014 +0200 cid#707251 Uncaught exception Change-Id: I77a606e3200da94fcf2268c5cd6c396068a82e47 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 1fa5696..247b3e1 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -642,7 +642,7 @@ public: // Local support functions ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw(); - void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(); + void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 2de75ec..19930f9 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1403,7 +1403,7 @@ drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw() } -void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw() +void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; commit e0377940b7544f38f37f5f0a6d9137ca663c4a47 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:09:00 2014 +0200 cid#707262 Uncaught exception Change-Id: I873804a9f666d4627e65b53ea6390fb8585588f7 diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 3f54110..cc36155 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -98,7 +98,7 @@ public: virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) throw () SAL_OVERRIDE; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) throw (css::uno::RuntimeException) SAL_OVERRIDE; }; diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 16c0329..2dbd917 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -725,7 +725,7 @@ SvxFrameShape::~SvxFrameShape() throw() { } -void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw () +void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (uno::RuntimeException) { SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aIFrameClassId( SO3_IFRAME_CLASSID ); commit 616011663a3cb4fe138e5335d1d996b1c00f5bde Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 09:06:55 2014 +0200 cid#707271 Uncaught exception Change-Id: I95d1e737004074a00100b4c7ba4f15f660df4ff5 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index a649468..1fa5696 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -166,7 +166,7 @@ protected: virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); public: - SvxShape( SdrObject* pObj ) throw (); + SvxShape( SdrObject* pObj ) throw (css::uno::RuntimeException); SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw (css::uno::RuntimeException); SvxShape() throw (css::uno::RuntimeException); virtual ~SvxShape() throw (); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 37d5769..202ac3a 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -182,7 +182,7 @@ protected: ***********************************************************************/ -SvxShape::SvxShape( SdrObject* pObject ) throw() +SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) commit 388f1fc62bc1920c6ca61ecf78538734f5082ae5 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 08:59:17 2014 +0200 cid#707272 Uncaught exception Change-Id: I4ff6b2fddc0cb96ec088cb0b123a9f6185db389c diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 0e57fc9..a649468 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -167,7 +167,7 @@ protected: public: SvxShape( SdrObject* pObj ) throw (); - SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw (); + SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw (css::uno::RuntimeException); SvxShape() throw (css::uno::RuntimeException); virtual ~SvxShape() throw (); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 032e6af..37d5769 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -196,7 +196,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw() } -SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw() +SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw( uno::RuntimeException ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) commit cf5a067ab6501bba976827a21a4d1358fddc5782 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 08:47:38 2014 +0200 cid#707273 Uncaught exception Change-Id: Ic9dcbcdc73a0e7b95d665e58db291fa50a287a3c diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index f5e8fae..0e57fc9 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -168,7 +168,7 @@ protected: public: SvxShape( SdrObject* pObj ) throw (); SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw (); - SvxShape() throw (); + SvxShape() throw (css::uno::RuntimeException); virtual ~SvxShape() throw (); // Internals diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 1557bba..032e6af 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -210,7 +210,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, } -SvxShape::SvxShape() throw() +SvxShape::SvxShape() throw( uno::RuntimeException ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) commit 48761084b2d30d7bf31c0972f1a6850de5fd55d4 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 08:13:32 2014 +0200 cid#707295 Uncaught exception Change-Id: If63df32a079bb4a568ed6085097062f77c351a06 diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index a3985ca..ade29a1 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/uno/DeploymentException.hpp> #include <swtypes.hxx> #include <flyenum.hxx> @@ -218,7 +219,7 @@ namespace SwUnoCursorHelper const ::com::sun::star::uno::Any& rValue, SwDoc & rDoc, SfxItemSet & rSet); void SetTxtFmtColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM) - throw (::com::sun::star::lang::IllegalArgumentException); + throw (::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException); bool SetCursorPropertyValue( SfxItemPropertySimpleEntry const& rEntry, ::com::sun::star::uno::Any const& rValue, diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 416335c..c572ffd 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -260,7 +260,7 @@ throw (lang::IllegalArgumentException) void SwUnoCursorHelper::SetTxtFmtColl(const uno::Any & rAny, SwPaM & rPaM) -throw (lang::IllegalArgumentException) +throw (lang::IllegalArgumentException, uno::RuntimeException) { SwDoc *const pDoc = rPaM.GetDoc(); SwDocShell *const pDocSh = pDoc->GetDocShell(); commit d105483207194d5053833be328855376d15869a7 Author: Noel Grandin <n...@peralex.com> Date: Mon May 26 16:50:57 2014 +0200 cid#707296 and cid#738184 Uncaught exception Change-Id: I59d1a0818bd896f0ac601c72e7f6cc89f95f043c diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 050c5c0..a3985ca 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -223,7 +223,7 @@ namespace SwUnoCursorHelper SfxItemPropertySimpleEntry const& rEntry, ::com::sun::star::uno::Any const& rValue, SwPaM & rPam, SfxItemSet & rItemSet) - throw (::com::sun::star::lang::IllegalArgumentException); + throw (::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException, css::uno::DeploymentException); /// try to get something that can be selected out of the XInterface /// at most one of the out parameters gets assigned a non-null value diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 72e9d79..416335c 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -479,7 +479,7 @@ bool SwUnoCursorHelper::SetCursorPropertyValue( SfxItemPropertySimpleEntry const& rEntry, const uno::Any& rValue, SwPaM & rPam, SfxItemSet & rItemSet) -throw (lang::IllegalArgumentException) +throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentException) { if (!(rEntry.nFlags & beans::PropertyAttribute::MAYBEVOID) && (rValue.getValueType() == ::getCppuVoidType())) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits