OSL_TRACE: Remove trailing newlines

Done with perl regex:
s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs;

- removed trailing whitespaces and (multiple) newlines

14 files changed, 120 insertions, 120 deletions

diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index 2db5bc8505f5..be020f49bf7a 100644
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -521,7 +521,7 @@ void ONDXPage::PrintPage()
             OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), (const char* )ByteString(rKey.getValue().getString().getStr(), rIndex.m_pTable->getConnection()->getTextEncoding()).GetBuffer(),rNode.GetChild().GetPagePos());
         }
     }
-    OSL_TRACE("SDB: -----------------------------------------------\n");
+    OSL_TRACE("SDB: -----------------------------------------------");
     if (!IsLeaf())
     {
 #if OSL_DEBUG_LEVEL > 1
@@ -533,7 +533,7 @@ void ONDXPage::PrintPage()
         }
 #endif
     }
-    OSL_TRACE("SDB: ===============================================\n");
+    OSL_TRACE("SDB: ===============================================");
 }
 #endif
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 1844e2708d87..83026f7d8a72 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -919,7 +919,7 @@ void ONDXPage::PrintPage()
             OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), (const char* )ByteString(rKey.getValue().getString().getStr(), rIndex.m_pTable->getConnection()->getTextEncoding()).GetBuffer(),rNode.GetChild().GetPagePos());
         }
     }
-    OSL_TRACE("SDB: -----------------------------------------------\n");
+    OSL_TRACE("SDB: -----------------------------------------------");
     if (!IsLeaf())
     {
 #if OSL_DEBUG_LEVEL > 1
@@ -931,7 +931,7 @@ void ONDXPage::PrintPage()
         }
 #endif
     }
-    OSL_TRACE("SDB: ===============================================\n");
+    OSL_TRACE("SDB: ===============================================");
 }
 #endif
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 30773e4ea665..c0d9ee3e698e 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -399,7 +399,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
                ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_NAME ) ||
                ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_STRING ) ) )
         {
-            OSL_TRACE( "analyseSQL : pAtom->count() = %d\n", pAtom->count() );
+            OSL_TRACE( "analyseSQL : pAtom->count() = %d", pAtom->count() );
             m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,*this);
         }
 
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 943bb7cc774e..f0d35bc1f032 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -151,7 +151,7 @@ void SAL_CALL OConnection::release() throw()
 //-----------------------------------------------------------------------------
 void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
-    OSL_TRACE("IN OConnection::construct()\n" );
+    OSL_TRACE("IN OConnection::construct()" );
     //  open file
     setURL(url);
     //
@@ -175,7 +175,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
         }
         else
         {
-            OSL_TRACE( "No subschema given!!!\n");
+            OSL_TRACE( "No subschema given!!!");
             throwSQLException( STR_URI_SYNTAX_ERROR, *this );
         }
     }
@@ -185,7 +185,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
         sAdditionalInfo = aAddrbookURI.copy( nLen + 1 );
     }
 
-    OSL_TRACE("URI = %s\n", ((OUtoCStr(aAddrbookURI)) ? (OUtoCStr(aAddrbookURI)):("NULL")) );
+    OSL_TRACE("URI = %s", ((OUtoCStr(aAddrbookURI)) ? (OUtoCStr(aAddrbookURI)):("NULL")) );
     OSL_TRACE("Scheme = %s\n", ((OUtoCStr(aAddrbookScheme)) ?  (OUtoCStr(aAddrbookScheme)):("NULL")) );
 
     //
