framework/source/inc/loadenv/loadenv.hxx | 6 +++--- framework/source/loadenv/loadenv.cxx | 6 +++--- framework/source/uiconfiguration/imagemanagerimpl.cxx | 2 +- framework/source/uiconfiguration/imagemanagerimpl.hxx | 2 +- include/vbahelper/vbaeventshelperbase.hxx | 2 +- sc/source/ui/vba/vbaapplication.cxx | 2 +- sc/source/ui/vba/vbaapplication.hxx | 2 +- sc/source/ui/vba/vbaaxes.cxx | 2 +- sc/source/ui/vba/vbaaxes.hxx | 2 +- sc/source/ui/vba/vbachart.cxx | 2 +- sc/source/ui/vba/vbachart.hxx | 2 +- sc/source/ui/vba/vbacomment.cxx | 2 +- sc/source/ui/vba/vbacomment.hxx | 2 +- sc/source/ui/vba/vbaeventshelper.cxx | 4 ++-- sc/source/ui/vba/vbaeventshelper.hxx | 2 +- sc/source/ui/vba/vbaformat.cxx | 2 +- sc/source/ui/vba/vbaformat.hxx | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-)
New commits: commit ec651eaead5aaa2a74f4c87d3bf17f7feddb958e Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 15:34:28 2014 +0200 cid#706551 Uncaught exception Change-Id: I83cb2abe19e72c13ac00ecd8c6ec58ffbfbcb659 diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 353d571..355f23b 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -465,7 +465,7 @@ private: the whole runtime can't be used any longer. */ bool impl_loadContent() - throw(LoadEnvException, css::uno::RuntimeException); + throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException); /** @short checks if the specified content is already loaded. diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index aeba61a..30deba7 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1002,7 +1002,7 @@ bool LoadEnv::impl_furtherDocsAllowed() } bool LoadEnv::impl_loadContent() - throw(LoadEnvException, css::uno::RuntimeException) + throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException) { // SAFE -> ----------------------------------- osl::ClearableMutexGuard aWriteLock(m_mutex); commit ecd00991fd5884cd769ed00c9c3f42ba44d64511 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 15:33:32 2014 +0200 cid#706552 Uncaught exception Change-Id: I93c41521a7687ca5a451f8107971d1b8fabfd489 diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index f8f9a70..353d571 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -446,7 +446,7 @@ private: the whole runtime can't be used any longer. */ bool impl_handleContent() - throw(LoadEnvException, css::uno::RuntimeException); + throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException); /** @short tries to use FrameLoader objects for loading. diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index f561a6a..aeba61a 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -856,7 +856,7 @@ void LoadEnv::impl_detectTypeAndFilter() } bool LoadEnv::impl_handleContent() - throw(LoadEnvException, css::uno::RuntimeException) + throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException) { // SAFE -> ----------------------------------- osl::ClearableMutexGuard aReadLock(m_mutex); commit 0a87f4ad1a45aaaaad885a1418d0d6bed21db456 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 15:32:22 2014 +0200 cid#706553 Uncaught exception Change-Id: Ib3014a8f7916d8d3b9b21ddb7d2ba29108c5cd27 diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index d23f954..f8f9a70 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -412,7 +412,7 @@ private: the whole runtime can't be used any longer. */ void impl_detectTypeAndFilter() - throw(LoadEnvException, css::uno::RuntimeException); + throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException); /** @short tries to ask user for it's filter decision in case normal detection failed. diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 96ab133..f561a6a 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -738,7 +738,7 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>&, OUStrin } void LoadEnv::impl_detectTypeAndFilter() - throw(LoadEnvException, css::uno::RuntimeException) + throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException) { static OUString TYPEPROP_PREFERREDFILTER("PreferredFilter"); static OUString FILTERPROP_FLAGS ("Flags"); commit 4b8e95bf8d6b51697d5b039770c6e4c23bc2a8d9 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 15:27:49 2014 +0200 cid#706558 Uncaught exception Change-Id: I23b4d4de0772a45b57730921ef0fd191c53c4763 diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 347c7e6..785303e 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -776,7 +776,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments ) // XImageManagerImpl void ImageManagerImpl::reset() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, lang::IllegalAccessException) { SolarMutexGuard g; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 9064429..a76ee63 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -116,7 +116,7 @@ namespace framework void removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XImageManager - void reset() throw (::com::sun::star::uno::RuntimeException); + void reset() throw (::com::sun::star::uno::RuntimeException, css::lang::IllegalAccessException); ::com::sun::star::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); commit e671cb79310c3c3d903fa1229c3cd659c99e63a9 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 12:34:39 2014 +0200 cid#706917 Uncaught exception Change-Id: Ic33fd98771d04d120df7dfc5387d5d223800d666 diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 0a4e66b..95de990 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -870,7 +870,7 @@ static uno::Reference< util::XPathSettings > lcl_getPathSettingsService( const u } return xPathSettings; } -OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw ( uno::RuntimeException ) +OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw ( uno::RuntimeException, script::BasicErrorException ) { OUString sRetPath; uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext ); diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 1efbb84..14e39a8 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -38,7 +38,7 @@ private: // note: member variables moved to struct "ScVbaAppSettings", see cxx file, to be shared by all application instances ScVbaAppSettings& mrAppSettings; - OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException ); + OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE; commit 2712925f6937b0b59f3c3b6a9d0fbb380b9562c7 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 12:32:53 2014 +0200 cid#706934 Uncaught exception Change-Id: I206711c97ad1078442e92ea67d491d5b8af6b008 diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 9805224..999a7ee 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -60,7 +60,7 @@ public: uno::Reference< excel::XAxis > -ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException ) +ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index 39ccf9a..a74ce6c 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -37,7 +37,7 @@ public: // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; - static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException ); + static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAAXES_HXX commit 461092aea109e798d349e7f2bb3e7665582b8e18 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 12:30:40 2014 +0200 cid#706943 Uncaught exception Change-Id: I0a63e63318f1fa51878dff5dee8154aa34992f7e diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index b659d64..811768a 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -1020,7 +1020,7 @@ ScVbaChart::assignDiagramAttributes() uno::Reference< beans::XPropertySet > -ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException ) +ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException, uno::RuntimeException ) { assignDiagramAttributes(); uno::Reference< beans::XPropertySet > xAxisProps; diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index a639dcb..62cd53c 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -68,7 +68,7 @@ public: // Non-interface css::uno::Reference< css::beans::XPropertySet > xDiagramPropertySet() const { return mxDiagramPropertySet; } bool is3D() throw ( css::uno::RuntimeException ); - css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException ); + css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); // Methods virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; commit e8f8daa60d360b33b22ef432dae9c01d22672cfd Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 12:28:47 2014 +0200 cid#706949 Uncaught exception Change-Id: Id04efdfc7b9890c428e08a3f841e12e631f88008 diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index f62e838..d1444ff 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -41,7 +41,7 @@ ScVbaComment::ScVbaComment( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, - const uno::Reference< table::XCellRange >& xRange ) throw( lang::IllegalArgumentException ) : + const uno::Reference< table::XCellRange >& xRange ) throw( lang::IllegalArgumentException, uno::RuntimeException ) : ScVbaComment_BASE( xParent, xContext ), mxModel( xModel, uno::UNO_SET_THROW ), mxRange( xRange ) diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index db36072..9f41fb9 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -48,7 +48,7 @@ public: const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, - const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::lang::IllegalArgumentException ); + const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); virtual ~ScVbaComment() {} commit 9116edcfa72811d19828dadd373756f0a37ef1d3 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 12:26:48 2014 +0200 cid#706953 Uncaught exception Change-Id: I4c46e98a8382ac39786ffb6607bd3ecdb57b3914 diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 49441d5..0f1b42c 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -123,7 +123,7 @@ protected: /** Derived classes have to return the argument list for the specified VBA event handler. */ virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, - const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) = 0; + const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) = 0; /** Derived classes may do additional postprocessing. Called even if the event handler does not exist, or if an error occurred during execution. */ diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 9b6ef3d..e8ebdb2 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -669,7 +669,7 @@ bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, } uno::Sequence< uno::Any > ScVbaEventsHelper::implBuildArgumentList( const EventHandlerInfo& rInfo, - const uno::Sequence< uno::Any >& rArgs ) throw (lang::IllegalArgumentException) + const uno::Sequence< uno::Any >& rArgs ) throw (lang::IllegalArgumentException, uno::RuntimeException) { // fill arguments for workbook events associated to sheet events according to sheet events, sheet will be added below bool bSheetEventAsBookEvent = rInfo.mnEventId > USERDEFINED_START; diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 9c03f86..3a04e5f 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -39,7 +39,7 @@ public: protected: virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) SAL_OVERRIDE; virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; commit f58a218f7111fa4b5ab6c6a2b827ee64258dcd37 Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 12:04:58 2014 +0200 cid#706954 Uncaught exception Change-Id: I81b8b6775a3475309696fe78b2db842cda330904 diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 607a1cb..9b6ef3d 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -51,7 +51,7 @@ namespace { /** Extracts a sheet index from the specified element of the passed sequence. The element may be an integer, a Calc range or ranges object, or a VBA Range object. */ -SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException) +SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException) { VbaEventsHelperBase::checkArgument( rArgs, nIndex ); commit 19c0d7ba5f726c3ccfa7e7075f9e7a66b59cd6db Author: Noel Grandin <n...@peralex.com> Date: Tue May 27 12:02:42 2014 +0200 cid#706960 Uncaught exception Change-Id: Idb845cd756767eb4d5caf6ff0b735e71fef0efce diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index bf1da4a..90bd2ca 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -751,7 +751,7 @@ ScVbaFormat<Ifc1>::isAmbiguous(const OUString& _sPropertyName) throw ( script::B template< typename Ifc1 > void -ScVbaFormat<Ifc1>::initializeNumberFormats() throw ( script::BasicErrorException ) +ScVbaFormat<Ifc1>::initializeNumberFormats() throw ( script::BasicErrorException, uno::RuntimeException ) { if ( !xNumberFormats.is() ) { diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index edeb01e..7bf80d1 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -51,7 +51,7 @@ protected: css::uno::Reference< css::lang::XMultiServiceFactory > xMultiServiceFactory; bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException ); css::uno::Reference< css::beans::XPropertyState > getXPropertyState() throw ( css::uno::RuntimeException ); - void initializeNumberFormats() throw ( css::script::BasicErrorException ); + void initializeNumberFormats() throw ( css::script::BasicErrorException, css::uno::RuntimeException ); SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); protected: virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits