User: hr      
Date: 06/06/19 18:12:49

Modified:
 /dba/connectivity/source/drivers/ado/
  ADatabaseMetaData.cxx

Log:
 INTEGRATION: CWS warnings01 (1.18.20); FILE MERGED
 2006/01/25 20:48:04 sb 1.18.20.2: RESYNC: (1.18-1.19); FILE MERGED
 2005/12/22 11:44:33 fs 1.18.20.1: #i57457# warning-free code

File Changes:

Directory: /dba/connectivity/source/drivers/ado/
================================================

File [changed]: ADatabaseMetaData.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ADatabaseMetaData.cxx?r1=1.19&r2=1.20
Delta lines:  +53 -53
---------------------
--- ADatabaseMetaData.cxx       21 Dec 2005 13:14:47 -0000      1.19
+++ ADatabaseMetaData.cxx       20 Jun 2006 01:12:47 -0000      1.20
@@ -62,6 +62,9 @@
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>
 #endif
+#ifndef _DBHELPER_DBEXCEPTION_HXX_
+#include <connectivity/dbexception.hxx>
+#endif
 
 using namespace ::comphelper;
 
@@ -250,7 +253,7 @@
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( 
-       const Any& catalog, const ::rtl::OUString& schema, const 
::rtl::OUString& table ) throw(SQLException, RuntimeException)
+       const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const 
::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     Reference< XResultSet > xRef;
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new 
::connectivity::ODatabaseMetaDataResultSet();
@@ -381,8 +384,8 @@
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( 
-       const Any& catalog, const ::rtl::OUString& schema, const 
::rtl::OUString& table, sal_Int32 scope, 
-       sal_Bool nullable ) throw(SQLException, RuntimeException)
+       const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const 
::rtl::OUString& /*table*/, sal_Int32 /*scope*/,
+       sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException)
 {
        Reference< XResultSet > xRef;
 
@@ -758,7 +761,7 @@
        return isCapable(DBLITERAL_CORRELATION_NAME);
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, 
sal_Int32 toType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, 
sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
        return getBoolProperty(::rtl::OUString::createFromAscii("Rowset 
Conversions on Command"));
 }
@@ -1077,12 +1080,12 @@
        return getMaxSize(DBLITERAL_USER_NAME);
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType 
) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 
/*setType*/ ) throw(SQLException, RuntimeException)
 {
        return sal_True;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 
setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 
/*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException)
 {
        return sal_True;
 }
@@ -1137,13 +1140,10 @@
        return sal_True;
 }
 // -------------------------------------------------------------------------
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& 
catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& 
typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, 
RuntimeException)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& 
/*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& 
/*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) 
throw(SQLException, RuntimeException)
 {
-       Reference< XResultSet > xRef;
-       
-       ODatabaseMetaDataResultSet* pResult = new 
ODatabaseMetaDataResultSet(NULL);
-       xRef = pResult;
-       return xRef;
+    ::dbtools::throwFeatureNotImplementedException( 
"XDatabaseMetaData::getUDTs", *this );
+    return Reference< XResultSet >();
 }
 // -------------------------------------------------------------------------
 Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection(  ) 
throw(SQLException, RuntimeException)




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to