@@ -251,7 +251,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
 
         for (; pInfo != pInfoEnd; ++pInfo)
         {
-            OSL_TRACE( "info[%d].Name = %s\n", pInfo - info.getConstArray(), OUtoCStr( pInfo->Name ) );
+            OSL_TRACE( "info[%d].Name = %s", pInfo - info.getConstArray(), OUtoCStr( pInfo->Name ) );
 
             if ( 0 == pInfo->Name.compareToAscii("HostName") )
             {
@@ -315,11 +315,11 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
     }
     else
     {
-        OSL_TRACE("Invalid subschema given!!!\n");
+        OSL_TRACE("Invalid subschema given!!!");
         throwSQLException( STR_URI_SYNTAX_ERROR, *this );
     }
 
-    OSL_TRACE("Moz URI = %s, %s\n", ((OUtoCStr(m_sMozillaURI)) ? (OUtoCStr(m_sMozillaURI)):("NULL")), usesFactory() ? "uses factory" : "no factory");
+    OSL_TRACE("Moz URI = %s, %s", ((OUtoCStr(m_sMozillaURI)) ? (OUtoCStr(m_sMozillaURI)):("NULL")), usesFactory() ? "uses factory" : "no factory");
     OSL_TRACE( "\tOUT OConnection::construct()\n" );
 
     MDatabaseMetaDataHelper     _aDbHelper;
@@ -331,12 +331,12 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
     {
         if ( !_aDbHelper.testLDAPConnection( this ) )
         {
-            OSL_TRACE("testLDAPConnection : FAILED\n" );
+            OSL_TRACE("testLDAPConnection : FAILED" );
             throwSQLException( _aDbHelper.getError(), *this );
         }
         else
         {
-            OSL_TRACE("testLDAPConnection : SUCCESS\n" );
+            OSL_TRACE("testLDAPConnection : SUCCESS" );
         }
     }
 
@@ -535,7 +535,7 @@ void OConnection::disposing()
 
 Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
 {
-    OSL_TRACE("IN OConnection::createCatalog()\n" );
+    OSL_TRACE("IN OConnection::createCatalog()" );
     ::osl::MutexGuard aGuard( m_aMutex );
     Reference< XTablesSupplier > xTab = m_xCatalog;
     if(!m_xCatalog.is())
@@ -544,7 +544,7 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
         xTab = pCat;
         m_xCatalog = xTab;
     }
-    OSL_TRACE( "\tOUT OConnection::createCatalog()\n" );
+    OSL_TRACE( "\tOUT OConnection::createCatalog()" );
     return xTab;
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index 4bcea69d2f1a..774a51d132a3 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
@@ -141,7 +141,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
             // TABLE_NAME
             aRow[3] = new ORowSetValueDecorator( tables[j] );
 
-            OSL_TRACE( "\t\tTableName = %s;\n",OUtoCStr( tables[j] ));
+            OSL_TRACE( "\t\tTableName = %s;",OUtoCStr( tables[j] ));
 
             // Iterate over all collumns in the table.
             for (   OColumnAlias::AliasMap::const_iterator compare = colNames.begin();
@@ -151,7 +151,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
             {
                 if ( match( columnNamePattern, compare->first, '\0' ) )
                 {
-                    OSL_TRACE( "\t\t\tColumnName = %s;\n", OUtoCStr( compare->first ) );
+                    OSL_TRACE( "\t\t\tColumnName = %s;", OUtoCStr( compare->first ) );
                     // COLUMN_NAME
                     aRow[4] = new ORowSetValueDecorator( compare->first );
                     // ORDINAL_POSITION
@@ -997,7 +997,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
             // TABLE_NAME
             aRow[2] = new ORowSetValueDecorator( tables[j] );
 
-            OSL_TRACE( "\t\tTableName = %s;\n",OUtoCStr( tables[j] ));
+            OSL_TRACE( "\t\tTableName = %s;",OUtoCStr( tables[j] ));
 
                 aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue();
                 aRows.push_back(aRow);
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 5506c9306e32..8edbe838d531 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -748,18 +748,18 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat
     }
     // XXX - Now we know name, what's value????
     m_nParamIndex ++;
-    OSL_TRACE("Parameter name [%d]: %s\n", m_nParamIndex,OUtoCStr(aParameterName) );
+    OSL_TRACE("Parameter name [%d]: %s", m_nParamIndex,OUtoCStr(aParameterName) );
 
     if ( m_aParameterRow.is() ) {
         OSL_ENSURE( m_nParamIndex < (sal_Int32)m_aParameterRow->get().size() + 1, "More parameters than values found" );
         rMatchString = (m_aParameterRow->get())[(sal_uInt16)m_nParamIndex];
 #if OSL_DEBUG_LEVEL > 0
-        OSL_TRACE("Prop Value       : %s\n", OUtoCStr( rMatchString ) );
+        OSL_TRACE("Prop Value       : %s", OUtoCStr( rMatchString ) );
 #endif
     }
 #if OSL_DEBUG_LEVEL > 0
     else {
-        OSL_TRACE("Prop Value       : Invalid ParameterRow!\n" );
+        OSL_TRACE("Prop Value       : Invalid ParameterRow!" );
     }
 #endif
 }
@@ -784,16 +784,16 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
             for(;aIter != xColumns->get().end();++aIter)
             {
                 (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
-                OSL_TRACE("Prop Column Name : %s\n", OUtoCStr( aColName ) );
+                OSL_TRACE("Prop Column Name : %s", OUtoCStr( aColName ) );
                 if ( m_aParameterRow.is() ) {
                     aParameterValue = (m_aParameterRow->get())[(sal_uInt16)i];
 #if OSL_DEBUG_LEVEL > 0
-                    OSL_TRACE("Prop Value       : %s\n", OUtoCStr( aParameterValue ) );
+                    OSL_TRACE("Prop Value       : %s", OUtoCStr( aParameterValue ) );
 #endif
                 }
 #if OSL_DEBUG_LEVEL > 0
                 else {
-                    OSL_TRACE("Prop Value       : Invalid ParameterRow!\n" );
+                    OSL_TRACE("Prop Value       : Invalid ParameterRow!" );
                 }
 #endif
                 i++;
@@ -804,7 +804,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
 
     if ( SQL_ISRULE(parseTree,where_clause) )
     {
-        OSL_TRACE("analyseSQL : Got WHERE clause\n");
+        OSL_TRACE("analyseSQL : Got WHERE clause");
         // Reset Parameter Counter
         resetParameters();
         analyseWhereClause( parseTree->getChild( 1 ), queryExpression );
@@ -814,7 +814,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
         SQL_ISPUNCTUATION(parseTree->getChild(2),")"))
     {
 
-        OSL_TRACE("analyseSQL : Got Punctuation ()\n");
+        OSL_TRACE("analyseSQL : Got Punctuation ()");
         MQueryExpression *subExpression = new MQueryExpression();
         analyseWhereClause( parseTree->getChild( 1 ), *subExpression );
         queryExpression.getExpressions().push_back( subExpression );
@@ -823,7 +823,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
              && parseTree->count() == 3)                   // Handle AND/OR
     {
 
-        OSL_TRACE("analyseSQL : Got AND/OR clause\n");
+        OSL_TRACE("analyseSQL : Got AND/OR clause");
 
         // TODO - Need to take care or AND, for now match is always OR
         analyseWhereClause( parseTree->getChild( 0 ), queryExpression );
@@ -885,7 +885,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
     {
         OSL_ENSURE(parseTree->count() == 2, "Error parsing LIKE predicate");
 
-        OSL_TRACE("analyseSQL : Got LIKE rule\n");
+        OSL_TRACE("analyseSQL : Got LIKE rule");
 
         if ( !(SQL_ISRULE(parseTree->getChild(0), column_ref)) )
         {
@@ -910,7 +910,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
               ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQL_NODE_STRING )
               ) )
         {
-            OSL_TRACE("analyseSQL : pAtom->count() = %d\n", pAtom->count() );
+            OSL_TRACE("analyseSQL : pAtom->count() = %d", pAtom->count() );
 
             m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_INVALID_LIKE_STRING, *this );
         }
@@ -923,7 +923,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
         if(SQL_ISRULE(pColumn,column_ref))
             m_pSQLIterator->getColumnRange(pColumn,columnName,sTableRange);
 
-        OSL_TRACE("ColumnName = %s\n", OUtoCStr( columnName ) );
+        OSL_TRACE("ColumnName = %s", OUtoCStr( columnName ) );
 
         if ( SQL_ISRULE(pAtom,parameter) ) {
             parseParameter( pAtom, matchString );
@@ -1077,7 +1077,7 @@ void OResultSet::fillRowData()
     {
         (*aIter)->getPropertyValue(sProprtyName) >>= sName;
 #if OSL_DEBUG_LEVEL > 0
-        OSL_TRACE("Query Columns : (%d) %s\n", i, OUtoCStr(sName) );
+        OSL_TRACE("Query Columns : (%d) %s", i, OUtoCStr(sName) );
 #endif
         m_aAttributeStrings.push_back( sName );
     }
@@ -1093,13 +1093,13 @@ void OResultSet::fillRowData()
     {
         // Extract required info
 
-        OSL_TRACE("\tHave a Where Clause\n");
+        OSL_TRACE("\tHave a Where Clause");
 
         analyseWhereClause( pParseTree, queryExpression );
     }
     else
     {
-        OSL_TRACE("\tDon't have a Where Clause\n");
+        OSL_TRACE("\tDon't have a Where Clause");
 
         MQueryExpression::ExprVector    eVector;
 
@@ -1138,9 +1138,9 @@ void OResultSet::fillRowData()
     determineReadOnly();
 
 #if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE( "executeQuery returned %d\n", rv );
+    OSL_TRACE( "executeQuery returned %d", rv );
 
-    OSL_TRACE( "\tOUT OResultSet::fillRowData()\n" );
+    OSL_TRACE( "\tOUT OResultSet::fillRowData()" );
 #endif
 }
 
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 2070f8da37c8..1502696e31ae 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -199,7 +199,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUStrin
     {
         const char* str = OUtoCStr(sql);
         OSL_UNUSED( str );
-        OSL_TRACE("ParseSQL: %s\n", OUtoCStr( sql ) );
+        OSL_TRACE("ParseSQL: %s", OUtoCStr( sql ) );
     }
 #endif // OSL_DEBUG_LEVEL
 
@@ -214,7 +214,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUStrin
 #if OSL_DEBUG_LEVEL > 0
         OSQLTables::const_iterator citer;
         for( citer = xTabs.begin(); citer != xTabs.end(); ++citer ) {
-            OSL_TRACE("SELECT Table : %s\n", OUtoCStr(citer->first) );
+            OSL_TRACE("SELECT Table : %s", OUtoCStr(citer->first) );
         }
 #endif
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 8e2cf5deed40..d70e1e2db5ac 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -108,7 +108,7 @@ extern "C" void NS_SetupRegistry();
 sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
 {
     nsresult rv;
-    OSL_TRACE( "IN : MNS_InitXPCOM() \n" );
+    OSL_TRACE( "IN : MNS_InitXPCOM()" );
     // Reentrant calls to this method do nothing except increment a counter
 
 #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
@@ -195,19 +195,19 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
     nsCOMPtr< nsIPref > thePref = do_GetService( kPrefCID, &rv );
     if (NS_SUCCEEDED(rv) )
     {
-        OSL_TRACE("Created an nsIPref i/f\n");
+        OSL_TRACE("Created an nsIPref i/f");
         thePref->ReadUserPrefs( nsnull );
         *aProfileExists = sal_True ;
         s_bProfilePresentAfterInitialized = sal_True;
     }
-    OSL_TRACE( "OUT : MNS_InitXPCOM() - XPCOM Init\n" );
+    OSL_TRACE( "OUT : MNS_InitXPCOM() - XPCOM Init" );
 
     return sal_True;
 }
 
 void MNS_XPCOM_EventLoop()
 {
-    OSL_TRACE( "IN : MNS_XPCOM_EventLoop() \n" );
+    OSL_TRACE( "IN : MNS_XPCOM_EventLoop()" );
     nsresult rv;
     nsCOMPtr<nsIEventQueue> eventQ;
     nsCOMPtr<nsIEventQueueService>  eventQService;
@@ -242,13 +242,13 @@ void MNS_XPCOM_EventLoop()
     }while ( PR_SUCCESS == PR_Sleep( PR_MillisecondsToInterval(1)) && aLive );
 
     eventQ->ProcessPendingEvents();
-    OSL_TRACE( "OUT : MNS_XPCOM_EventLoop() \n" );
+    OSL_TRACE( "OUT : MNS_XPCOM_EventLoop()" );
 }
 
 extern "C" void MNS_Mozilla_UI_Thread( void *arg )
 {
     aLive=1;
-    OSL_TRACE( "IN : MNS_Mozilla_UI_Thread() \n" );
+    OSL_TRACE( "IN : MNS_Mozilla_UI_Thread()" );
     UI_Thread_ARGS * args = (UI_Thread_ARGS*) arg;
     sal_Bool* aProfileExists=args->bProfileExists;
     delete args;
@@ -277,7 +277,7 @@ extern "C" void MNS_Mozilla_UI_Thread( void *arg )
 
     m_aUI_Thread_Condition.set();   //release all blocks
 
-    OSL_TRACE( "OUT : MNS_Mozilla_UI_Thread() \n" );
+    OSL_TRACE( "OUT : MNS_Mozilla_UI_Thread()" );
 
 }
 
@@ -286,15 +286,15 @@ sal_Bool MNS_Init(sal_Bool& aProfileExists)
 {
     aProfileExists = sal_False ;
 
-    OSL_TRACE( "IN : MNS_Init() \n" );
+    OSL_TRACE( "IN : MNS_Init()" );
     // Reentrant calls to this method do nothing except increment a counter
     sInitCounter++;
     if (sInitCounter > 1) {
-        OSL_TRACE( "IN : MNS_Init() wait for xpcom to be initted \n" );
+        OSL_TRACE( "IN : MNS_Init() wait for xpcom to be initted" );
         //wait for xpcom to be initted
         m_aUI_Thread_Condition.wait();
 
-        OSL_TRACE( "OUT : MNS_Init() : counter = %d\n", sInitCounter );
+        OSL_TRACE( "OUT : MNS_Init() : counter = %d", sInitCounter );
         aProfileExists = s_bProfilePresentAfterInitialized;
         return sal_True;
     }
@@ -316,7 +316,7 @@ sal_Bool MNS_Init(sal_Bool& aProfileExists)
     //Add Terminate Listener to XDesktop to get application exit event
     MNSTerminateListener::addTerminateListener();
 
-    OSL_TRACE( "OUT : MNS_Init() - First Init\n" );
+    OSL_TRACE( "OUT : MNS_Init() - First Init" );
 
     return sal_True;
 }
@@ -324,11 +324,11 @@ sal_Bool MNS_Init(sal_Bool& aProfileExists)
 sal_Bool MNS_Term(sal_Bool aForce)
 {
     // Reentrant calls to this method do nothing except decrement a counter
-    OSL_TRACE( "IN : MNS_Term() \n" );
+    OSL_TRACE( "IN : MNS_Term()" );
     if (!aForce && sInitCounter > 1)
     {
         --sInitCounter;
-        OSL_TRACE( "OUT : MNS_Term() : counter = %d\n", sInitCounter );
+        OSL_TRACE( "OUT : MNS_Term() : counter = %d", sInitCounter );
         return sal_True;
     }
     sInitCounter = 0;
@@ -340,7 +340,7 @@ sal_Bool MNS_Term(sal_Bool aForce)
     m_aUI_Thread_Condition.wait(&timeValue);
 
 
-    OSL_TRACE( "OUT : MNS_Term() - Final Term\n" );
+    OSL_TRACE( "OUT : MNS_Term() - Final Term" );
     return sal_True;
 }
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index c950e4d0e7e0..4d3447bf486b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
@@ -85,7 +85,7 @@ MNSRunnable::~MNSRunnable()
 }
 sal_Int32 MNSRunnable::StartProxy(const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode)
 {
-    OSL_TRACE( "IN : MNSRunnable::StartProxy() \n" );
+    OSL_TRACE( "IN : MNSRunnable::StartProxy()" );
     ::osl::MutexGuard aGuard(m_aThreadMutex);
     xCode = aCode;
     return ProxiedObject()->Run();
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 28cc64d707ba..e5c741d4376a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -99,9 +99,9 @@ extern sal_Bool MNS_Init(sal_Bool& aProfileExists);
 MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()
     :m_bProfileExists(sal_False)
 {
-    OSL_TRACE( "IN MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()\n" );
+    OSL_TRACE( "IN MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" );
 
-    OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()\n" );
+    OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" );
 
 }
 // -------------------------------------------------------------------------
@@ -122,7 +122,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()
         m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0;
     }
 
-    OSL_TRACE( "IN/OUT MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()\n" );
+    OSL_TRACE( "IN/OUT MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()" );
 }
 
 static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array);
