New loplugin:dynexcspec: Add @throws documentation, dbaccess

Change-Id: I117be0dca3cc5e204414613123422b4b0716d8ed

44 files changed, 184 insertions, 17 deletions

diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 88e005814aa6..f813114c9179 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -69,6 +69,8 @@ namespace dbaccess
                             ,OUStringBuffer& _sCondition
                             ,OUStringBuffer& _sParameter
                             ,::std::vector< sal_Int32>& _rOrgValues);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable)  throw(css::sdbc::SQLException, css::uno::RuntimeException);
 
         OUString getIdentifierQuoteString() const;
@@ -100,29 +102,73 @@ namespace dbaccess
         virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
         // css::sdbc::XResultSet
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
         // css::sdbcx::XRowLocate
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
         // css::sdbc::XResultSetUpdate
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
 
         virtual bool isResultSetChanged() const;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index d9d080847bb0..74a490e2a978 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -137,6 +137,8 @@ namespace dbaccess
                                        sal_Int32 _nType,
                                        sal_Int32 _nScale );
         OUStringBuffer createKeyFilter( );
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         bool doTryRefetch_throw() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
         void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch);
         void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
@@ -194,6 +196,8 @@ namespace dbaccess
         virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
         virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
         virtual bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         void SAL_CALL ensureRowForData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
         virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
         // css::sdbcx::XRowLocate
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index b190d3c58d8b..01a85fbfd1e9 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -195,6 +195,8 @@ namespace dbaccess
                         impl_prepareAndExecute_throw();
         void            impl_ensureStatement_throw();
 
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         css::uno::Reference< css::sdbc::XConnection >  calcConnection(const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler) throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception );
         // free clones and ParseTree. Plus, if _bComplete is <TRUE/>, *all* other associated resources
         void freeResources( bool _bComplete );
@@ -395,7 +397,8 @@ namespace dbaccess
         void    execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification);
 
         /** call the RowSetApproveListeners<p/>
-            throws an RowSetVetoException if one of the listeners vetoed
+            @throws css::sdb::RowSetVetoException if one of the listeners vetoed
+            @throws css::uno::RuntimeException
         */
         void    approveExecution() throw (css::sdb::RowSetVetoException, css::uno::RuntimeException);
 
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index d31d0a5c563f..9078c9bee44d 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -183,6 +183,8 @@ namespace dbaccess
         const connectivity::ORowSetValue& impl_getValue(sal_Int32 columnIndex);
         // sets the current and the bookmark
         void setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard);
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         void checkPositioningAllowed() throw(css::sdbc::SQLException, css::uno::RuntimeException);
         // checks  if the cache is null
         void checkCache();
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 8ed40c89b4b4..91452777ee62 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -276,6 +276,7 @@ public:
         );
 
     // XEventListener
+    /// @throws css::uno::RuntimeException
     void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException);
 
     void setModified( bool bModified );
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 30c2ac1a8196..d1258f211467 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -197,6 +197,7 @@ public:
     virtual void refresh(const css::uno::Reference< css::container::XNameAccess >& _rToBeRefreshed) override;
 
 protected:
