refactor out some com::sun::star typedefs

which mostly serve to make the code harder to read

Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8

3 files changed, 160 insertions, 168 deletions

diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 511e9013056f..b9dc1321a0dc 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -59,10 +59,7 @@ namespace connectivity
         using ::com::sun::star::sdbc::SQLWarning;
         using ::com::sun::star::sdbc::SQLException;
         using ::com::sun::star::uno::RuntimeException;
-        typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > my_XStatementRef;
-        typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > my_XPreparedStatementRef;
         typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef;
-        typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef;
 
         typedef ::cppu::WeakComponentImplHelper3<   ::com::sun::star::sdbc::XConnection,
                                                     ::com::sun::star::sdbc::XWarningsSupplier,
@@ -152,13 +149,13 @@ namespace connectivity
                 SAL_OVERRIDE;
 
             // XConnection
-            my_XStatementRef SAL_CALL createStatement()
+            css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement()
                                                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
 
-            my_XPreparedStatementRef SAL_CALL prepareStatement(const rtl::OUString& sql)
+            css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement(const rtl::OUString& sql)
                                                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
 
-            my_XPreparedStatementRef SAL_CALL prepareCall(const rtl::OUString& sql)
+            css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall(const rtl::OUString& sql)
                                                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
 
             rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql)
@@ -179,7 +176,7 @@ namespace connectivity
             sal_Bool SAL_CALL isClosed()
                                                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
 
