INTEGRATION: CWS dba23 (1.7.26); FILE MERGED

2005/01/17 14:58:05 fs 1.7.26.1: #i40463# calcConnection superseded by connectRowset, which now also throws a WrappedTargetException

connectivity/source/simpledbt/staticdbtools_s.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: staticdbtools_s.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: pjunck $ $Date: 2004-10-22 11:32:24 $
+ *  last change: $Author: vg $ $Date: 2005-02-17 10:16:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,18 +143,11 @@ namespace connectivity
 
     //----------------------------------------------------------------
     Reference< XConnection> ODataAccessStaticTools::connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory, sal_Bool _bSetAsActiveConnection) const
-        SAL_THROW ( (SQLException, RuntimeException) )
+        SAL_THROW ( (SQLException, WrappedTargetException, RuntimeException) )
     {
         return ::dbtools::connectRowset( _rxRowSet, _rxFactory, _bSetAsActiveConnection);
     }
 
-    //----------------------------------------------------------------
-    Reference< XConnection> ODataAccessStaticTools::calcConnection(const Reference< XRowSet>& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory) const
-        SAL_THROW ( (SQLException, RuntimeException) )
-    {
-        return ::dbtools::calcConnection(_rxRowSet, _rxFactory);
-    }
-
     // ------------------------------------------------
     Reference< XConnection> ODataAccessStaticTools::getRowSetConnection(
                 const Reference< XRowSet>& _rxRowSet)

connectivity/source/simpledbt/staticdbtools_s.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: staticdbtools_s.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: pjunck $ $Date: 2004-10-22 11:32:39 $
+ *  last change: $Author: vg $ $Date: 2005-02-17 10:16:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,18 +120,14 @@ namespace connectivity
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
         ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) );
 
-        // ------------------------------------------------
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> calcConnection(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
-        ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) );
-
         // ------------------------------------------------
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
             sal_Bool _bSetAsActiveConnection
-        ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) );
+        ) const SAL_THROW ( ( ::com::sun::star::sdbc::SQLException
+                            , ::com::sun::star::lang::WrappedTargetException
+                            , ::com::sun::star::uno::RuntimeException ) );
 
         // ------------------------------------------------
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(