From 8955ce4ede374ed2af4477850809d21a2b5e6dd6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 19 Jan 2017 17:54:59 +0100 Subject: New loplugin:dynexcspec: Add @throws documentation, oox Change-Id: I83c6995e4f15d6a042e57bac4d71874124402547 --- oox/inc/services.hxx | 64 +++++++++++++++++++++++-------- oox/source/core/filterbase.cxx | 2 + oox/source/core/recordparser.cxx | 1 + oox/source/core/xmlfilterbase.cxx | 1 + oox/source/docprop/ooxmldocpropimport.cxx | 2 + oox/source/helper/textinputstream.cxx | 1 + oox/source/ole/olestorage.cxx | 2 + oox/source/shape/ShapeFilterBase.hxx | 1 + 8 files changed, 59 insertions(+), 15 deletions(-) (limited to 'oox') 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 -#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 Pointer_t; + /// @throws css::uno::RuntimeException explicit ShapeFilterBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); -- cgit