@@ -388,7 +388,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
     {
         return NS_ERROR_NULL_POINTER;
     }
-    OSL_TRACE("Using URI %s to getTables()\n",sAbURI );
+    OSL_TRACE("Using URI %s to getTables()",sAbURI );
 
     // Get the mozilla addressbooks from the base directory.
     nsresult rv = NS_OK;
@@ -444,7 +444,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
             return NS_ERROR_FAILURE;
         }
         MTypeConverter::prUnicharToOUString(name, aTableName);
-        OSL_TRACE("TableName = >%s<\n", OUtoCStr( aTableName ) );
+        OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) );
 
         ODatabaseMetaDataResultSet::ORow aRow(3);
 
@@ -452,7 +452,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
         if ( aTableName.getLength() == 0 )
             aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook"));
 
-        OSL_TRACE("TableName = >%s<\n", OUtoCStr( aTableName ) );
+        OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) );
 
         rv = nmap->add( aTableName, subDirectory);
         nsCOMPtr<nsIRDFResource> rdfResource = do_QueryInterface(subDirectory, &rv) ;
@@ -486,7 +486,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
     ::rtl::OUString                             sAbURI;
     ::rtl::OString                                      sAbURIString;
 
-    OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)\n", _pCon, _pCon->getForceLoadTables()?"True":"False" );
+    OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)", _pCon, _pCon->getForceLoadTables()?"True":"False" );
 
     ::osl::MutexGuard aGuard( m_aMetaMutex );
     // Only do the query if we have to - performance degrades otherwise
