Cleanup SAL_INFO debugging output.

Change-Id: I7d9a94e42da24557a986a0613bcfcbf1234b952d

connectivity/source/drivers/firebird/FConnection.cxx

@@ -103,14 +103,14 @@ OConnection::OConnection(FirebirdDriver*    _pDriver)
                          m_DBHandler(0),
                          m_transactionHandle(0)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::OConnection().");
+    SAL_INFO("connectivity.firebird", "OConnection().");
 
     m_pDriver->acquire();
 }
 
 OConnection::~OConnection()
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::~OConnection().");
+    SAL_INFO("connectivity.firebird", "~OConnection().");
 
     if(!isClosed())
         close();
@@ -120,7 +120,7 @@ OConnection::~OConnection()
 
 void SAL_CALL OConnection::release() throw()
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::release().");
+    SAL_INFO("connectivity.firebird", "release().");
 
     relase_ChildImpl();
 }
@@ -146,7 +146,7 @@ static int pr_error(const ISC_STATUS* status, const char* operation)
 void OConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info)
     throw(SQLException)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::construct().");
+    SAL_INFO("connectivity.firebird", "construct().");
 
     osl_atomic_increment( &m_refCount );
 
@@ -289,7 +289,7 @@ IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.firebird.OConnect
 Reference< XStatement > SAL_CALL OConnection::createStatement( )
                                         throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::createStatement().");
+    SAL_INFO("connectivity.firebird", "createStatement().");
 
     MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -298,7 +298,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( )
     if(m_aTypeInfo.empty())
         buildTypeInfo();
 