+    /// @throws css::lang::DisposedException
     inline  void checkDisposed() throw (css::lang::DisposedException)
     {
         if ( rBHelper.bDisposed || !m_xConnection.is() )
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 611ffa80886b..14f4a0ba9568 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -126,7 +126,9 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 6191652350a7..f067ed3185bd 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -371,6 +371,7 @@ static const char sPictures[] = "Pictures";
 // document for anything, I believe this is a valid assumption ( as much as
 // I could check anyway )
 
+/// @throws RuntimeException
 void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const Reference<XComponentContext >& rxContext ) throw ( RuntimeException )
 {
     Sequence< OUString > sLibraries = xDlgCont->getElementNames();
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 61452235aad1..afdd5ffb350c 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -210,6 +210,8 @@ class ODatabaseDocument :public ModelDependentComponent             // ModelDepe
             notify the proper events for this type.
         @param _rGuard
             the instance lock to be released before doing synchronous notifications
+        @throws css::io::IOException
+        @throws css::uno::RuntimeException
     */
     void impl_storeAs_throw(
             const OUString& _rURL,
@@ -466,6 +468,7 @@ public:
     }
 
 private:
+    /// @throws css::uno::RuntimeException
     css::uno::Reference< css::ui::XUIConfigurationManager2 > const & getUIConfigurationManager2() throw (css::uno::RuntimeException);
 
     /** returns whether the model is currently being initialized
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index e5c4f0b5b8cc..1ea921cfaa0f 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -202,7 +202,11 @@ private:
         const OUString& user, const OUString& password
         );
 
+    /// @throws css::sdbc::SQLException
+    /// @throws css::uno::RuntimeException
     css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+    /// @throws css::sdbc::SQLException
+    /// @throws css::uno::RuntimeException
     css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException);
 
 protected:
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index d9f12b977bbd..bef6c99c9485 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -319,6 +319,7 @@ private:
     //- commands
 
     void onCommandGetDocumentProperties( css::uno::Any& _rProps );
+    /// @throws css::uno::Exception
     void onCommandInsert( const OUString& _sURL, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw( css::uno::Exception );
     void onCommandPreview( css::uno::Any& _rImage );
     css::uno::Any
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index 80675245446e..09abd00b694a 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -44,6 +44,7 @@ public:
 
     explicit OInterceptor( ODocumentDefinition* _pContentHolder );
 
+    /// @throws css::uno::RuntimeException
     void SAL_CALL dispose() throw(css::uno::RuntimeException);
 
     //XDispatch
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index f4917694adcd..5f7f0150bb30 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -57,7 +57,9 @@ public:
     explicit DatabaseDataProvider(css::uno::Reference< css::uno::XComponentContext > const & context);
 
     // css::lang::XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(css::uno::Reference< css::uno::XComponentContext > const & context);
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index 7c269f71501f..1603f7ae8cb8 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -109,6 +109,7 @@ namespace dbaccess
                 the connection the table belongs to. Must not be <NULL/>
             @param _rxTable
                 the table from the driver can be <NULL/>
+            @throws css::sdbc::SQLException
         */
         ODBTableDecorator(
             const css::uno::Reference< css::sdbc::XConnection >& _rxConn,
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 09c45dbc0d8c..092202d36e4a 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -101,6 +101,7 @@ namespace dbaccess
             @param          _rName          the name of the table
             @param          _rType          the type of the table, as supplied by the driver
             @param          _rDesc          the description of the table, as supplied by the driver
+            @throws css::sdbc::SQLException
         */
         ODBTable(connectivity::sdbcx::OCollection* _pTables
                 ,const css::uno::Reference< css::sdbc::XConnection >& _rxConn
@@ -112,6 +113,7 @@ namespace dbaccess
                 ,const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions)
             throw(css::sdbc::SQLException);
 
+        /// @throws css::sdbc::SQLException
         ODBTable(connectivity::sdbcx::OCollection* _pTables
                 ,const css::uno::Reference< css::sdbc::XConnection >& _rxConn)
                 throw(css::sdbc::SQLException);
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index e92f53861231..e663add04934 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -79,7 +79,9 @@ namespace dbmm
 
         // helper for factories
         static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext );
+        /// @throws RuntimeException
         static OUString SAL_CALL getImplementationName_static() throw(RuntimeException);
+        /// @throws RuntimeException
         static Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw(RuntimeException);
 
     protected:
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index cd1d864eedbd..069e1a97b692 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -67,14 +67,18 @@ namespace dbaxml
     class ODBExportHelper
     {
     public:
+        /// @throws RuntimeException
         static OUString SAL_CALL getImplementationName_Static(  ) throw (RuntimeException);
+        /// @throws RuntimeException
         static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(RuntimeException);
         static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
     };
     class ODBFullExportHelper
     {
     public:
+        /// @throws RuntimeException
         static OUString SAL_CALL getImplementationName_Static(  ) throw (RuntimeException);
+        /// @throws RuntimeException
         static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(RuntimeException);
         static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
     };
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index a950b8e4c3dd..c0c6904f85e1 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -171,9 +171,11 @@ public:
 
     ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS );
 
