diff options
-rw-r--r-- | include/oox/core/fastparser.hxx | 28 | ||||
-rw-r--r-- | include/oox/core/filterbase.hxx | 1 | ||||
-rw-r--r-- | include/oox/core/filterdetect.hxx | 1 | ||||
-rw-r--r-- | include/oox/core/recordparser.hxx | 3 | ||||
-rw-r--r-- | include/oox/core/xmlfilterbase.hxx | 1 | ||||
-rw-r--r-- | include/oox/ppt/pptimport.hxx | 2 | ||||
-rw-r--r-- | include/oox/vml/vmlinputstream.hxx | 6 | ||||
-rw-r--r-- | oox/inc/services.hxx | 64 | ||||
-rw-r--r-- | oox/source/core/filterbase.cxx | 2 | ||||
-rw-r--r-- | oox/source/core/recordparser.cxx | 1 | ||||
-rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 1 | ||||
-rw-r--r-- | oox/source/docprop/ooxmldocpropimport.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/textinputstream.cxx | 1 | ||||
-rw-r--r-- | oox/source/ole/olestorage.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/ShapeFilterBase.hxx | 1 |
15 files changed, 95 insertions, 21 deletions
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index 4497d8b330bb..69cc111c4b49 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -56,35 +56,53 @@ namespace core { class FastParser { public: + /// @throws css::uno::RuntimeException explicit FastParser( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); virtual ~FastParser(); - /** Registers an OOXML namespace at the parser. */ + /** Registers an OOXML namespace at the parser. + @throws css::lang::IllegalArgumentException + @throws css::uno::RuntimeException + */ void registerNamespace( sal_Int32 nNamespaceId ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); - /** Sets the passed document handler that will receive the SAX parser events. */ + /** Sets the passed document handler that will receive the SAX parser events. + @throws css::uno::RuntimeException + */ void setDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& rxDocHandler ) throw( css::uno::RuntimeException ); /** Parses the passed SAX input source. - @param bCloseStream True = closes the stream in the input source after parsing. */ + @param bCloseStream True = closes the stream in the input source after parsing. + @throws css::xml::sax::SAXException + @throws css::io::IOException + @throws css::uno::RuntimeException + */ void parseStream( const css::xml::sax::InputSource& rInputSource, bool bCloseStream = false ) throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception ); /** Parses the passed input stream. - @param bCloseStream True = closes the passed stream after parsing. */ + @param bCloseStream True = closes the passed stream after parsing. + @throws css::xml::sax::SAXException + @throws css::io::IOException + @throws css::uno::RuntimeException + */ void parseStream( const css::uno::Reference< css::io::XInputStream >& rxInStream, const OUString& rStreamName ) throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception ); /** Parses a stream from the passed storage with the specified name. - @param bCloseStream True = closes the stream after parsing. */ + @param bCloseStream True = closes the stream after parsing. + @throws css::xml::sax::SAXException + @throws css::io::IOException + @throws css::uno::RuntimeException + */ void parseStream( StorageBase& rStorage, const OUString& rStreamName ) throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception ); diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index f73c53a7cabb..76652a9e1a15 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -95,6 +95,7 @@ typedef ::cppu::WeakImplHelper< class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE, public ::cppu::BaseMutex { public: + /// @throws css::uno::RuntimeException explicit FilterBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 2fdf4d93f4b0..f27e6059478c 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -98,6 +98,7 @@ private: class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo> { public: + /// @throws css::uno::RuntimeException explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); virtual ~FilterDetect() override; diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index 7a51aad48aac..da90180489fc 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -57,6 +57,9 @@ public: void setFragmentHandler( const ::rtl::Reference< FragmentHandler >& rxHandler ); + /// @throws css::xml::sax::SAXException + /// @throws css::io::IOException + /// @throws css::uno::RuntimeException void parseStream( const RecordInputSource& rInputSource ) throw( css::xml::sax::SAXException, css::io::IOException, diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 59043ba6f7ea..c9769d7fadb8 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -83,6 +83,7 @@ struct XmlFilterBaseImpl; class OOX_DLLPUBLIC XmlFilterBase : public FilterBase { public: + /// @throws css::uno::RuntimeException explicit XmlFilterBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 0d37d75deecd..2976fe539a8e 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -54,7 +54,7 @@ namespace oox { namespace ppt { class PowerPointImport : public oox::core::XmlFilterBase { public: - + /// @throws css::uno::RuntimeException PowerPointImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); virtual ~PowerPointImport() override; diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index 27e697f005e5..8966a41966df 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -80,8 +80,14 @@ public: throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; private: + /// @throws css::io::IOException + /// @throws css::uno::RuntimeException void updateBuffer() throw (css::io::IOException, css::uno::RuntimeException); + /// @throws css::io::IOException + /// @throws css::uno::RuntimeException OString readToElementBegin() throw (css::io::IOException, css::uno::RuntimeException); + /// @throws css::io::IOException + /// @throws css::uno::RuntimeException OString readToElementEnd() throw (css::io::IOException, css::uno::RuntimeException); private: diff --git a/oox/inc/services.hxx b/oox/inc/services.hxx index ab63321fce91..619f95550098 100644 --- a/oox/inc/services.hxx +++ b/oox/inc/services.hxx @@ -22,24 +22,58 @@ #include <sal/config.h> -#define DECLARE_FUNCTIONS( className ) \ -extern OUString SAL_CALL className##_getImplementationName(); \ -extern css::uno::Sequence< OUString > SAL_CALL className##_getSupportedServiceNames(); \ -extern css::uno::Reference< css::uno::XInterface > SAL_CALL className##_createInstance( \ -const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception) - namespace oox { - namespace core { DECLARE_FUNCTIONS( FastTokenHandler ); } - namespace core { DECLARE_FUNCTIONS( FilterDetect ); } - namespace docprop { DECLARE_FUNCTIONS( DocumentPropertiesImport ); } - namespace ppt { DECLARE_FUNCTIONS( PowerPointImport ); } - namespace ppt { DECLARE_FUNCTIONS( QuickDiagrammingImport ); } - namespace ppt { DECLARE_FUNCTIONS( QuickDiagrammingLayout ); } - namespace shape { DECLARE_FUNCTIONS( ShapeContextHandler ); } + namespace core { + extern OUString SAL_CALL FastTokenHandler_getImplementationName(); + extern css::uno::Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames(); + /// @throws css::uno::Exception + extern css::uno::Reference< css::uno::XInterface > SAL_CALL FastTokenHandler_createInstance( + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception); + } + namespace core { + extern OUString SAL_CALL FilterDetect_getImplementationName(); + extern css::uno::Sequence< OUString > SAL_CALL FilterDetect_getSupportedServiceNames(); + /// @throws css::uno::Exception + extern css::uno::Reference< css::uno::XInterface > SAL_CALL FilterDetect_createInstance( + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception); + } + namespace docprop { + extern OUString SAL_CALL DocumentPropertiesImport_getImplementationName(); + extern css::uno::Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames(); + /// @throws css::uno::Exception + extern css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentPropertiesImport_createInstance( + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception); + } + namespace ppt { + extern OUString SAL_CALL PowerPointImport_getImplementationName(); + extern css::uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames(); + /// @throws css::uno::Exception + extern css::uno::Reference< css::uno::XInterface > SAL_CALL PowerPointImport_createInstance( + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception); + } + namespace ppt { + extern OUString SAL_CALL QuickDiagrammingImport_getImplementationName(); + extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames(); + /// @throws css::uno::Exception + extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance( + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception); + } + namespace ppt { + extern OUString SAL_CALL QuickDiagrammingLayout_getImplementationName(); + extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames(); + /// @throws css::uno::Exception + extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance( + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception); + } + namespace shape { + extern OUString SAL_CALL ShapeContextHandler_getImplementationName(); + extern css::uno::Sequence< OUString > SAL_CALL ShapeContextHandler_getSupportedServiceNames(); + /// @throws css::uno::Exception + extern css::uno::Reference< css::uno::XInterface > SAL_CALL ShapeContextHandler_createInstance( + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception); + } } -#undef DECLARE_FUNCTIONS - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index d3323e59f74b..adaadfc09895 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -151,8 +151,10 @@ struct FilterBaseImpl bool mbExportVBA; + /// @throws RuntimeException explicit FilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ); + /// @throws IllegalArgumentException void setDocumentModel( const Reference< XComponent >& rxComponent ) throw( IllegalArgumentException ); void initializeFilter(); diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index b7f376743f44..988d8cd57f8b 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -42,6 +42,7 @@ public: inline explicit Locator( RecordParser* pParser ) : mpParser( pParser ) {} void dispose(); + /// @throws css::uno::RuntimeException void checkDispose() throw( RuntimeException ); // com.sun.star.sax.XLocator interface diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 569110c4dd6a..48da8c7cbe71 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -181,6 +181,7 @@ struct XmlFilterBaseImpl TextFieldStack maTextFieldStack; const NamespaceMap& mrNamespaceMap; + /// @throws RuntimeException explicit XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ); ~XmlFilterBaseImpl(); }; diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 5af495f71678..1aa4c4a09ce8 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -62,6 +62,8 @@ Reference< XInterface > SAL_CALL DocumentPropertiesImport_createInstance( const namespace { +/// @throws RuntimeException +/// @throws css::io::IOException Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType ) throw (RuntimeException, css::io::IOException) { Reference< XRelationshipAccess > xRelation( rxStorage, UNO_QUERY_THROW ); diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 1c4f4c13175f..70b657f59fdd 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -55,6 +55,7 @@ public: throw (NotConnectedException, IOException, RuntimeException, std::exception) override; private: + /// @throws NotConnectedException void ensureConnected() const throw (NotConnectedException); private: diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index ee8dc65f32d2..4e20a9dda1c7 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -68,7 +68,9 @@ public: virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; private: + /// @throws IOException void ensureSeekable() const throw( IOException ); + /// @throws NotConnectedException void ensureConnected() const throw( NotConnectedException ); private: diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 94d760992661..5bb339b6e41c 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -35,6 +35,7 @@ class ShapeFilterBase : public core::XmlFilterBase public: typedef std::shared_ptr<ShapeFilterBase> Pointer_t; + /// @throws css::uno::RuntimeException explicit ShapeFilterBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); |