-    SAL_INFO("connectivity.firebird", "=> OConnection::createStatement(). "
+    SAL_INFO("connectivity.firebird", "createStatement(). "
              "Creating statement.");
 
     // create a statement
@@ -311,7 +311,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( )
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(
             const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::prepareStatement(). "
+    SAL_INFO("connectivity.firebird", "prepareStatement(). "
              "Got called with sql: " << _sSql);
 
     MutexGuard aGuard( m_aMutex );
@@ -321,7 +321,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(
     if(m_aTypeInfo.empty())
         buildTypeInfo();
 
-    SAL_INFO("connectivity.firebird", "=> OConnection::prepareStatement(). "
+    SAL_INFO("connectivity.firebird", "prepareStatement(). "
              "Creating prepared statement.");
 
     // create a statement
@@ -331,7 +331,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(
                                                                      _sSql);
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
 
-    SAL_INFO("connectivity.firebird", "=> OConnection::prepareStatement(). "
+    SAL_INFO("connectivity.firebird", "prepareStatement(). "
              "Prepared Statement created.");
 
     return xReturn;
@@ -340,7 +340,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(
                 const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::prepareCall(). "
+    SAL_INFO("connectivity.firebird", "prepareCall(). "
              "_sSql: " << _sSql);
 
     MutexGuard aGuard( m_aMutex );
@@ -473,7 +473,7 @@ sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException
 // --------------------------------------------------------------------------------
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::getMetaData().");
+    SAL_INFO("connectivity.firebird", "getMetaData().");
 
     MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -554,7 +554,7 @@ void SAL_CALL OConnection::setTypeMap(const Reference< XNameAccess >& typeMap)
 //----- XCloseable -----------------------------------------------------------
 void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::close().");
+    SAL_INFO("connectivity.firebird", "close().");
 
     // we just dispose us
     {
@@ -611,7 +611,7 @@ void SAL_CALL OConnection::disposing( const EventObject& Source ) throw (Runtime
 //--------------------------------------------------------------------
 void OConnection::buildTypeInfo() throw( SQLException)
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::buildTypeInfo().");
+    SAL_INFO("connectivity.firebird", "buildTypeInfo().");
 
     MutexGuard aGuard( m_aMutex );
 
@@ -650,7 +650,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
         m_aTypeInfo.push_back(aInfo);
     }
 
-    SAL_INFO("connectivity.firebird", "=> OConnection::buildTypeInfo(). "
+    SAL_INFO("connectivity.firebird", "buildTypeInfo(). "
              "Type info built.");
 
     // Close the result set/statement.
@@ -658,13 +658,13 @@ void OConnection::buildTypeInfo() throw( SQLException)
     Reference< XCloseable> xClose(xRs,UNO_QUERY);
     xClose->close();
 
-    SAL_INFO("connectivity.firebird", "=> OConnection::buildTypeInfo(). "
+    SAL_INFO("connectivity.firebird", "buildTypeInfo(). "
              "Closed.");
 }
 //------------------------------------------------------------------------------
 void OConnection::disposing()
 {
-    SAL_INFO("connectivity.firebird", "=> OConnection::disposing().");
+    SAL_INFO("connectivity.firebird", "disposing().");
 
     // we noticed that we should be destroied in near future so we have to dispose our statements
     MutexGuard aGuard(m_aMutex);

connectivity/source/drivers/firebird/FDatabaseMetaData.cxx

@@ -788,7 +788,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> ODatabaseMetaData::getTypeInfo().");
+    SAL_INFO("connectivity.firebird", "getTypeInfo().");
 
     // this returns an empty resultset where the column-names are already set
     // in special the metadata of the resultset already returns the right columns
@@ -861,7 +861,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 {
     (void) catalog;
     (void) types;
-    SAL_INFO("connectivity.firebird", "=> ODatabaseMetaData::getTables(). "
+    SAL_INFO("connectivity.firebird", "getTables(). "
              "Got called with schemaPattern: " << schemaPattern << " , "
              "TableNamePattern: " << tableNamePattern);
 
@@ -893,7 +893,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
         query = query.replaceAll(wld, tableNamePattern);
     }
 
-    SAL_INFO("connectivity.firebird", "=> ODatabaseMetaData::getTables(). "
+    SAL_INFO("connectivity.firebird", "getTables(). "
              "About to execute the query.");
 
     Reference< XResultSet > rs = statement->executeQuery(query.getStr());

connectivity/source/drivers/firebird/FDriver.cxx

@@ -59,7 +59,7 @@ namespace connectivity
         Reference< XInterface >  SAL_CALL FirebirdDriver_CreateInstance(
             const Reference< XMultiServiceFactory >& _rxFactory) throw( Exception )
         {
-            SAL_INFO("connectivity.firebird", "=> ODriver_BASE::FirebirdDriver_CreateInstance()" );
+            SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" );
             (void) _rxFactory;
             return *(new FirebirdDriver());
         }
@@ -131,7 +131,7 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect(
 {
     Reference< XConnection > xConnection;
 
-    SAL_INFO("connectivity.firebird", "=> ODriver_BASE::connect(), URL: " << url );
+    SAL_INFO("connectivity.firebird", "connect(), URL: " << url );
 
     MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)

connectivity/source/drivers/firebird/FPreparedStatement.cxx

@@ -71,7 +71,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,
     ,m_sSqlStatement(sql)
     ,m_bPrepared(sal_False)
 {
-    SAL_INFO("connectivity.firebird", "=> OPreparedStatement::OPreparedStatement_BASE(). "
+    SAL_INFO("connectivity.firebird", "OPreparedStatement_BASE(). "
              "sql: " << sql);
 
 //     prepareQuery(m_sSqlStatement);
@@ -120,7 +120,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
 
 void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OPreparedStatement::close()");
+    SAL_INFO("connectivity.firebird", "close()");
 
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -164,7 +164,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
 
 void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OPreparedStatement::setString(). "
+    SAL_INFO("connectivity.firebird", "setString(). "
              "parameterIndex: " << parameterIndex << " , "
              "x: " << x);
 
@@ -173,13 +173,13 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::r
 
     if (NULL == m_INsqlda)
     {
-        SAL_WARN("connectivity.firebird", "=> OPreparedStatement::setString(). "
+        SAL_WARN("connectivity.firebird", "setString(). "
                  "The query has not input parameters.");
         return;
     }
 
     OString str = OUStringToOString(x , RTL_TEXTENCODING_UTF8 );
-    SAL_INFO("connectivity.firebird", "=> OPreparedStatement::setString(). "
+    SAL_INFO("connectivity.firebird", "setString(). "
              "Setting parameter as: " << str);
 
     XSQLVAR *var = m_INsqlda->sqlvar + (parameterIndex - 1);
@@ -212,7 +212,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OPreparedStatement::executeQuery(). "
+    SAL_INFO("connectivity.firebird", "executeQuery(). "
              "Got called with sql: " <<  m_sSqlStatement);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -229,7 +229,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
     //initializeResultSet( pResult.get() );
     Reference< XResultSet > xRS = pResult.get();
 
-    SAL_INFO("connectivity.firebird", "=> OPreparedStatement::executeQuery(). "
+    SAL_INFO("connectivity.firebird", "executeQuery(). "
              "Query executed.");
 
     return xRS;

connectivity/source/drivers/firebird/FResultSet.cxx

@@ -78,7 +78,7 @@ OResultSet::OResultSet(const uno::Reference< XStatement >& xStatement,
     , m_rowCount(0)
     , m_fieldCount(pSqlda? pSqlda->sqld : 0)
 {
-    SAL_INFO("connectivity.firebird", "=> OResultSet::OResultSet().");
+    SAL_INFO("connectivity.firebird", "OResultSet().");
 
     if (!pSqlda)
         return; // TODO: what?
@@ -366,7 +366,7 @@ void SAL_CALL OResultSet::checkRowIndex(sal_Bool mustBeOnValidRow)
 // -------------------------------------------------------------------------
 void OResultSet::disposing(void)
 {
-    SAL_INFO("connectivity.firebird", "=> OResultSet::disposing().");
+    SAL_INFO("connectivity.firebird", "disposing().");
 
     OPropertySetHelper::disposing();
 
@@ -666,7 +666,7 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLExc
 
 void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OResultSet::close().");
+    SAL_INFO("connectivity.firebird", "close().");
 
     {
         MutexGuard aGuard( m_aMutex );

connectivity/source/drivers/firebird/FStatement.cxx

@@ -100,7 +100,7 @@ void OStatement_Base::disposeResultSet()
 
 void OStatement_BASE2::disposing()
 {
-    SAL_INFO("connectivity.firebird", "=> OStatement_BASE2::disposing().");
+    SAL_INFO("connectivity.firebird", "disposing().");
 
     MutexGuard aGuard(m_aMutex);
 
@@ -163,7 +163,7 @@ void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 
 void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OStatement_Base::close().");
+    SAL_INFO("connectivity.firebird", "close().");
 
     {
         MutexGuard aGuard( m_aMutex );
@@ -212,7 +212,7 @@ OUString OStatement_Base::sanitizeSqlString(const OUString& sqlIn)
 {
     // TODO: verify this is all we need.
     static const sal_Unicode pattern('"');
-    static const sal_Unicode empty(' ');
+    static const sal_Unicode empty('\'');
     return sqlIn.replace(pattern, empty);
 }
 
@@ -387,7 +387,7 @@ uno::Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery(const OUStri
 
 sal_Bool SAL_CALL OStatement_Base::execute(const OUString& sql) throw(SQLException, RuntimeException)
 {
-    SAL_INFO("connectivity.firebird", "=> OStatement_Base::executeQuery(). "
+    SAL_INFO("connectivity.firebird", "executeQuery(). "
              "Got called with sql: " << sql);
 
     MutexGuard aGuard( m_aMutex );