@@ -501,7 +501,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
 
     sAbURI = _pCon->getMozURI();
 
-    OSL_TRACE("AbURI = %s\n", OUtoCStr( sAbURI ) );
+    OSL_TRACE("AbURI = %s", OUtoCStr( sAbURI ) );
     if ( sAbURI.getLength() == 0 )
         bGivenURI = sal_False;
     else {
@@ -511,9 +511,9 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
     }
 
     if ( bGivenURI )
-        OSL_TRACE("Using URI %s to getTables()\n", sAbURIString.getStr() );
+        OSL_TRACE("Using URI %s to getTables()", sAbURIString.getStr() );
     else
-        OSL_TRACE("Using URI of ROOTDIR to getTables()\n");
+        OSL_TRACE("Using URI of ROOTDIR to getTables()");
 
     // Get the mozilla addressbooks from the base directory.
     nsresult rv = NS_OK;
@@ -610,7 +610,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
             m_aError.setResId( STR_UNSPECIFIED_ERROR );
         return sal_False;
     }
-    OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::getTableStrings()\n" );
+    OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::getTableStrings()" );
     _rStrings = m_aTableNames;
     _rTypes   = m_aTableTypes;
 
@@ -626,7 +626,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
 
     static ODatabaseMetaDataResultSet::ORows    aRows;
 
