connectivity/source/drivers/mork/MConnection.cxx | 26 +++++------ connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 16 +++--- connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx | 12 ++--- connectivity/source/drivers/mork/MDriver.cxx | 6 +- 4 files changed, 30 insertions(+), 30 deletions(-)
New commits: commit 4bd7e5f48ab9c463ffe0aba423a2156d84c9fa6d Author: David Ostrovsky <da...@ostrovsky.org> Date: Tue Jul 31 09:17:16 2012 +0200 mork driver: fixed SAL_LOG typo Change-Id: I7761832978da95606c0f4d1fcfc51d3a9eee15df diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 3f4d245..a406734 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -72,7 +72,7 @@ void SAL_CALL OConnection::release() throw() void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { (void) info; // avoid warnings - SAL_INFO("connectvity.mork", "=> OConnection::construct()" ); + SAL_INFO("connectivity.mork", "=> OConnection::construct()" ); // open file setURL(url); // @@ -106,8 +106,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV sAdditionalInfo = aAddrbookURI.copy( nLen + 1 ); } - SAL_INFO("connectvity.mork", "URI = " << aAddrbookURI ); - SAL_INFO("connectvity.mork", "Scheme = " << aAddrbookScheme ); + SAL_INFO("connectivity.mork", "URI = " << aAddrbookURI ); + SAL_INFO("connectivity.mork", "Scheme = " << aAddrbookScheme ); ::rtl::OUString defaultProfile = m_pProfileAccess->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird); SAL_INFO("connectivity.mork", "DefaultProfile: " << defaultProfile); @@ -149,7 +149,7 @@ IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mork.OConnection" // -------------------------------------------------------------------------------- Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException) { - SAL_INFO("connectvity.mork", "=> OConnection::createStatement()" ); + SAL_INFO("connectivity.mork", "=> OConnection::createStatement()" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -163,34 +163,34 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep // -------------------------------------------------------------------------------- Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) { - SAL_INFO("connectvity.mork", "=> OConnection::prepareStatement()" ); + SAL_INFO("connectivity.mork", "=> OConnection::prepareStatement()" ); OSL_UNUSED( _sSql ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - SAL_INFO("connectvity.mork", "OConnection::prepareStatement( " << _sSql << " )"); + SAL_INFO("connectivity.mork", "OConnection::prepareStatement( " << _sSql << " )"); return NULL; } // -------------------------------------------------------------------------------- Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) { - SAL_INFO("connectvity.mork", "=> OConnection::prepareCall()" ); - SAL_INFO("connectvity.mork", "sql: " << _sSql); + SAL_INFO("connectivity.mork", "=> OConnection::prepareCall()" ); + SAL_INFO("connectivity.mork", "sql: " << _sSql); OSL_UNUSED( _sSql ); ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); - SAL_INFO("connectvity.mork", "OConnection::prepareCall( " << _sSql << " )"); + SAL_INFO("connectivity.mork", "OConnection::prepareCall( " << _sSql << " )"); return NULL; } // -------------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) { - SAL_INFO("connectvity.mork", "=> OConnection::nativeSQL()" ); - SAL_INFO("connectvity.mork", "sql: " << _sSql); + SAL_INFO("connectivity.mork", "=> OConnection::nativeSQL()" ); + SAL_INFO("connectivity.mork", "sql: " << _sSql); ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here - SAL_INFO("connectvity.mork", "OConnection::nativeSQL(" << _sSql << " )" ); + SAL_INFO("connectivity.mork", "OConnection::nativeSQL(" << _sSql << " )" ); return _sSql; } @@ -228,7 +228,7 @@ sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException // -------------------------------------------------------------------------------- Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) { - SAL_INFO("connectvity.mork", "=> OConnection::getMetaData()" ); + SAL_INFO("connectivity.mork", "=> OConnection::getMetaData()" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 61748e2..afa538a 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -71,9 +71,9 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException) { - SAL_INFO("connectvity.mork", "=> ODatabaseMetaData::getColumnRows()" ); - SAL_INFO("connectvity.mork", "tableNamePattern: " << tableNamePattern); - SAL_INFO("connectvity.mork", "columnNamePattern: " << columnNamePattern); + SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getColumnRows()" ); + SAL_INFO("connectivity.mork", "tableNamePattern: " << tableNamePattern); + SAL_INFO("connectivity.mork", "columnNamePattern: " << columnNamePattern); static ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); @@ -131,7 +131,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // TABLE_NAME aRow[3] = new ORowSetValueDecorator( tables[j] ); - SAL_INFO("connectvity.mork", "\tTableName = : " << tables[j]); + SAL_INFO("connectivity.mork", "\tTableName = : " << tables[j]); #if 0 // Iterate over all collumns in the table. @@ -151,7 +151,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( } } #endif - SAL_INFO("connectvity.mork", "\tTableName = : " << tables[j]); + SAL_INFO("connectivity.mork", "\tTableName = : " << tables[j]); std::string name = "name"; OUString ouName(name.c_str(), name.length(), RTL_TEXTENCODING_UTF8); // COLUMN_NAME @@ -949,7 +949,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& /*types*/ ) throw(SQLException, RuntimeException) { - SAL_INFO("connectvity.mork", "=> ODatabaseMetaData::getTables()" ); + SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTables()" ); // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables); @@ -974,7 +974,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) { - SAL_INFO("connectvity.mork", "=> ODatabaseMetaData::getTablePrivileges()" ); + SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTablePrivileges()" ); ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); Reference< XResultSet > xRef = NULL; @@ -1008,7 +1008,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( // TABLE_NAME aRow[2] = new ORowSetValueDecorator( tables[j] ); - SAL_INFO("connectvity.mork", "\tTableName = : " << tables[j]); + SAL_INFO("connectivity.mork", "\tTableName = : " << tables[j]); aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue(); aRows.push_back(aRow); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx index 839cee2..8e59cc5 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx @@ -36,7 +36,7 @@ using namespace connectivity::mork; // ------------------------------------------------------------------------- MDatabaseMetaDataHelper::MDatabaseMetaDataHelper() { - SAL_INFO("connectvity.mork", "=> MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" ); + SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" ); } // ------------------------------------------------------------------------- @@ -50,7 +50,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* ::rtl::OUString sAbURI; ::rtl::OString sAbURIString; - SAL_INFO("connectvity.mork", "=> MDatabaseMetaDataHelper::getTableStrings()"); + SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::getTableStrings()"); _pCon->getMorkParser(); // TODO: retrieve Tables from MorkParser // only put for now the private adress book @@ -64,11 +64,11 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ODatabaseMetaDataResultSet::ORows& _rRows) { - SAL_INFO("connectvity.mork", "=> MDatabaseMetaDataHelper::getTables()"); + SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::getTables()"); static ODatabaseMetaDataResultSet::ORows aRows; - SAL_INFO("connectvity.mork", "=> MDatabaseMetaDataHelper::getTables()" ); + SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::getTables()" ); ::osl::MutexGuard aGuard( m_aMetaMutex ); ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well @@ -86,7 +86,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ::rtl::OUString aTableName = tables[i]; //::rtl::OUString aTableType = tabletypes[i]; - SAL_INFO("connectvity.mork", "TableName: " << aTableName ); + SAL_INFO("connectivity.mork", "TableName: " << aTableName ); // return tables to caller @@ -101,7 +101,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, aTableName = rtl::OUString::createFromAscii("AddressBook"); } - SAL_INFO("connectvity.mork", "TableName: " << aTableName); + SAL_INFO("connectivity.mork", "TableName: " << aTableName); aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // Table name // aRow.push_back( new ORowSetValueDecorator( aTableType ) ); // Table type diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 3301c27..d91d624 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -27,7 +27,7 @@ namespace connectivity MorkDriver::MorkDriver(css::uno::Reference< css::uno::XComponentContext > const context): context_(context) { - SAL_INFO("connectvity.mork", "=> MorkDriver::MorkDriver()" ); + SAL_INFO("connectivity.mork", "=> MorkDriver::MorkDriver()" ); m_ProfileAccess = new ProfileAccess(); assert(context.is()); } @@ -76,7 +76,7 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( css::uno::Sequence< css::beans::PropertyValue > const & info) throw (css::sdbc::SQLException, css::uno::RuntimeException) { - SAL_INFO("connectvity.mork", "=> MorkDriver::connect()" ); + SAL_INFO("connectivity.mork", "=> MorkDriver::connect()" ); (void) url; (void) info; // avoid warnings css::uno::Reference< css::sdbc::XConnection > xCon; @@ -89,7 +89,7 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( sal_Bool MorkDriver::acceptsURL(rtl::OUString const & url) throw (css::sdbc::SQLException, css::uno::RuntimeException) { - SAL_INFO("connectvity.mork", "=> MorkDriver::acceptsURL()" ); + SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" ); //... TODO (void) url; // avoid warnings _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits