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

5 files changed, 68 insertions, 68 deletions

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();