-            my_XDatabaseMetaDataRef SAL_CALL getMetaData()
+            css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData()
                                                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
 
             void SAL_CALL setReadOnly(sal_Bool readOnly)
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 3dd311f275d4..a7a6bd83e09e 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -31,9 +31,6 @@ namespace connectivity
 {
     namespace mysqlc
     {
-        typedef ::com::sun::star::sdbc::SQLException my_SQLException;
-        typedef ::com::sun::star::uno::RuntimeException my_RuntimeException;
-        typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > my_XResultSetRef;
         using ::com::sun::star::uno::Any;
 
 
@@ -45,11 +42,11 @@ namespace connectivity
         class ODatabaseMetaData : public ODatabaseMetaData_BASE
         {
             OConnection&    m_rConnection;
-            bool        m_bUseCatalog;
+            bool            m_bUseCatalog;
         protected:
             sql::DatabaseMetaData * meta;
-            rtl::OUString        identifier_quote_string;
-            bool            identifier_quote_string_set;
+            rtl::OUString           identifier_quote_string;
+            bool                    identifier_quote_string_set;
 
         private:
             rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() );
@@ -69,158 +66,158 @@ namespace connectivity
 
             // as I mentioned before this interface is really BIG
             // XDatabaseMetaData
-            sal_Bool SAL_CALL allProceduresAreCallable()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL allTablesAreSelectable()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getURL()                      throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getUserName()                 throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isReadOnly()                          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedHigh()                  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedLow()                   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedAtStart()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedAtEnd()                 throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDatabaseProductName()      throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDatabaseProductVersion()   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDriverName()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDriverVersion()                throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getDriverMajorVersion()              throw(my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getDriverMinorVersion()              throw(my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL usesLocalFiles()                      throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL usesLocalFilePerTable()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMixedCaseIdentifiers()        throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesUpperCaseIdentifiers()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesLowerCaseIdentifiers()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesMixedCaseIdentifiers()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers()  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers()    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers()    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers()    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getIdentifierQuoteString()    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSQLKeywords()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getNumericFunctions()         throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getStringFunctions()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSystemFunctions()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getTimeDateFunctions()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSearchStringEscape()       throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getExtraNameCharacters()      throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsAlterTableWithAddColumn()     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsAlterTableWithDropColumn()    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsColumnAliasing()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullPlusNonNullIsNull()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsTypeConversion()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL allProceduresAreCallable()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL allTablesAreSelectable()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getURL()                      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getUserName()                 throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isReadOnly()                          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedHigh()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedLow()                   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedAtStart()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedAtEnd()                 throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDatabaseProductName()      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDatabaseProductVersion()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDriverName()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDriverVersion()                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getDriverMajorVersion()              throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getDriverMinorVersion()              throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL usesLocalFiles()                      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL usesLocalFilePerTable()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMixedCaseIdentifiers()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesUpperCaseIdentifiers()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesLowerCaseIdentifiers()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesMixedCaseIdentifiers()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getIdentifierQuoteString()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSQLKeywords()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getNumericFunctions()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getStringFunctions()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSystemFunctions()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getTimeDateFunctions()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSearchStringEscape()       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getExtraNameCharacters()      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsAlterTableWithAddColumn()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsAlterTableWithDropColumn()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsColumnAliasing()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullPlusNonNullIsNull()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsTypeConversion()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
             sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType)
-                                                                    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsTableCorrelationNames()       throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsExpressionsInOrderBy()        throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOrderByUnrelated()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsGroupBy()                     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsGroupByUnrelated()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsGroupByBeyondSelect()         throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsLikeEscapeClause()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMultipleResultSets()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMultipleTransactions()        throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsNonNullableColumns()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMinimumSQLGrammar()           throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCoreSQLGrammar()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsExtendedSQLGrammar()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsANSI92EntryLevelSQL()         throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsANSI92IntermediateSQL()       throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsANSI92FullSQL()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOuterJoins()                  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsFullOuterJoins()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsLimitedOuterJoins()           throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSchemaTerm()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getProcedureTerm()                throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getCatalogTerm()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isCatalogAtStart()                    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getCatalogSeparator()         throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInDataManipulation()   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInProcedureCalls()     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInTableDefinitions()   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInIndexDefinitions()   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInDataManipulation()  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInProcedureCalls()    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInTableDefinitions()  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions()  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsPositionedDelete()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsPositionedUpdate()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSelectForUpdate()             throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsStoredProcedures()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInComparisons()     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInExists()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInIns()             throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInQuantifieds()     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCorrelatedSubqueries()        throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsUnion()                       throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsUnionAll()                    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit()     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback()   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit()  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxBinaryLiteralLength()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxCharLiteralLength()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnNameLength()             throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInGroupBy()             throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInIndex()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInOrderBy()             throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInSelect()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInTable()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxConnections()                  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxCursorNameLength()             throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxIndexLength()                  throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxSchemaNameLength()             throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxProcedureNameLength()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxCatalogNameLength()            throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxRowSize()                      throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs()          throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxStatementLength()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxStatements()                   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxTableNameLength()              throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxTablesInSelect()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxUserNameLength()               throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getDefaultTransactionIsolation()     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsTransactions()                throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
+                                                                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsTableCorrelationNames()       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsExpressionsInOrderBy()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOrderByUnrelated()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsGroupBy()                     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsGroupByUnrelated()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsGroupByBeyondSelect()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsLikeEscapeClause()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMultipleResultSets()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMultipleTransactions()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsNonNullableColumns()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMinimumSQLGrammar()           throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCoreSQLGrammar()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsExtendedSQLGrammar()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsANSI92EntryLevelSQL()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsANSI92IntermediateSQL()       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsANSI92FullSQL()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOuterJoins()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsFullOuterJoins()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsLimitedOuterJoins()           throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSchemaTerm()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getProcedureTerm()                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getCatalogTerm()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isCatalogAtStart()                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getCatalogSeparator()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInDataManipulation()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInProcedureCalls()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInTableDefinitions()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInIndexDefinitions()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInDataManipulation()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInProcedureCalls()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInTableDefinitions()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsPositionedDelete()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsPositionedUpdate()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSelectForUpdate()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsStoredProcedures()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInComparisons()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInExists()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInIns()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInQuantifieds()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCorrelatedSubqueries()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsUnion()                       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsUnionAll()                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxBinaryLiteralLength()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxCharLiteralLength()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnNameLength()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInGroupBy()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInIndex()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInOrderBy()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInSelect()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInTable()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxConnections()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxCursorNameLength()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxIndexLength()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxSchemaNameLength()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxProcedureNameLength()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxCatalogNameLength()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxRowSize()                      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxStatementLength()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxStatements()                   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxTableNameLength()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxTablesInSelect()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxUserNameLength()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getDefaultTransactionIsolation()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsTransactions()                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
             sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level)
-                                                                    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
+                                                                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
             sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions()
-                                                                    throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit()   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions()     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< rtl::OUString >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getSchemas() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getCatalogs() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getTableTypes() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getTypeInfo() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType)   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType)   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType)   throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType)     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType)     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType)     throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsBatchUpdates() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XResultSetRef SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
+                                                                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< rtl::OUString >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType)   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType)   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType)   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType)     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType)     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType)     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsBatchUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         };
     }
 }
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index 003ca0331b46..d6eb0539d054 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -46,8 +46,6 @@ namespace connectivity
         using ::com::sun::star::sdbc::SQLException;
         using ::com::sun::star::uno::RuntimeException;
         using ::com::sun::star::uno::Any;
-        typedef ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > my_XInputStreamRef;
-        typedef my_XNameAccessRef my_XNameAccessRef;
 
         /*
         **  OResultSet
@@ -179,9 +177,9 @@ namespace connectivity
             ::com::sun::star::util::DateTime SAL_CALL getTimestamp(sal_Int32 column)
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
 
-            my_XInputStreamRef SAL_CALL getBinaryStream(sal_Int32 column)
+            css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 column)
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            my_XInputStreamRef SAL_CALL getCharacterStream(sal_Int32 column)
+            css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 column)
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
 
             Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap)
@@ -238,9 +236,9 @@ namespace connectivity
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
             void SAL_CALL updateTimestamp(sal_Int32 column, const ::com::sun::star::util::DateTime& x)
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateBinaryStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length)
+            void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length)
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateCharacterStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length)
+            void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length)
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
             void SAL_CALL updateObject(sal_Int32 column, const Any& x)
                                                                         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;