dbaccess: remove SAL_THROW macro

Change-Id: I01e43d6171dc2381ff8c151d5716e9ffede24822

8 files changed, 24 insertions, 30 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 7bac101b5b9a..489a4d4463e3 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1046,7 +1046,7 @@ void SAL_CALL ORowSet::deleteRow(  ) throw(SQLException, RuntimeException, std::
     fireRowcount();
 }
 
-void ORowSet::implCancelRowUpdates( bool _bNotifyModified ) SAL_THROW( ( SQLException, RuntimeException ) )
+void ORowSet::implCancelRowUpdates( bool _bNotifyModified )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index e4cf71b312ea..67d9423ed119 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -414,7 +414,7 @@ namespace dbaccess
         /// set m_xActiveConnection, fire a PropertyChangeEvent if necessary, do the event listener handling etc
         void setActiveConnection( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxNewConn, bool _bFireEvent = true );
 
-        void implCancelRowUpdates( bool _bNotifyModified ) SAL_THROW( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) );
+        void implCancelRowUpdates( bool _bNotifyModified );
 
         /** sets the given result set type/concurrency at the given statement, while respecting
             possibly related data source settings
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 07331079b3ab..05e6e30a43dc 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -152,7 +152,7 @@ public:
     void disposeStorages();
 
     /// disposes all known sub storages
-    void commitStorages() SAL_THROW(( IOException, RuntimeException ));
+    void commitStorages();
 
     /// commits the dedicated "database" storage
     bool commitEmbeddedStorage( bool _bPreventRootCommits );
@@ -257,7 +257,7 @@ void DocumentStorageAccess::disposeStorages()
     m_bDisposingSubStorages = false;
 }
 
-void DocumentStorageAccess::commitStorages() SAL_THROW(( IOException, RuntimeException ))
+void DocumentStorageAccess::commitStorages()
 {
     try
     {
@@ -783,7 +783,7 @@ void ODatabaseModelImpl::setResource( const OUString& i_rDocumentURL, const Sequ
     return aMutableArgs;
 }
 
-void ODatabaseModelImpl::disposeStorages() SAL_THROW(())
+void ODatabaseModelImpl::disposeStorages()
 {
     getDocumentStorageAccess()->disposeStorages();
 }
@@ -883,7 +883,7 @@ bool ODatabaseModelImpl::commitEmbeddedStorage( bool _bPreventRootCommits )
     return getDocumentStorageAccess()->commitEmbeddedStorage( _bPreventRootCommits );
 }
 
-bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference< XStorage >& _rxStorage ) SAL_THROW(())
+bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference< XStorage >& _rxStorage )
 {
     bool bSuccess = false;
     try
@@ -1001,7 +1001,7 @@ oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
     return m_refCount;
 }
 
-void ODatabaseModelImpl::commitStorages() SAL_THROW(( IOException, RuntimeException ))
+void ODatabaseModelImpl::commitStorages()
 {
     getDocumentStorageAccess()->commitStorages();
 }
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index ffb139d1db42..bfe6b23d2b51 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -262,8 +262,7 @@ public:
     bool        commitEmbeddedStorage( bool _bPreventRootCommits = false );
 
     /// commits all sub storages
-    void commitStorages()
-            SAL_THROW(( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ));
+    void commitStorages();
 
     ODatabaseModelImpl(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
@@ -316,7 +315,7 @@ public:
     void    flushTables();
 
     // disposes all elements in m_aStorages, and clears it
-    void    disposeStorages() SAL_THROW(());
+    void    disposeStorages();
 
     /// creates a ->com::sun::star::embed::StorageFactory
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory >
@@ -328,8 +327,7 @@ public:
     /// commits a given storage if it's not readonly, ignoring (but asserting) all errors
     static  bool    commitStorageIfWriteable_ignoreErrors(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage
-            )
-            SAL_THROW(());
+            );
 
     void clearConnections();
 
diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx
index 689890385781..704acf358e84 100644
--- a/dbaccess/source/core/inc/sdbcoretools.hxx
+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
@@ -51,11 +51,7 @@ namespace dbaccess
             /// commits a given storage if it's not readonly
             bool    commitStorageIfWriteable(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage
-                    )
-                    SAL_THROW((
-                        ::com::sun::star::io::IOException,
-                        ::com::sun::star::lang::WrappedTargetException
-                ));
+                    );
         }
 
     }
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 7fb06c620238..67f76797bbe3 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -129,7 +129,7 @@ namespace dbaccess
         return ( nMode & ElementModes::WRITE ) != 0;
     }
 
-    bool commitStorageIfWriteable( const Reference< XStorage >& _rxStorage ) SAL_THROW(( IOException, WrappedTargetException, RuntimeException ))
+    bool commitStorageIfWriteable( const Reference< XStorage >& _rxStorage )
     {
         bool bSuccess = false;
         Reference< XTransactedObject > xTrans( _rxStorage, UNO_QUERY );
diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx
index 2809d7ae9d72..adb0f5eb5bdc 100644
--- a/dbaccess/source/ui/inc/indexcollection.hxx
+++ b/dbaccess/source/ui/inc/indexcollection.hxx
@@ -70,10 +70,10 @@ namespace dbaui
         Indexes::iterator insert(const OUString& _rName);
         // commit a new index, which is already part if the collection, but does not have an equivalent in the
         // data source, yet
-        void commitNewIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+        void commitNewIndex(const Indexes::iterator& _rPos);
 
         // reset the data for the given index
-        void resetIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+        void resetIndex(const Indexes::iterator& _rPos);
 
         // attach to a new key container
         void attach(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes);
@@ -86,14 +86,14 @@ namespace dbaui
         sal_Int32   size() const { return m_aIndexes.size(); }
 
         /// drop an index, and remove it from the collection
-        bool    drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+        bool    drop(const Indexes::iterator& _rPos);
         /// simply drop the index described by the name, but don't remove the descriptor from the collection
-        bool    dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+        bool    dropNoRemove(const Indexes::iterator& _rPos);
 
     protected:
         void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes);
-        void implFillIndexInfo(OIndex& _rIndex, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxDescriptor) SAL_THROW((::com::sun::star::uno::Exception));
-        void implFillIndexInfo(OIndex& _rIndex) SAL_THROW((::com::sun::star::uno::Exception));
+        void implFillIndexInfo(OIndex& _rIndex, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxDescriptor);
+        void implFillIndexInfo(OIndex& _rIndex);
     };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index a1c9b0cb9fac..7557d6cc16ad 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -121,7 +121,7 @@ namespace dbaui
         return aSearch;
     }
 
-    void OIndexCollection::commitNewIndex(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
+    void OIndexCollection::commitNewIndex(const Indexes::iterator& _rPos)
     {
         OSL_ENSURE(_rPos->isNew(), "OIndexCollection::commitNewIndex: index must be new!");
 
@@ -190,7 +190,7 @@ namespace dbaui
         }
     }
 
-    bool OIndexCollection::dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
+    bool OIndexCollection::dropNoRemove(const Indexes::iterator& _rPos)
     {
         try
         {
@@ -223,7 +223,7 @@ namespace dbaui
         return true;
     }
 
-    bool OIndexCollection::drop(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
+    bool OIndexCollection::drop(const Indexes::iterator& _rPos)
     {
         OSL_ENSURE((_rPos >= m_aIndexes.begin()) && (_rPos < m_aIndexes.end()),
             "OIndexCollection::drop: invalid position (fasten your seatbelt .... this will crash)!");
@@ -237,7 +237,7 @@ namespace dbaui
         return true;
     }
 
-    void OIndexCollection::implFillIndexInfo(OIndex& _rIndex) SAL_THROW((Exception))
+    void OIndexCollection::implFillIndexInfo(OIndex& _rIndex)
     {
         // get the UNO descriptor for the index
         Reference< XPropertySet > xIndex;
@@ -250,7 +250,7 @@ namespace dbaui
             implFillIndexInfo(_rIndex, xIndex);
     }
 
-    void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception))
+    void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor)
     {
         static const OUString s_sPrimaryIndexPropertyName = "IsPrimaryKeyIndex";
         static const OUString s_sUniquePropertyName = "IsUnique";
@@ -299,7 +299,7 @@ namespace dbaui
         }
     }
 
-    void OIndexCollection::resetIndex(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
+    void OIndexCollection::resetIndex(const Indexes::iterator& _rPos)
     {
         OSL_ENSURE(_rPos >= m_aIndexes.begin() && _rPos < m_aIndexes.end(),
             "OIndexCollection::resetIndex: invalid position!");