-    OSL_TRACE( "IN MDatabaseMetaDataHelper::getTables()\n" );
+    OSL_TRACE( "IN MDatabaseMetaDataHelper::getTables()" );
     ::osl::MutexGuard aGuard( m_aMetaMutex );
 
     ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well
@@ -644,7 +644,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
 
         ::rtl::OUString aTableName  = tables[i];
         ::rtl::OUString aTableType      = tabletypes[i];
-        OSL_TRACE("TableName = >%s<\n", OUtoCStr( aTableName ) );
+        OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) );
 
 
         // return tables to caller
@@ -656,7 +656,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
                 aTableName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AddressBook"));
             }
 
-            OSL_TRACE( "TableName = %s ; TableType = %s\n", OUtoCStr(aTableName), OUtoCStr(aTableType) );
+            OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) );
 
             aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // Table name
             aRow.push_back( new ORowSetValueDecorator( aTableType ) );     // Table type
@@ -665,7 +665,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
         }
     }
 
-    OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::getTables()\n" );
+    OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::getTables()" );
     _rRows = aRows;
     return(sal_True);
 }
@@ -752,7 +752,7 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl:
         return sal_False;
     }
     else
-        OSL_TRACE("Create table\n");
+        OSL_TRACE("Create table");
 
     // Get the mozilla addressbooks from the base directory.
     nsresult rv = NS_OK;
@@ -773,7 +773,7 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl:
     {
         m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, ::rtl::OUString::valueOf( sal_Int32(rv), 16 ) );
     }