+    /// @throws css::uno::RuntimeException
     static OUString SAL_CALL getImplementationName_Static()
         throw (css::uno::RuntimeException);
 
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence<OUString> SAL_CALL
     getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
 
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 6567ab41da5e..133a61d33fa7 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -81,6 +81,7 @@ private:
     Reference<XPropertySet>                         m_xDataSource;
     bool                                            m_bNewFormat;
 
+    /// @throws RuntimeException
     bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
 
     /** fills the map with the Properties
@@ -108,9 +109,11 @@ public:
     // XFilter
     virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
 
+    /// @throws css::uno::RuntimeException
     static OUString SAL_CALL getImplementationName_Static()
         throw (css::uno::RuntimeException);
 
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence<OUString> SAL_CALL
     getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
 
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 4937a23856e5..9561bb6d2d5c 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -112,13 +112,6 @@ public:
         return aSupported;  \
     }   \
 
-#define DECLARE_SERVICE_INFO_STATIC()   \
-    DECLARE_SERVICE_INFO(); \
-    static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);   \
-    static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);  \
-    static css::uno::Reference< css::uno::XInterface >    \
-        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)    \
-
 #define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
     IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
     IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 353db33e0639..a66c08117709 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -386,7 +386,9 @@ namespace dbaui
         virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
         // need by registration
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index d1e8df2fcbf9..ffa45ffc6ef3 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -58,7 +58,9 @@ namespace dbaui
         virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
         // need by registration
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index fb12a172219e..9192616f2e82 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -57,6 +57,8 @@ namespace dbaui
         void reSyncRows();
         void assignTable();                 // set the table if a name is given
         void loadData();
+        /// @throws css::sdbc::SQLException
+        /// @throws css::uno::RuntimeException
         bool checkColumns(bool _bNew)
             throw (css::sdbc::SQLException,
                    css::uno::RuntimeException, std::exception);      // check if we have double column names
@@ -125,7 +127,9 @@ namespace dbaui
         virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
         // need by registration
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index 2d0aafff80f1..bfd3c5e0ef4d 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -43,7 +43,9 @@ namespace dbaui
     public:
         SbaExternalSourceBrowser(const css::uno::Reference< css::uno::XComponentContext >& _rM);
 
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 10680b3c1d95..045accdf1ef0 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -426,6 +426,7 @@ namespace dbaui
 
     protected:
         // container handling
+        /// @throws css::lang::IllegalArgumentException
         void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = nullptr) throw(css::lang::IllegalArgumentException);
         sal_Int32 implGetPos(const OUString& rName);
 
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 1d99b4c4eb2c..618f105045d4 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -176,7 +176,9 @@ namespace dbaui
         virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
         // need by registration
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index db91388ed4df..550c3f30dcd3 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -72,7 +72,9 @@ namespace dbaui
         OUString SAL_CALL getImplementationName() throw(std::exception) override;
         virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
         // need by registration
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 1befdf3ad118..09d4d31306d7 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -138,7 +138,9 @@ namespace dbaui
         static sal_Int32    getDatabaseObjectType( EntryType _eType );
 
         // need by registration
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 98d7e0b77e62..183932a9d687 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -51,7 +51,9 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index a7bcd7cabdf5..ecb79fdc60e1 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -41,7 +41,13 @@ class LimitBoxController: public svt::ToolboxController,
         virtual void SAL_CALL release() throw () override;
 
         /// XServiceInfo
-        DECLARE_SERVICE_INFO_STATIC();
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         /// XComponent
         virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 8ec7a122ebf3..3aed34554651 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -112,10 +112,12 @@ namespace dbaui
         explicit OViewController(const Reference< XComponentContext >& _rM) : OQueryController(_rM){}
 
         // need by registration
+        /// @throws RuntimeException
         static OUString getImplementationName_Static() throw( RuntimeException )
         {
             return OUString("org.openoffice.comp.dbu.OViewDesign");
         }
+        /// @throws RuntimeException
         static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException )
         {
             Sequence<OUString> aSupported { "com.sun.star.sdb.ViewDesign" };
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 300dac9ad222..6161774973e4 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -50,7 +50,9 @@ namespace dbaui
         virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
         // XServiceInfo - static methods
+        /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
         static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index d057de4633dc..9e4f415f5b02 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -39,7 +39,13 @@ namespace dbaui
         virtual OUString GetComponentServiceName() override;
 
         // XServiceInfo
-        DECLARE_SERVICE_INFO_STATIC();
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::awt::XControl
         virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index da75eb4e74ab..f4a5b9aaaa27 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -73,7 +73,13 @@ public:
     DECLARE_XINTERFACE( )
 
 // css::lang::XServiceInfo
-    DECLARE_SERVICE_INFO_STATIC();
+    DECLARE_SERVICE_INFO();
+    /// @throws css::uno::RuntimeException
+    static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static css::uno::Reference< css::uno::XInterface >
+    SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
         throw (css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index f35a6c4ed9dc..19c632562cce 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -42,7 +42,9 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index bb31037f89d5..15d888d2326c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -44,7 +44,9 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 4241bfa63763..4fddd73b2d19 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -42,7 +42,9 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index 60b34f0ca42c..32514a67f69a 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -42,7 +42,9 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 256e28603301..da64c0c7ea83 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -42,7 +42,9 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo - static methods
+    /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
     static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index f3bfc920ede2..2f6dd6eae4a5 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -81,7 +81,13 @@ namespace dbaui
             const css::uno::Reference< css::uno::XComponentContext >& _rxORB
         );
 
-        DECLARE_SERVICE_INFO_STATIC( );
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     protected:
         // own overridables
@@ -106,7 +112,13 @@ namespace dbaui
             const css::uno::Reference< css::uno::XComponentContext >& _rxORB
         );
 
-        DECLARE_SERVICE_INFO_STATIC( );
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     protected:
         // own overridables
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 033e1f7f4f62..31f89eb4394d 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -150,7 +150,9 @@ namespace dbaui
         virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
 
         // XServiceInfo - static methods
+        /// @throws RuntimeException
         static Sequence< OUString >  getSupportedServiceNames_Static() throw( RuntimeException );
+        /// @throws RuntimeException
         static OUString              getImplementationName_Static() throw( RuntimeException );
         static Reference< XInterface >      Create( const Reference< XMultiServiceFactory >& );
 
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 0ea184cc07ab..9e6184313974 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -133,7 +133,13 @@ namespace dbaui
         }
 
         // XServiceInfo
-        DECLARE_SERVICE_INFO_STATIC();
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
     };
 
     // SQLExceptionInteractionHandler
@@ -161,7 +167,13 @@ namespace dbaui
         }
 
         // XServiceInfo
-        DECLARE_SERVICE_INFO_STATIC();
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
     };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 7db87b8d2fd1..3970604e9b49 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -74,7 +74,13 @@ namespace dbaui
         virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
             throw (css::uno::RuntimeException, std::exception) override;
 
-        DECLARE_SERVICE_INFO_STATIC( );
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
         DECLARE_PROPERTYCONTAINER_DEFAULTS( );
 
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception) override;
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index 89e29463824c..eae08a0aa01c 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -51,7 +51,13 @@ namespace dbaui
         virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
             throw (css::uno::RuntimeException, std::exception) override;
 
-        DECLARE_SERVICE_INFO_STATIC( );
+        DECLARE_SERVICE_INFO();
+        /// @throws css::uno::RuntimeException
+        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        /// @throws css::uno::RuntimeException
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface >
+        SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         DECLARE_PROPERTYCONTAINER_DEFAULTS( );