-    OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()\n" );
+    OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()" );
     return( NS_SUCCEEDED(rv) ? sal_True : sal_False );
 }
 nsresult NewAddressBook(const ::rtl::OUString * aName)
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index df81bb886b5e..b56a373c0e5d 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -83,7 +83,7 @@ MNSMozabProxy::~MNSMozabProxy()
 
 sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile)
 {
-    OSL_TRACE( "IN : MNSMozabProxy::StartProxy() \n" );
+    OSL_TRACE( "IN : MNSMozabProxy::StartProxy()" );
     ::osl::MutexGuard aGuard(m_aThreadMutex);
     m_Product = aProduct;
     m_Profile = aProfile;
@@ -117,9 +117,9 @@ extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirec
 sal_Int32 SAL_CALL MNSMozabProxy::run(  ) throw (::com::sun::star::uno::RuntimeException)
 {
 #if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE( "IN : MNSMozabProxy::Run() Caller thread :%4d \n" , m_oThreadID );
+    OSL_TRACE( "IN : MNSMozabProxy::Run() Caller thread :%4d" , m_oThreadID );
 #else
-    OSL_TRACE( "IN : MNSMozabProxy::Run() \n" );
+    OSL_TRACE( "IN : MNSMozabProxy::Run()" );
 #endif
     nsresult rv = NS_ERROR_INVALID_ARG;
     if (m_Args == NULL)
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
index d50097e5c65d..89d6ef881bd7 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
@@ -93,10 +93,10 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook )
 {
     MNameMapper::dirMap::iterator   iter;
 
-    OSL_TRACE( "IN MNameMapper::add()\n" );
+    OSL_TRACE( "IN MNameMapper::add()" );
 
     if ( abook == NULL ) {
-        OSL_TRACE( "\tOUT MNameMapper::add() called with null abook\n" );
+        OSL_TRACE( "\tOUT MNameMapper::add() called with null abook" );
         return NS_ERROR_NULL_POINTER;
     }
 
@@ -117,7 +117,7 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook )
     str = tempStr;
     NS_IF_ADDREF(abook);
     mDirMap->insert( MNameMapper::dirMap::value_type( str, abook ) );
-    OSL_TRACE( "\tOUT MNameMapper::add()\n" );
+    OSL_TRACE( "\tOUT MNameMapper::add()" );
     return 0;
 }
 
@@ -126,7 +126,7 @@ MNameMapper::getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook )
 {
     MNameMapper::dirMap::iterator   iter;
 
-    OSL_TRACE( "IN MNameMapper::getDir( %s )\n", OUtoCStr(str)?OUtoCStr(str):"NULL" );
+    OSL_TRACE( "IN MNameMapper::getDir( %s )", OUtoCStr(str)?OUtoCStr(str):"NULL" );
 
     if ( (iter = mDirMap->find( str )) != mDirMap->end() ) {
         *abook = (*iter).second;
@@ -135,7 +135,7 @@ MNameMapper::getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook )
         *abook = NULL;
     }
 
-    OSL_TRACE( "\tOUT MNameMapper::getDir() : %s\n", (*abook)?"True":"False" );
+    OSL_TRACE( "\tOUT MNameMapper::getDir() : %s", (*abook)?"True":"False" );
 
     return( (*abook) != NULL );
 }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 3fe542dfb95f..2ef66e5fe52f 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -79,21 +79,21 @@ namespace connectivity {
 /*
 MQuery::MQuery()
 {
-    OSL_TRACE( "IN MQuery::MQuery()\n" );
+    OSL_TRACE( "IN MQuery::MQuery()" );
 
    construct();
 #if OSL_DEBUG_LEVEL > 0
     m_oThreadID = osl_getThreadIdentifier(NULL);
 #endif
 
-    OSL_TRACE( "\tOUT MQuery::MQuery()\n" );
+    OSL_TRACE( "\tOUT MQuery::MQuery()" );
 }
 */
 // -------------------------------------------------------------------------
 MQuery::MQuery( const OColumnAlias& _ca )
     :m_rColumnAlias( _ca )
 {
-    OSL_TRACE( "IN MQuery::MQuery( ca )\n" );
+    OSL_TRACE( "IN MQuery::MQuery( ca )" );
 
     construct();
 
@@ -101,12 +101,12 @@ MQuery::MQuery( const OColumnAlias& _ca )
     m_oThreadID = osl_getThreadIdentifier(NULL);
 #endif
 
-    OSL_TRACE( "\tOUT MQuery::MQuery( ca )\n" );
+    OSL_TRACE( "\tOUT MQuery::MQuery( ca )" );
 }
 // -------------------------------------------------------------------------
 MQuery::~MQuery()
 {
-    OSL_TRACE("IN MQuery::~MQuery()\n");
+    OSL_TRACE("IN MQuery::~MQuery()");
 
     // MQueryHelper is reference counted, so we need to decrement the
     // count here.
@@ -120,7 +120,7 @@ MQuery::~MQuery()
 
     NS_IF_RELEASE( m_aQueryHelper);
 
-    OSL_TRACE("\tOUT MQuery::~MQuery()\n");
+    OSL_TRACE("\tOUT MQuery::~MQuery()");
 }
 // -----------------------------------------------------------------------------
 void MQuery::construct()
@@ -140,67 +140,67 @@ void MQuery::construct()
 // -------------------------------------------------------------------------
 void MQuery::setAddressbook(::rtl::OUString &ab)
 {
-    OSL_TRACE("IN MQuery::setAddressbook()\n");
+    OSL_TRACE("IN MQuery::setAddressbook()");
     ::osl::MutexGuard aGuard(m_aMutex);
 
     m_aAddressbook = ab;
 
-    OSL_TRACE("\tOUT MQuery::setAddressbook()\n");
+    OSL_TRACE("\tOUT MQuery::setAddressbook()");
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString MQuery::getAddressbook() const
 {
-    OSL_TRACE("IN MQuery::getAddressbook()\n");
+    OSL_TRACE("IN MQuery::getAddressbook()");
 
-    OSL_TRACE("\tOUT MQuery::getAddressbook()\n");
+    OSL_TRACE("\tOUT MQuery::getAddressbook()");
 
     return(m_aAddressbook);
 }
 // -------------------------------------------------------------------------
 void MQuery::setMaxNrOfReturns(const sal_Int32 mnr)
 {
-    OSL_TRACE( "IN MQuery::setMaxNrOfReturns()\n" );
+    OSL_TRACE( "IN MQuery::setMaxNrOfReturns()" );
     ::osl::MutexGuard aGuard(m_aMutex);
 
     m_nMaxNrOfReturns = mnr;
-    OSL_TRACE("\tOUT MQuery::setMaxNrOfReturns()\n" );
+    OSL_TRACE("\tOUT MQuery::setMaxNrOfReturns()" );
 }
 // -------------------------------------------------------------------------
 sal_Int32 MQuery::getMaxNrOfReturns() const
 {
-    OSL_TRACE("IN MQuery::getMaxNrOfReturns()\n");
+    OSL_TRACE("IN MQuery::getMaxNrOfReturns()");
 
-    OSL_TRACE("\tOUT MQuery::getMaxNrOfReturns()\n");
+    OSL_TRACE("\tOUT MQuery::getMaxNrOfReturns()");
 
     return(m_nMaxNrOfReturns);
 }
 // -------------------------------------------------------------------------
 void MQuery::setQuerySubDirs(sal_Bool &qsd)
 {
-    OSL_TRACE("IN MQuery::setQuerySubDirs()\n");
+    OSL_TRACE("IN MQuery::setQuerySubDirs()");
     ::osl::MutexGuard aGuard(m_aMutex);
 
     m_bQuerySubDirs = qsd;
-    OSL_TRACE("\tOUT MQuery::setQuerySubDirs()\n");
+    OSL_TRACE("\tOUT MQuery::setQuerySubDirs()");
 }
 // -------------------------------------------------------------------------
 sal_Bool MQuery::getQuerySubDirs() const
 {
-    OSL_TRACE("IN MQuery::getQuerySubDirs()\n");
+    OSL_TRACE("IN MQuery::getQuerySubDirs()");
 
-    OSL_TRACE("\tOUT MQuery::getQuerySubDirs()\n");
+    OSL_TRACE("\tOUT MQuery::getQuerySubDirs()");
 
     return(m_bQuerySubDirs);
 }
 // -------------------------------------------------------------------------
 void MQuery::setExpression( MQueryExpression &_expr )
 {
-    OSL_TRACE("IN MQuery::setExpression()\n");
+    OSL_TRACE("IN MQuery::setExpression()");
     ::osl::MutexGuard aGuard(m_aMutex);
 
     m_aExpr = _expr;
 
-    OSL_TRACE("\tOUT MQuery::setExpression()\n");
+    OSL_TRACE("\tOUT MQuery::setExpression()");
 }
 // -------------------------------------------------------------------------
 static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression*  _aExpr,
@@ -283,7 +283,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression*  _aExpr,
             // Set the 'matchValue' property of the boolString. Value returned in unicode.
             if ( requiresValue )
             {
-                OSL_TRACE("Value = %s \n", OUtoCStr( evStr->getValue() ) );
+                OSL_TRACE("Value = %s", OUtoCStr( evStr->getValue() ) );
                 MTypeConverter::ouStringToNsString( evStr->getValue(), matchValue);
                 boolString->SetValue(matchValue.get ());
             }
@@ -456,7 +456,7 @@ sal_Int32 MQuery::deleteRow(const sal_Int32 rowIndex)
 sal_Int32 MQuery::executeQuery(OConnection* _pCon)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    OSL_TRACE("IN MQuery::executeQuery()\n");
+    OSL_TRACE("IN MQuery::executeQuery()");
     m_Product = _pCon->getProduct();
     m_Profile = _pCon->getMozProfile();
 
@@ -474,7 +474,7 @@ sal_Int32 MQuery::executeQuery(OConnection* _pCon)
 sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon)
 {
 #if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE("IN MQuery::executeQueryProxied() Caller thread: %4d \n", m_oThreadID);
+    OSL_TRACE("IN MQuery::executeQueryProxied() Caller thread: %4d", m_oThreadID);
 #endif
 
     nsresult rv;        // Store return values.
@@ -524,11 +524,11 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon)
 
         m_aQueryDirectory->directoryQuery = do_QueryInterface (directoryQueryProxy, &rv);
         NS_ENSURE_SUCCESS(rv, rv);
-        OSL_TRACE("Using the directoryQueryProxy\n");
+        OSL_TRACE("Using the directoryQueryProxy");
     }
 #if OSL_DEBUG_LEVEL > 0
     else
-        OSL_TRACE("Not using a Query Proxy, Query i/f supported by directory\n");
+        OSL_TRACE("Not using a Query Proxy, Query i/f supported by directory");
 #endif /* OSL_DEBUG_LEVEL */
 
     /*
@@ -596,7 +596,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon)
     NS_ENSURE_SUCCESS( rv, rv );
 
     // Execute the query.
-    OSL_TRACE( "****** calling DoQuery\n");
+    OSL_TRACE( "****** calling DoQuery");
 
     m_aError.reset();
 
@@ -607,18 +607,18 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon)
 
     if (NS_FAILED(rv))  {
         m_aQueryDirectory->contextId = -1;
-        OSL_TRACE( "****** DoQuery failed\n");
+        OSL_TRACE( "****** DoQuery failed");
         OSL_TRACE("\tOUT MQuery::executeQueryProxied()\n");
         m_aQueryHelper->notifyQueryError() ;
         return(-1);
     }
 #if OSL_DEBUG_LEVEL > 0
     else {
-        OSL_TRACE( "****** DoQuery succeeded \n");
+        OSL_TRACE( "****** DoQuery succeeded");
     }
 #endif
 
-    OSL_TRACE("\tOUT MQuery::executeQueryProxied()\n");
+    OSL_TRACE("\tOUT MQuery::executeQueryProxied()");
 
     return(0);
 }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 1ce71c85b9da..78e5c846d9a9 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -57,7 +57,7 @@ MQueryHelperResultEntry::MQueryHelperResultEntry()
 
 MQueryHelperResultEntry::~MQueryHelperResultEntry()
 {
-    OSL_TRACE("IN MQueryHelperResultEntry::~MQueryHelperResultEntry()\n");
+    OSL_TRACE("IN MQueryHelperResultEntry::~MQueryHelperResultEntry()");
     OSL_TRACE("OUT MQueryHelperResultEntry::~MQueryHelperResultEntry()\n");
 
 }
@@ -112,9 +112,9 @@ MQueryHelper::MQueryHelper()
 
 MQueryHelper::~MQueryHelper()
 {
-    OSL_TRACE("IN MQueryHelper::~MQueryHelper()\n");
+    OSL_TRACE("IN MQueryHelper::~MQueryHelper()");
     clear_results();
-    OSL_TRACE("OUT MQueryHelper::~MQueryHelper()\n");
+    OSL_TRACE("OUT MQueryHelper::~MQueryHelper()");
 }
 
 void
@@ -330,12 +330,12 @@ MQueryHelper::getResultCount() const
     OSL_TRACE( "IN MQueryHelper::getResultCount()" );
     if ( !m_bQueryComplete )
     {
-        OSL_TRACE( "\tOUT MQueryHelper::getResultCount() = -1\n");
+        OSL_TRACE( "\tOUT MQueryHelper::getResultCount() = -1");
         return -1;
     }
     else
     {
-        OSL_TRACE( "\tOUT MQueryHelper::getResultCount() = %d\n", m_aResults.size() );
+        OSL_TRACE( "\tOUT MQueryHelper::getResultCount() = %d", m_aResults.size() );
         return static_cast<sal_Int32>(m_aResults.size());
     }
 }
@@ -345,7 +345,7 @@ MQueryHelper::getResultCount() const
 sal_uInt32
 MQueryHelper::getRealCount() const
 {
-    OSL_TRACE( "IN/OUT MQueryHelper::getRealCount() = %d\n", m_aResults.size() );
+    OSL_TRACE( "IN/OUT MQueryHelper::getRealCount() = %d", m_aResults.size() );
     return static_cast<sal_Int32>(m_aResults.size());
 }
 
@@ -354,13 +354,13 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 #if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE( "IN MQueryHelper::OnQueryItem() Caller thread: %4d \n",m_oThreadID );
+    OSL_TRACE( "IN MQueryHelper::OnQueryItem() Caller thread: %4d",m_oThreadID );
 #endif
     nsresult rv;
     PRInt32 resultType;
 
     if ( result == NULL ) {
-        OSL_TRACE("\tresult ptr is NULL\n");
+        OSL_TRACE("\tresult ptr is NULL");
         return NS_OK;
     }
 
@@ -371,27 +371,27 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result)
     // Check for errors of the executeQuery() call.
     switch ( resultType ) {
     case nsIAbDirectoryQueryResult::queryResultError:
-        OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultError\n");
+        OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultError");
         m_bQueryComplete = sal_True;
         m_bErrorCondition = sal_True;
         notifyResultOrComplete();
         return NS_OK;
     case nsIAbDirectoryQueryResult::queryResultStopped:
-        OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultStopped\n");
+        OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultStopped");
         m_bQueryComplete = sal_True;
         notifyResultOrComplete();
         return NS_OK;
     case nsIAbDirectoryQueryResult::queryResultComplete:
-        OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultComplete\n");
+        OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultComplete");
         m_bQueryComplete = sal_True;
         notifyResultOrComplete();
         return NS_OK;
     case nsIAbDirectoryQueryResult::queryResultMatch:
-        OSL_TRACE("IN MQueryHelper::OnQueryItem --> queryResultMatch\n");
+        OSL_TRACE("IN MQueryHelper::OnQueryItem --> queryResultMatch");
         // Don't return, continues onto rest of method.
         break;
     default:
-        OSL_TRACE("\t******** Unexpected : resultType\n");
+        OSL_TRACE("\t******** Unexpected : resultType");
         m_bQueryComplete = sal_True;
         return NS_OK;
     }
@@ -423,7 +423,7 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result)
     }
     nsMemory::Free(name);
 
-    OSL_TRACE( "\tOUT MQueryHelper::OnQueryItem()\n" );
+    OSL_TRACE( "\tOUT MQueryHelper::OnQueryItem()" );
 
     notifyResultOrComplete();