Hi,
I've removed all trailing newlines from OSL_TRACE calls. See attached patch.
Thomas
From 22074a546dc316ddc0a19cc6dc1b43e220ffdd91 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Tue, 20 Sep 2011 10:18:12 +0200
Subject: [PATCH] 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
---
basebmp/test/bmpdemo.cxx | 2 +-
basegfx/source/tools/debugplotter.cxx | 4 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 4 +-
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 4 +-
.../source/cpp_uno/msvc_win32_x86-64/except.cxx | 4 +-
canvas/source/cairo/cairo_canvashelper.cxx | 2 +-
chart2/source/tools/InternalData.cxx | 2 +-
comphelper/source/misc/asyncnotification.cxx | 6 +-
connectivity/source/drivers/dbase/DNoException.cxx | 4 +-
connectivity/source/drivers/dbase/dindexnode.cxx | 4 +-
connectivity/source/drivers/evoab2/NStatement.cxx | 2 +-
connectivity/source/drivers/mozab/MConnection.cxx | 20 +-
.../source/drivers/mozab/MDatabaseMetaData.cxx | 6 +-
connectivity/source/drivers/mozab/MResultSet.cxx | 34 ++--
connectivity/source/drivers/mozab/MStatement.cxx | 4 +-
.../source/drivers/mozab/bootstrap/MNSInit.cxx | 28 ++--
.../source/drivers/mozab/bootstrap/MNSRunnable.cxx | 2 +-
.../mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 34 ++--
.../drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 6 +-
.../drivers/mozab/mozillasrc/MNameMapper.cxx | 10 +-
.../source/drivers/mozab/mozillasrc/MQuery.cxx | 58 +++---
.../drivers/mozab/mozillasrc/MQueryHelper.cxx | 28 ++--
connectivity/workben/testmoz/mozthread.cxx | 72 ++++----
cppu/source/uno/lbenv.cxx | 2 +-
cppuhelper/source/factory.cxx | 4 +-
dbaccess/source/core/api/RowSetBase.cxx | 74 ++++----
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 16 +-
desktop/source/migration/migration.cxx | 2 +-
.../accessibility/AccessibleEditableTextPara.cxx | 6 +-
.../source/accessibility/AccessibleImageBullet.cxx | 2 +-
extensions/source/update/check/updateprotocol.cxx | 2 +-
extensions/source/update/feed/updatefeed.cxx | 4 +-
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 62 ++++----
fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 4 +-
fpicker/source/unx/gnome/SalGtkPicker.cxx | 2 +-
oox/source/core/xmlfilterbase.cxx | 2 +-
reportdesign/source/ui/report/ReportSection.cxx | 4 +-
reportdesign/source/ui/report/ViewsWindow.cxx | 12 +-
rsc/source/rsc/rsc.cxx | 2 +-
sal/osl/unx/module.c | 8 +-
sal/osl/unx/nlsupport.c | 2 +-
sal/osl/unx/pipe.c | 16 +-
sal/osl/unx/process.c | 22 ++--
sal/osl/unx/profile.c | 184 ++++++++++----------
sal/osl/unx/semaphor.c | 2 +-
sal/osl/unx/socket.c | 10 +-
sal/osl/unx/thread.c | 10 +-
sal/osl/unx/util.c | 10 +-
sal/osl/w32/process.cxx | 10 +-
sal/osl/w32/profile.cxx | 118 +++++++-------
sal/osl/w32/socket.cxx | 6 +-
sax/qa/cppunit/test_converter.cxx | 8 +-
sc/source/ui/vba/vbarange.cxx | 24 ++--
scripting/source/provider/ScriptImpl.cxx | 4 +-
scripting/source/provider/ScriptingContext.cxx | 4 +-
.../source/runtimemgr/ScriptNameResolverImpl.cxx | 4 +-
.../source/runtimemgr/ScriptRuntimeManager.cxx | 16 +-
scripting/source/runtimemgr/StorageBridge.cxx | 4 +-
.../configuration/ChangeRequestQueueProcessor.cxx | 10 +-
.../configuration/ConfigurationController.cxx | 6 +-
.../ConfigurationControllerResourceManager.cxx | 4 +-
.../ui/slidesorter/model/SlideSorterModel.cxx | 2 +-
sd/source/ui/view/ToolBarManager.cxx | 14 +-
sdext/source/pdfimport/filterdet.cxx | 10 +-
sdext/source/pdfimport/misc/pwdinteract.cxx | 2 +-
sdext/source/pdfimport/pdfiadaptor.cxx | 16 +-
sdext/source/pdfimport/test/pdf2xml.cxx | 2 +-
sdext/source/pdfimport/tree/genericelements.cxx | 6 +-
sdext/source/pdfimport/wrapper/wrapper.cxx | 2 +-
sdext/source/presenter/PresenterPaneAnimator.cxx | 2 +-
sfx2/qa/cppunit/test_metadatable.cxx | 4 +-
sfx2/source/doc/Metadatable.cxx | 18 +-
.../OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 2 +-
.../OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 2 +-
.../OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 2 +-
slideshow/source/engine/slideshowimpl.cxx | 4 +-
slideshow/test/demoshow.cxx | 2 +-
stoc/source/corereflection/lrucache.hxx | 8 +-
stoc/source/security/lru_cache.h | 2 +-
stoc/source/servicemanager/servicemanager.cxx | 4 +-
stoc/source/tdmanager/lrucache.hxx | 8 +-
stoc/source/tdmanager/tdmgr.cxx | 2 +-
stoc/test/javavm/testjavavm.cxx | 2 +-
store/source/storbios.cxx | 4 +-
svl/source/items/style.cxx | 2 +-
svtools/source/misc/filechangedchecker.cxx | 4 +-
svx/source/svdraw/svdview.cxx | 2 +-
sw/source/filter/ww8/docxattributeoutput.cxx | 36 ++--
sw/source/filter/ww8/docxexport.cxx | 10 +-
sw/source/filter/ww8/wrtw8nds.cxx | 2 +-
sw/source/filter/ww8/wrtww8gr.cxx | 4 +-
sw/source/filter/ww8/ww8atr.cxx | 2 +-
toolkit/source/layout/core/helper.cxx | 4 +-
toolkit/source/layout/core/proplist.cxx | 12 +-
toolkit/source/layout/core/root.cxx | 2 +-
toolkit/source/layout/vcl/wbutton.cxx | 2 +-
tools/source/rc/resmgr.cxx | 4 +-
unotools/source/config/bootstrap.cxx | 2 +-
vbahelper/source/vbahelper/vbacommandbar.cxx | 2 +-
vcl/aqua/source/a11y/documentfocuslistener.cxx | 2 +-
vcl/source/app/svapp.cxx | 2 +-
vcl/source/gdi/pdfwriter_impl2.cxx | 2 +-
vcl/unx/generic/gdi/salprnpsp.cxx | 2 +-
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 4 +-
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4 +-
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 4 +-
106 files changed, 626 insertions(+), 626 deletions(-)
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index ebb819a..b3e7096 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -1230,7 +1230,7 @@ void TestApp::Main()
if( !xFactory.is() )
{
- OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
+ OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting." );
exit( 1 );
}
diff --git a/basegfx/source/tools/debugplotter.cxx b/basegfx/source/tools/debugplotter.cxx
index f85f1e1..62044ae 100644
--- a/basegfx/source/tools/debugplotter.cxx
+++ b/basegfx/source/tools/debugplotter.cxx
@@ -130,7 +130,7 @@ namespace basegfx
if( mpStream )
*mpStream << " " << rElem.first.getX() << "\t" << rElem.first.getY() <<
::std::endl;
else
- OSL_TRACE( " %f\t%f\n", rElem.first.getX(), rElem.first.getY() );
+ OSL_TRACE( " %f\t%f", rElem.first.getX(), rElem.first.getY() );
}
void outputVector( const ::std::pair< B2DVector, ::rtl::OString >& rElem )
@@ -138,7 +138,7 @@ namespace basegfx
if( mpStream )
*mpStream << " " << rElem.first.getX() << "\t" << rElem.first.getY() <<
::std::endl << ::std::endl;
else
- OSL_TRACE( " %f\t%f\n\n", rElem.first.getX(), rElem.first.getY() );
+ OSL_TRACE( " %f\t%f", rElem.first.getX(), rElem.first.getY() );
}
void outputRect( const ::std::pair< B2DRange, ::rtl::OString >& rElem )
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 938cbf5..ef117b3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -255,7 +255,7 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
default:
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "Unhandled case: pType->eTypeClass == %d\n", pTypeRef->eTypeClass );
+ OSL_TRACE( "Unhandled case: pType->eTypeClass == %d", pTypeRef->eTypeClass );
#endif
OSL_ASSERT(0);
}
@@ -298,7 +298,7 @@ bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool
break;
default:
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "Unhandled case: classes[n] == %d\n", classes[n] );
+ OSL_TRACE( "Unhandled case: classes[n] == %d", classes[n] );
#endif
OSL_ASSERT(0);
}
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index b1bbe0d..0f38931 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -173,7 +173,7 @@ RTTInfos::RTTInfos() throw ()
RTTInfos::~RTTInfos() throw ()
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "> freeing generated RTTI infos... <\n" );
+ OSL_TRACE( "> freeing generated RTTI infos... <" );
#endif
MutexGuard aGuard( _aMutex );
@@ -393,7 +393,7 @@ ExceptionInfos::ExceptionInfos() throw ()
ExceptionInfos::~ExceptionInfos() throw ()
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "> freeing exception infos... <\n" );
+ OSL_TRACE( "> freeing exception infos... <" );
#endif
MutexGuard aGuard( _aMutex );
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index ac0da41..f39f347 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -385,7 +385,7 @@ RTTInfos::RTTInfos() throw ()
RTTInfos::~RTTInfos() throw ()
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "> freeing generated RTTI infos... <\n" );
+ OSL_TRACE( "> freeing generated RTTI infos... <" );
#endif
MutexGuard aGuard( _aMutex );
@@ -601,7 +601,7 @@ ExceptionInfos::ExceptionInfos() throw ()
ExceptionInfos::~ExceptionInfos() throw ()
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "> freeing exception infos... <\n" );
+ OSL_TRACE( "> freeing exception infos... <" );
#endif
MutexGuard aGuard( _aMutex );
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index ebf0e1a..0d94db3 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1029,7 +1029,7 @@ namespace cairocanvas
cairo_set_matrix( pCairo, &aIdentityMatrix );
}
} else {
- OSL_TRACE( "empty polygon for op: %d\n", aOperation );
+ OSL_TRACE( "empty polygon for op: %d", aOperation );
if( aOperation == Clip ) {
clipNULL( pCairo );
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index a272cee..a11d82b 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -542,7 +542,7 @@ vector< vector< uno::Any > > InternalData::getComplexColumnLabels() const
#if OSL_DEBUG_LEVEL > 1
void InternalData::traceData() const
{
- OSL_TRACE( "InternalData: Data in rows\n" );
+ OSL_TRACE( "InternalData: Data in rows" );
for( sal_Int32 i=0; i<m_nRowCount; ++i )
{
diff --git a/comphelper/source/misc/asyncnotification.cxx
b/comphelper/source/misc/asyncnotification.cxx
index 5697eb6..282ff1e 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -184,7 +184,7 @@ namespace comphelper
{
::osl::MutexGuard aGuard( m_pImpl->aMutex );
- OSL_TRACE( "AsyncEventNotifier(%p): adding %p\n", this, _rEvent.get() );
+ OSL_TRACE( "AsyncEventNotifier(%p): adding %p", this, _rEvent.get() );
// remember this event
m_pImpl->aEvents.push_back( ProcessableEvent( _rEvent, _xProcessor ) );
@@ -213,7 +213,7 @@ namespace comphelper
xNextProcessor = aEvent.xProcessor;
m_pImpl->aEvents.pop_front();
- OSL_TRACE( "AsyncEventNotifier(%p): popping %p\n", this, aNextEvent.get() );
+ OSL_TRACE( "AsyncEventNotifier(%p): popping %p", this, aNextEvent.get() );
if ( !aNextEvent.get() )
continue;
@@ -224,7 +224,7 @@ namespace comphelper
{
m_pImpl->m_aDeadProcessors.erase( xNextProcessor );
xNextProcessor.clear();
- OSL_TRACE( "AsyncEventNotifier(%p): removing %p\n", this, aNextEvent.get() );
+ OSL_TRACE( "AsyncEventNotifier(%p): removing %p", this, aNextEvent.get() );
}
// if there was a termination request (->terminate), respect it
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx
b/connectivity/source/drivers/dbase/DNoException.cxx
index 2db5bc8..be020f49b 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 1844e27..83026f7 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 30773e4..c0d9ee3 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 943bb7c..f0d35bc 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 4bcea69..774a51d 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 5506c93..8edbe83 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 2070f8d..1502696 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 8e2cf5d..d70e1e2 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 c950e4d..4d3447b 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 28cc64d..e5c741d 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 df81bb8..b56a373 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 d50097e..89d6ef8 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 3fe542d..2ef66e5 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 1ce71c8..78e5c84 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();
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index 9286ec1..2f807d8 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -118,18 +118,18 @@ void printColumns( Reference<XResultSet> &xRes )
char* aPat = " %-22s ";
char* aPat_Short = " %-12s ";
Reference<XResultSetMetaData> xMeta =
Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData();
- OSL_TRACE( "ColumnCount = %d\n", xMeta->getColumnCount());
+ OSL_TRACE( "ColumnCount = %d", xMeta->getColumnCount());
for(sal_Int32 i=1;i<=xMeta->getColumnCount();++i)
{
const char *str = OUtoCStr(xMeta->getColumnName(i));
OSL_TRACE( aPat, str );
}
OSL_TRACE("\n");
-
OSL_TRACE("------------------------------------------------------------------------------------------\n");
+
OSL_TRACE("------------------------------------------------------------------------------------------");
}
else
{
- OSL_TRACE(": FAILED to get a ResultSet \n");
+ OSL_TRACE(": FAILED to get a ResultSet");
}
}
void printXResultSet( Reference<XResultSet> &xRes )
@@ -153,7 +153,7 @@ void printXResultSet( Reference<XResultSet> &xRes )
OSL_TRACE("\n");
}
else
- OSL_TRACE("FAILED to get a ResultSet \n");
+ OSL_TRACE("FAILED to get a ResultSet");
}
void printXResultSets( Reference<XResultSet> &xRes )
@@ -167,9 +167,9 @@ void printXResultSets( Reference<XResultSet> &xRes )
printXResultSet(xRes);
nRows++;
}
- OSL_TRACE( "%d Row(s)\n", nRows);
+ OSL_TRACE( "%d Row(s)", nRows);
}else
- OSL_TRACE("FAILED to get a ResultSet \n");
+ OSL_TRACE("FAILED to get a ResultSet");
}
@@ -180,15 +180,15 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
Reference< XDatabaseMetaData > xDmd = pConnection->getMetaData();
if ( xDmd.is() )
{
- OSL_TRACE(": got DatabaseMetaData \n");
+ OSL_TRACE(": got DatabaseMetaData");
OUString sQuoteStr = xDmd->getIdentifierQuoteString();
- OSL_TRACE( "Quote String : '%s'\n", OUtoCStr( sQuoteStr ) );
+ OSL_TRACE( "Quote String : '%s'", OUtoCStr( sQuoteStr ) );
OUString sSQLCmds = xDmd->getSQLKeywords();
- OSL_TRACE( "SQL Commands : '%s'\n", OUtoCStr( sSQLCmds ) );
+ OSL_TRACE( "SQL Commands : '%s'", OUtoCStr( sSQLCmds ) );
- OSL_TRACE("Testing getColumns() : START\n");
+ OSL_TRACE("Testing getColumns() : START");
{
Reference<XResultSet> xRes = xDmd->getColumns(
makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
@@ -198,16 +198,16 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
);
printXResultSets( xRes );
}
- OSL_TRACE("Testing getColumns() : END\n");
+ OSL_TRACE("Testing getColumns() : END");
- OSL_TRACE("Testing getTypeInfo() : START\n");
+ OSL_TRACE("Testing getTypeInfo() : START");
{
Reference<XResultSet> xRes = xDmd-> getTypeInfo();
printXResultSets( xRes );
}
- OSL_TRACE("Testing getTypeInfo() : END\n");
+ OSL_TRACE("Testing getTypeInfo() : END");
- OSL_TRACE("Testing getTables() : START\n");
+ OSL_TRACE("Testing getTables() : START");
{
Reference<XResultSet> xRes = xDmd->getTables(
makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
@@ -216,23 +216,23 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
Sequence<rtl::OUString>() );
printXResultSets( xRes );
}
- OSL_TRACE("Testing getTables() : END\n");
+ OSL_TRACE("Testing getTables() : END");
}
else
- OSL_TRACE(": FAILED to get DatabaseMetaData \n");
+ OSL_TRACE(": FAILED to get DatabaseMetaData");
return 0;
}
void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
{
// Try a query
- OSL_TRACE("Testing createStatement() & executeQuery() : START\n");
+ OSL_TRACE("Testing createStatement() & executeQuery() : START");
Reference<XStatement> xStmt = pConnection->createStatement();
Reference<XResultSet> xRes;
if(xStmt.is())
{
- OSL_TRACE(": got statement\n");
+ OSL_TRACE(": got statement");
OSL_TRACE(": excuteQuery() : START \n");
// SELECT "First Name", "Display Name", "E-mail" FROM tablename
OUString sqlPrefix(RTL_CONSTASCII_USTRINGPARAM("SELECT \"First Name\", \"Display Name\",
\"E-mail\" FROM "));
@@ -242,7 +242,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
Reference< XDatabaseMetaData > xDmd = pConnection->getMetaData();
if ( xDmd.is() )
{
- OSL_TRACE("getTables() : START\n");
+ OSL_TRACE("getTables() : START");
OUString qut = xDmd->getIdentifierQuoteString();
Reference<XResultSet> xRes = xDmd->getTables(
@@ -255,7 +255,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
{
Reference<XRow> xRow(xRes,UNO_QUERY);
const char *strTableName = OUtoCStr(xRow->getString(3));
- OSL_TRACE("Testing Table:%s\n",strTableName);
+ OSL_TRACE("Testing Table:%s",strTableName);
Reference<XResultSet> tmpRes =
xStmt->executeQuery(sqlPrefix + qut + xRow->getString(3) + qut);
@@ -264,27 +264,27 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
clsRes->close();
nTables++;
}
- OSL_TRACE("Tested Tables:%d\n",nTables);
+ OSL_TRACE("Tested Tables:%d",nTables);
}
} catch ( Exception &e ) {
- OSL_TRACE( "Exception caught : %s\n", OUtoCStr( e.Message) );
+ OSL_TRACE( "Exception caught : %s", OUtoCStr( e.Message) );
}
// catch (...) {
// OSL_TRACE( "Non-UNO Exception caught\n" );
// }
- OSL_TRACE("excuteQuery() : END \n");
+ OSL_TRACE("excuteQuery() : END");
}
else
{
- OSL_TRACE(": FAILED to get statement\n");
+ OSL_TRACE(": FAILED to get statement");
}
- OSL_TRACE("Testing createStatement() & executeQuery() : END\n");
+ OSL_TRACE("Testing createStatement() & executeQuery() : END");
}
Reference< ::com::sun::star::sdbc::XConnection> TestConnected
(Reference< ::com::sun::star::sdbc::XDriver> &pDriver)
{
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> pConnection;
- OSL_TRACE("Begin Connect!\n");
+ OSL_TRACE("Begin Connect!");
OUString url;
Sequence<PropertyValue> aValue;
int nType=0;
@@ -336,7 +336,7 @@ int autoTest(Reference<XResultSet> &xRes)
{
nRows++;
}
- OSL_TRACE( "%d Row(s)\n", nRows);
+ OSL_TRACE( "%d Row(s)", nRows);
sal_Int32 times;
sal_Int32 pos;
if (nRows)
@@ -344,7 +344,7 @@ int autoTest(Reference<XResultSet> &xRes)
for(times = 1;times < 10; times ++)
{
pos= rand() % nRows+1;
- OSL_TRACE("pos:%d\n",pos);
+ OSL_TRACE("pos:%d",pos);
xRes->absolute(pos);
printXResultSet(xRes);
}
@@ -352,7 +352,7 @@ int autoTest(Reference<XResultSet> &xRes)
}
else
{
- OSL_TRACE(": FAILED to get a ResultSet \n");
+ OSL_TRACE(": FAILED to get a ResultSet");
}
TimeValue timeValue = { 1, 0 }; //sleep 1 Seconds to give time to other threads
osl_waitThread(&timeValue);
@@ -379,15 +379,15 @@ void SAL_CALL mozThread(void*)
}
}
else
- OSL_TRACE("Can't connected!\n");
+ OSL_TRACE("Can't connected!");
}
else
{
- OSL_TRACE("No driver!\n");
+ OSL_TRACE("No driver!");
}
} catch ( Exception &e ) {
- OSL_TRACE( "Exception caught : %s\n", OUtoCStr( e.Message) );
+ OSL_TRACE( "Exception caught : %s", OUtoCStr( e.Message) );
}
// catch (...) {
// OSL_TRACE( "Non-UNO Exception caught\n" );
@@ -413,7 +413,7 @@ int _cdecl main( int argc, char * argv[] )
#endif
{
- OSL_TRACE("Init UNO\n");
+ OSL_TRACE("Init UNO");
Reference< XMultiServiceFactory > xMgr =InitializeFac();
int threadCount=THREAD_COUNT;
int nAc;
@@ -453,11 +453,11 @@ int _cdecl main( int argc, char * argv[] )
if (!xMgr.is())
{
- OSL_TRACE("Error init UNO\n");
+ OSL_TRACE("Error init UNO");
return 1;
}
else
- OSL_TRACE("UNO initted\n");
+ OSL_TRACE("UNO initted");
mMgr = xMgr;
oslThread xThreads[THREAD_COUNT];
@@ -473,7 +473,7 @@ int _cdecl main( int argc, char * argv[] )
if (osl_isThreadRunning(xThreads[index]))
osl_joinWithThread(xThreads[index]);
}
- OSL_TRACE("Exiting...\n");
+ OSL_TRACE("Exiting...");
return 0;
}
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index faad544..08a3b4a 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -687,7 +687,7 @@ static void writeLine(
}
else
{
- OSL_TRACE( "%s\n", pLine );
+ OSL_TRACE( "%s", pLine );
}
}
}
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index f4ff5bb..d8d81d9 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -782,7 +782,7 @@ Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArgume
else if( xModuleFactory.is() )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "### no context
ORegistryFactoryHelper::createInstanceWithArgumentsAndContext()!\n" );
+ OSL_TRACE( "### no context
ORegistryFactoryHelper::createInstanceWithArgumentsAndContext()!" );
#endif
return xModuleFactory->createInstanceWithArgumentsAndContext( Arguments, Reference<
XComponentContext >() );
}
@@ -817,7 +817,7 @@ Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndCo
#if OSL_DEBUG_LEVEL > 1
if (xContext.is())
{
- OSL_TRACE( "### ignoring context calling
ORegistryFactoryHelper::createInstanceWithArgumentsAndContext()!\n" );
+ OSL_TRACE( "### ignoring context calling
ORegistryFactoryHelper::createInstanceWithArgumentsAndContext()!" );
}
#endif
return xModuleFactoryDepr->createInstanceWithArguments( rArguments );
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 4dbe052..5e2b096 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -456,7 +456,7 @@ Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ )
Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::getBookmark" );
- OSL_TRACE("DBACCESS ORowSetBase::getBookmark() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::getBookmark() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
@@ -474,7 +474,7 @@ Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException)
sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLException,
RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::moveToBookmark" );
- OSL_TRACE("DBACCESS ORowSetBase::moveToBookmark(Any) Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::moveToBookmark(Any) Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
OSL_ENSURE(bookmark.hasValue(),"ORowSetBase::moveToBookmark bookmark has no value!");
::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -519,14 +519,14 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark )
throw(SQLEx
// - IsNew
aNotifier.fire( );
}
- OSL_TRACE("DBACCESS ORowSetBase::moveToBookmark(Any) = %i Clone = %i\n",bRet,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::moveToBookmark(Any) = %i Clone = %i",bRet,m_bClone);
return bRet;
}
sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows )
throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::moveRelativeToBookmark" );
- OSL_TRACE("DBACCESS ORowSetBase::moveRelativeToBookmark(Any,%i) Clone = %i\n",rows,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::moveRelativeToBookmark(Any,%i) Clone = %i",rows,m_bClone);
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -563,7 +563,7 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
// RowCount/IsRowCountFinal
fireRowcount();
}
- OSL_TRACE("DBACCESS ORowSetBase::moveRelativeToBookmark(Any,%i) = %i Clone =
%i\n",rows,bRet,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::moveRelativeToBookmark(Any,%i) = %i Clone =
%i",rows,bRet,m_bClone);
return bRet;
}
@@ -636,7 +636,7 @@ Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns( ) throw(RuntimeExcep
sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::next" );
- OSL_TRACE("DBACCESS ORowSetBase::next() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::next() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkCache();
@@ -678,7 +678,7 @@ sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException)
// - RowCount/IsRowCountFinal
fireRowcount();
}
- OSL_TRACE("DBACCESS ORowSetBase::next() = %i Clone = %i ID =
%i\n",bRet,m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::next() = %i Clone = %i ID =
%i",bRet,m_bClone,osl_getThreadIdentifier(NULL));
return bRet;
}
@@ -689,7 +689,7 @@ sal_Bool SAL_CALL ORowSetBase::isBeforeFirst( ) throw(SQLException, RuntimeExce
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
- OSL_TRACE("DBACCESS ORowSetBase::isBeforeFirst() = %i Clone = %i\n",m_bBeforeFirst,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::isBeforeFirst() = %i Clone = %i",m_bBeforeFirst,m_bClone);
return m_bBeforeFirst;
}
@@ -700,7 +700,7 @@ sal_Bool SAL_CALL ORowSetBase::isAfterLast( ) throw(SQLException, RuntimeExcept
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
- OSL_TRACE("DBACCESS ORowSetBase::isAfterLast() = %i Clone = %i\n",m_bAfterLast,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::isAfterLast() = %i Clone = %i",m_bAfterLast,m_bClone);
return m_bAfterLast;
}
@@ -714,7 +714,7 @@ sal_Bool ORowSetBase::isOnFirst()
sal_Bool SAL_CALL ORowSetBase::isFirst( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::isFirst" );
- OSL_TRACE("DBACCESS ORowSetBase::isFirst() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::isFirst() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::MutexGuard aGuard( *m_pMutex );
@@ -729,7 +729,7 @@ sal_Bool SAL_CALL ORowSetBase::isFirst( ) throw(SQLException, RuntimeException)
positionCache( MOVE_NONE_REFRESH_ONLY );
sal_Bool bIsFirst = m_pCache->isFirst();
- OSL_TRACE("DBACCESS ORowSetBase::isFirst() = %i Clone = %i\n",bIsFirst,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::isFirst() = %i Clone = %i",bIsFirst,m_bClone);
return bIsFirst;
}
@@ -742,7 +742,7 @@ sal_Bool ORowSetBase::isOnLast()
sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isLast"
);
- OSL_TRACE("DBACCESS ORowSetBase::isLast() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::isLast() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
@@ -761,14 +761,14 @@ sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException,
RuntimeException)
positionCache( MOVE_NONE_REFRESH_ONLY );
sal_Bool bIsLast = m_pCache->isLast();
- OSL_TRACE("DBACCESS ORowSetBase::isLast() = %i Clone = %i\n",bIsLast,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::isLast() = %i Clone = %i",bIsLast,m_bClone);
return bIsLast;
}
void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::beforeFirst" );
- OSL_TRACE("DBACCESS ORowSetBase::beforeFirst() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::beforeFirst() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -804,13 +804,13 @@ void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException,
RuntimeException)
// to be done _after_ the notifications!
m_aOldRow->clearRow();
}
- OSL_TRACE("DBACCESS ORowSetBase::beforeFirst() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::beforeFirst() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
}
void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::afterLast" );
- OSL_TRACE("DBACCESS ORowSetBase::afterLast() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::afterLast() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -844,14 +844,14 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException)
fireRowcount();
}
}
- OSL_TRACE("DBACCESS ORowSetBase::afterLast() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::afterLast() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
}
sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::move" );
- OSL_TRACE("DBACCESS ORowSetBase::move() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::move() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkPositioningAllowed();
@@ -891,14 +891,14 @@ sal_Bool SAL_CALL ORowSetBase::move(
::std::mem_fun_t<sal_Bool,ORowSetBase>&
// - RowCount/IsRowCountFinal
fireRowcount();
}
- OSL_TRACE("DBACCESS ORowSetBase::move() = %i Clone = %i\n",bRet,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::move() = %i Clone = %i",bRet,m_bClone);
return bRet;
}
sal_Bool SAL_CALL ORowSetBase::first( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::first"
);
- OSL_TRACE("DBACCESS ORowSetBase::first() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::first() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::std::mem_fun_t<sal_Bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst);
::std::mem_fun_t<sal_Bool,ORowSetCache> F_tmp(&ORowSetCache::first);
return move(ioF_tmp,F_tmp);
@@ -907,7 +907,7 @@ sal_Bool SAL_CALL ORowSetBase::first( ) throw(SQLException, RuntimeException)
sal_Bool SAL_CALL ORowSetBase::last( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::last" );
- OSL_TRACE("DBACCESS ORowSetBase::last() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::last() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::std::mem_fun_t<sal_Bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast);
::std::mem_fun_t<sal_Bool,ORowSetCache> L_tmp(&ORowSetCache::last);
return move(ioL_tmp,L_tmp);
@@ -916,7 +916,7 @@ sal_Bool SAL_CALL ORowSetBase::last( ) throw(SQLException, RuntimeException)
sal_Int32 SAL_CALL ORowSetBase::getRow( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getRow"
);
- OSL_TRACE("DBACCESS ORowSetBase::getRow() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::getRow() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
@@ -946,14 +946,14 @@ sal_Int32 ORowSetBase::impl_getRow()
}
nPos = m_pCache->getRow();
}
- OSL_TRACE("DBACCESS ORowSetBase::impl_getRow() = %i Clone = %i ID =
%i\n",nPos,m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::impl_getRow() = %i Clone = %i ID =
%i",nPos,m_bClone,osl_getThreadIdentifier(NULL));
return nPos;
}
sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::absolute" );
- OSL_TRACE("DBACCESS ORowSetBase::absolute(%i) Clone = %i\n",row,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::absolute(%i) Clone = %i",row,m_bClone);
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkPositioningAllowed();
@@ -992,14 +992,14 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException,
Run
// - RowCount/IsRowCountFinal
fireRowcount();
}
- OSL_TRACE("DBACCESS ORowSetBase::absolute(%i) = %i Clone = %i\n",row,bRet,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::absolute(%i) = %i Clone = %i",row,bRet,m_bClone);
return bRet;
}
sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::relative" );
- OSL_TRACE("DBACCESS ORowSetBase::relative(%i) Clone = %i\n",rows,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::relative(%i) Clone = %i",rows,m_bClone);
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -1048,14 +1048,14 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows )
throw(SQLException, Ru
// - RowCount/IsRowCountFinal
fireRowcount();
}
- OSL_TRACE("DBACCESS ORowSetBase::relative(%i) = %i Clone = %i\n",rows,bRet,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::relative(%i) = %i Clone = %i",rows,bRet,m_bClone);
return bRet;
}
sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::previous" );
- OSL_TRACE("DBACCESS ORowSetBase::previous() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::previous() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -1101,14 +1101,14 @@ sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException,
RuntimeException
// - RowCount/IsRowCountFinal
fireRowcount();
}
- OSL_TRACE("DBACCESS ORowSetBase::previous() = %i Clone = %i\n",bRet,m_bClone);
+ OSL_TRACE("DBACCESS ORowSetBase::previous() = %i Clone = %i",bRet,m_bClone);
return bRet;
}
void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const ORowSetRow&
_rOldValues, ::osl::ResettableMutexGuard& _rGuard )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::setCurrentRow" );
- OSL_TRACE("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
m_bBeforeFirst = m_pCache->isBeforeFirst();
m_bAfterLast = m_pCache->isAfterLast();
@@ -1169,7 +1169,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const
OR
// - cursorMoved
notifyAllListenersCursorMoved( _rGuard );
- OSL_TRACE("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
}
void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeException )
@@ -1277,7 +1277,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
return;
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::firePropertyChange" );
- OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
OSL_ENSURE(m_pColumns,"Columns can not be NULL here!");
sal_Int32 i=0;
try
@@ -1290,7 +1290,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
{
OSL_FAIL("firePropertyChange: Exception");
}
- OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
}
void ORowSetBase::firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue&
_rOldValue)
@@ -1336,7 +1336,7 @@ void ORowSetBase::fireProperty( sal_Int32 _nProperty, sal_Bool _bNew,
sal_Bool _
void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::positionCache" );
- OSL_TRACE("DBACCESS ORowSetBase::positionCache() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::positionCache() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
sal_Bool bSuccess = sal_False;
if ( m_aBookmark.hasValue() )
@@ -1387,7 +1387,7 @@ void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
OSL_ENSURE( bSuccess, "ORowSetBase::positionCache: failed!" );
(void)bSuccess;
- OSL_TRACE("DBACCESS ORowSetBase::positionCache() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::positionCache() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
}
void ORowSetBase::checkCache()
@@ -1401,7 +1401,7 @@ void ORowSetBase::checkCache()
void ORowSetBase::movementFailed()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com",
"ORowSetBase::movementFailed" );
- OSL_TRACE("DBACCESS ORowSetBase::movementFailed() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::movementFailed() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
m_aOldRow->clearRow();
m_aCurrentRow = m_pCache->getEnd();
m_bBeforeFirst = m_pCache->isBeforeFirst();
@@ -1409,7 +1409,7 @@ void ORowSetBase::movementFailed()
m_aBookmark = Any();
m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!");
- OSL_TRACE("DBACCESS ORowSetBase::movementFailed() Clone = %i ID =
%i\n",m_bClone,osl_getThreadIdentifier(NULL));
+ OSL_TRACE("DBACCESS ORowSetBase::movementFailed() Clone = %i ID =
%i",m_bClone,osl_getThreadIdentifier(NULL));
}
ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 01e7f92..a0768dd 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -987,11 +987,11 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface )
m_aProgressBar.SetValue( 100 );
m_xAbortChannel.clear();
- OSL_TRACE( " startProgress handler: stop\n" );
+ OSL_TRACE( " startProgress handler: stop" );
}
else
{
- OSL_TRACE( " startProgress handler: start\n" );
+ OSL_TRACE( " startProgress handler: start" );
}
m_aCancelBtn.Enable( bLockInterface );
@@ -1015,13 +1015,13 @@ void ExtMgrDialog::showProgress( bool _bStart )
{
m_nProgress = 0;
m_bStartProgress = true;
- OSL_TRACE( "showProgress start\n" );
+ OSL_TRACE( "showProgress start" );
}
else
{
m_nProgress = 100;
m_bStopProgress = true;
- OSL_TRACE( "showProgress stop!\n" );
+ OSL_TRACE( "showProgress stop!" );
}
DialogHelper::PostUserEvent( LINK( this, ExtMgrDialog, startProgress ), (void*) bStart );
@@ -1400,11 +1400,11 @@ IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface )
if ( m_aProgressBar.IsVisible() )
m_aProgressBar.SetValue( 100 );
m_xAbortChannel.clear();
- OSL_TRACE( " startProgress handler: stop\n" );
+ OSL_TRACE( " startProgress handler: stop" );
}
else
{
- OSL_TRACE( " startProgress handler: start\n" );
+ OSL_TRACE( " startProgress handler: start" );
}
m_aCancelBtn.Enable( bLockInterface );
@@ -1425,13 +1425,13 @@ void UpdateRequiredDialog::showProgress( bool _bStart )
{
m_nProgress = 0;
m_bStartProgress = true;
- OSL_TRACE( "showProgress start\n" );
+ OSL_TRACE( "showProgress start" );
}
else
{
m_nProgress = 100;
m_bStopProgress = true;
- OSL_TRACE( "showProgress stop!\n" );
+ OSL_TRACE( "showProgress stop!" );
}
DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, startProgress ), (void*) bStart
);
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 465993c..906f034 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -214,7 +214,7 @@ bool MigrationImpl::initializeMigration()
bRet = m_aInfo.userdata.getLength() > 0;
}
- OSL_TRACE( "Migration %s\n", bRet ? "needed" : "not required" );
+ OSL_TRACE( "Migration %s", bRet ? "needed" : "not required" );
return bRet;
}
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index fb6cab0..7a69045 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -136,7 +136,7 @@ namespace accessibility
{
#ifdef DBG_UTIL
DBG_CTOR( AccessibleEditableTextPara, NULL );
- OSL_TRACE( "AccessibleEditableTextPara received ID: %d\n", mnNotifierClientId );
+ OSL_TRACE( "AccessibleEditableTextPara received ID: %d", mnNotifierClientId );
#endif
try
@@ -169,7 +169,7 @@ namespace accessibility
{
::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
#ifdef DBG_UTIL
- OSL_TRACE( "AccessibleEditableTextPara revoked ID: %d\n", mnNotifierClientId );
+ OSL_TRACE( "AccessibleEditableTextPara revoked ID: %d", mnNotifierClientId );
#endif
}
catch (const uno::Exception&)
@@ -360,7 +360,7 @@ namespace accessibility
// #106234# Delegate to EventNotifier
::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId,
xThis );
#ifdef DBG_UTIL
- OSL_TRACE( "Disposed ID: %d\n", nClientId );
+ OSL_TRACE( "Disposed ID: %d", nClientId );
#endif
}
catch (const uno::Exception&)
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx
b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 23ec937..18a2d1c 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -104,7 +104,7 @@ namespace accessibility
{
::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
#ifdef DBG_UTIL
- OSL_TRACE( "AccessibleImageBullet revoked ID: %d\n", mnNotifierClientId );
+ OSL_TRACE( "AccessibleImageBullet revoked ID: %d", mnNotifierClientId );
#endif
}
catch( const uno::Exception& ) {}
diff --git a/extensions/source/update/check/updateprotocol.cxx
b/extensions/source/update/check/updateprotocol.cxx
index e5e1087..a304ee3 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -96,7 +96,7 @@ checkForUpdates(
uno::Reference< task::XInteractionHandler > const & rxInteractionHandler,
const uno::Reference< deployment::XUpdateInformationProvider >& rUpdateInfoProvider)
{
- OSL_TRACE("checking for updates ..\n");
+ OSL_TRACE("checking for updates ..");
::rtl::OUString myArch;
::rtl::OUString myOS;
diff --git a/extensions/source/update/feed/updatefeed.cxx
b/extensions/source/update/feed/updatefeed.cxx
index f69f5da..6f6ce11 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -95,7 +95,7 @@ public:
{
sal_Int32 n = m_xStream->readBytes(aData, nBytesToRead);
if ( n )
- OSL_TRACE( "Read [%d] bytes: %s\n", n, aData.get()->elements );
+ OSL_TRACE( "Read [%d] bytes: %s", n, aData.get()->elements );
return n;
};
virtual sal_Int32 SAL_CALL readSomeBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32
nMaxBytesToRead)
@@ -103,7 +103,7 @@ public:
{
sal_Int32 n = m_xStream->readSomeBytes(aData, nMaxBytesToRead);
if ( n )
- OSL_TRACE( "Read [%d] bytes: %s\n", n, aData.get()->elements );
+ OSL_TRACE( "Read [%d] bytes: %s", n, aData.get()->elements );
return n;
};
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 9f8fefd..3669681 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -228,7 +228,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
LABEL_TOGGLE( PREVIEW );
LABEL_TOGGLE( SELECTION );
default:
- OSL_TRACE("Handle unknown control %d\n", i);
+ OSL_TRACE("Handle unknown control %d", i);
break;
}
@@ -257,7 +257,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
LABEL_LIST( TEMPLATE );
LABEL_LIST( IMAGE_TEMPLATE );
default:
- OSL_TRACE("Handle unknown control %d\n", i);
+ OSL_TRACE("Handle unknown control %d", i);
break;
}
@@ -714,7 +714,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeE
{
OSL_ASSERT( m_pDialog != NULL );
- OSL_TRACE( "GetCURRENTfilter\n" );
+ OSL_TRACE( "GetCURRENTfilter" );
UpdateFilterfromUI();
@@ -815,7 +815,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
int nCount = g_slist_length( pPathList );
int nIndex = 0;
- OSL_TRACE( "GETFILES called %d files\n", nCount );
+ OSL_TRACE( "GETFILES called %d files", nCount );
// get the current action setting
GtkFileChooserAction eAction = gtk_file_chooser_get_action(
@@ -930,7 +930,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
OUString sExtension = OUString(RTL_CONSTASCII_USTRINGPARAM( "." )) + sToken;
OUString &rBase = aSelectedFiles[nIndex];
sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength();
- OSL_TRACE( "idx are %d %d\n", rBase.lastIndexOf( sExtension ), nExtensionIdx );
+ OSL_TRACE( "idx are %d %d", rBase.lastIndexOf( sExtension ), nExtensionIdx );
if( rBase.lastIndexOf( sExtension ) != nExtensionIdx )
rBase += sExtension;
@@ -958,7 +958,7 @@ void SAL_CALL SalGtkFilePicker::setTitle( const rtl::OUString& rTitle ) throw( u
sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
{
- OSL_TRACE( "1: HERE WE ARE\n");
+ OSL_TRACE( "1: HERE WE ARE");
OSL_ASSERT( m_pDialog != NULL );
GdkThreadLock aLock;
@@ -1066,7 +1066,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
{
FilePickerEvent evt;
evt.ElementId = PUSHBUTTON_PLAY;
- OSL_TRACE( "filter_changed, isn't it great %x\n", this);
+ OSL_TRACE( "filter_changed, isn't it great %x", this);
controlStateChanged( evt );
btn = GTK_RESPONSE_NO;
}
@@ -1129,7 +1129,7 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
MAP_LIST_LABEL( TEMPLATE );
MAP_LIST_LABEL( IMAGE_TEMPLATE );
default:
- OSL_TRACE("Handle unknown control %d\n", nControlId);
+ OSL_TRACE("Handle unknown control %d", nControlId);
break;
}
#undef MAP
@@ -1296,14 +1296,14 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16
nContr
{
OSL_ASSERT( m_pDialog != NULL );
- OSL_TRACE( "SETTING VALUE %d\n", nControlAction );
+ OSL_TRACE( "SETTING VALUE %d", nControlAction );
GType tType;
GtkWidget *pWidget;
GdkThreadLock aLock;
if( !( pWidget = getWidget( nControlId, &tType ) ) )
- OSL_TRACE("enable unknown control %d\n", nControlId);
+ OSL_TRACE("enable unknown control %d", nControlId);
else if( tType == GTK_TYPE_TOGGLE_BUTTON )
{
sal_Bool bChecked = false;
@@ -1332,7 +1332,7 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16
nC
GdkThreadLock aLock;
if( !( pWidget = getWidget( nControlId, &tType ) ) )
- OSL_TRACE("enable unknown control %d\n", nControlId);
+ OSL_TRACE("enable unknown control %d", nControlId);
else if( tType == GTK_TYPE_TOGGLE_BUTTON )
aRetval <<= (sal_Bool) gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) );
else if( tType == GTK_TYPE_COMBO_BOX )
@@ -1359,17 +1359,17 @@ throw( uno::RuntimeException )
{
if( bEnable )
{
- OSL_TRACE( "enable\n" );
+ OSL_TRACE( "enable" );
gtk_widget_set_sensitive( pWidget, sal_True );
}
else
{
- OSL_TRACE( "disable\n" );
+ OSL_TRACE( "disable" );
gtk_widget_set_sensitive( pWidget, sal_False );
}
}
else
- OSL_TRACE("enable unknown control %d\n", nControlId );
+ OSL_TRACE("enable unknown control %d", nControlId );
}
void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& rLabel )
@@ -1384,7 +1384,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const
::rtl::OUS
if( !( pWidget = getWidget( nControlId, &tType ) ) )
{
- OSL_TRACE("Set label on unknown control %d\n", nControlId);
+ OSL_TRACE("Set label on unknown control %d", nControlId);
return;
}
@@ -1406,7 +1406,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const
::rtl::OUS
g_object_set( pWidget, "label", aTxt.getStr(),
"use_underline", sal_True, (char *)NULL );
else
- OSL_TRACE("Can't set label on list\n");
+ OSL_TRACE("Can't set label on list");
}
rtl::OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
@@ -1421,11 +1421,11 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
GdkThreadLock aLock;
if( !( pWidget = getWidget( nControlId, &tType ) ) )
- OSL_TRACE("Get label on unknown control %d\n", nControlId);
+ OSL_TRACE("Get label on unknown control %d", nControlId);
else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType ==
GTK_TYPE_LABEL )
aTxt = gtk_button_get_label( GTK_BUTTON( pWidget ) );
else
- OSL_TRACE("Can't get label on list\n");
+ OSL_TRACE("Can't get label on list");
return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 );
}
@@ -1519,21 +1519,21 @@ void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *, GParamSpec *,
{
FilePickerEvent evt;
evt.ElementId = LISTBOX_FILTER;
- OSL_TRACE( "filter_changed, isn't it great %x\n", pobjFP );
+ OSL_TRACE( "filter_changed, isn't it great %x", pobjFP );
pobjFP->controlStateChanged( evt );
}
void SalGtkFilePicker::folder_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
{
FilePickerEvent evt;
- OSL_TRACE( "folder_changed, isn't it great %x\n", pobjFP );
+ OSL_TRACE( "folder_changed, isn't it great %x", pobjFP );
pobjFP->directoryChanged( evt );
}
void SalGtkFilePicker::selection_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
{
FilePickerEvent evt;
- OSL_TRACE( "selection_changed, isn't it great %x\n", pobjFP );
+ OSL_TRACE( "selection_changed, isn't it great %x", pobjFP );
pobjFP->fileSelectionChanged( evt );
}
@@ -1645,18 +1645,18 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>&
aArgu
case FILEOPEN_SIMPLE:
eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
first_button_text = GTK_STOCK_OPEN;
- OSL_TRACE( "3all true\n" );
+ OSL_TRACE( "3all true" );
break;
case FILESAVE_SIMPLE:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
- OSL_TRACE( "2all true\n" );
+ OSL_TRACE( "2all true" );
break;
case FILESAVE_AUTOEXTENSION_PASSWORD:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
mbToggleVisibility[PASSWORD] = true;
- OSL_TRACE( "1all true\n" );
+ OSL_TRACE( "1all true" );
// TODO
break;
case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS:
@@ -1664,21 +1664,21 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>&
aArgu
first_button_text = GTK_STOCK_SAVE;
mbToggleVisibility[PASSWORD] = true;
mbToggleVisibility[FILTEROPTIONS] = true;
- OSL_TRACE( "4all true\n" );
+ OSL_TRACE( "4all true" );
// TODO
break;
case FILESAVE_AUTOEXTENSION_SELECTION:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE; // SELECT_FOLDER ?
first_button_text = GTK_STOCK_SAVE;
mbToggleVisibility[SELECTION] = true;
- OSL_TRACE( "5all true\n" );
+ OSL_TRACE( "5all true" );
// TODO
break;
case FILESAVE_AUTOEXTENSION_TEMPLATE:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
mbListVisibility[TEMPLATE] = true;
- OSL_TRACE( "6all true\n" );
+ OSL_TRACE( "6all true" );
// TODO
break;
case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
@@ -1711,7 +1711,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>&
aArgu
case FILESAVE_AUTOEXTENSION:
eAction = GTK_FILE_CHOOSER_ACTION_SAVE;
first_button_text = GTK_STOCK_SAVE;
- OSL_TRACE( "7all true\n" );
+ OSL_TRACE( "7all true" );
// TODO
break;
default:
@@ -1845,7 +1845,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter )
OUString aShrunkName = shrinkFilterName( rFilter );
if( aShrunkName.equals( sFilterName) )
{
- OSL_TRACE( "actually setting %s\n", filtername );
+ OSL_TRACE( "actually setting %s", filtername );
gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter );
bFound = true;
}
@@ -1920,7 +1920,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter,
const O
g_strdup( rtl::OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ),
(GDestroyNotify) g_free );
- OSL_TRACE( "fustering with %s\n", rtl::OUStringToOString( aToken,
RTL_TEXTENCODING_UTF8 ).getStr());
+ OSL_TRACE( "fustering with %s", rtl::OUStringToOString( aToken,
RTL_TEXTENCODING_UTF8 ).getStr());
}
#if OSL_DEBUG_LEVEL > 0
else
@@ -2042,7 +2042,7 @@ void SalGtkFilePicker::SetFilters()
else if(m_aCurrentFilter.getLength())
SetCurFilter( m_aCurrentFilter );
- OSL_TRACE( "end setting filters\n");
+ OSL_TRACE( "end setting filters");
}
SalGtkFilePicker::~SalGtkFilePicker()
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index 3be63de..328038f 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -118,7 +118,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDir
if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
- OSL_TRACE( "setting path to %s\n", aTxt.getStr() );
+ OSL_TRACE( "setting path to %s", aTxt.getStr() );
GdkThreadLock aLock;
@@ -169,7 +169,7 @@ void SAL_CALL SalGtkFolderPicker::setTitle( const rtl::OUString& aTitle ) throw(
sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException )
{
- OSL_TRACE( "1: HERE WE ARE\n");
+ OSL_TRACE( "1: HERE WE ARE");
OSL_ASSERT( m_pDialog != NULL );
sal_Int16 retVal = 0;
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 9467152..ee8ac30 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -282,7 +282,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const rtl::OUString& aDirec
if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
- OSL_TRACE( "setting path to %s\n", aTxt.getStr() );
+ OSL_TRACE( "setting path to %s", aTxt.getStr() );
GdkThreadLock aLock;
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ),
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 732b677..b0486f6 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -653,7 +653,7 @@ XmlFilterBase& XmlFilterBase::exportDocumentProperties( Reference< XDocumentProp
writeCoreProperties( *this, xProperties );
writeAppProperties( *this, xProperties );
Sequence< ::com::sun::star::beans::NamedValue > aStats =
xProperties->getDocumentStatistics();
- OSL_TRACE( "# Document Statistics:\n" );
+ OSL_TRACE( "# Document Statistics:" );
for( sal_Int32 i = 0, end = aStats.getLength(); i < end; ++i )
{
::com::sun::star::uno::Any aValue = aStats[ i ].Value;
diff --git a/reportdesign/source/ui/report/ReportSection.cxx
b/reportdesign/source/ui/report/ReportSection.cxx
index 7e03857..9f72392 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -734,7 +734,7 @@ void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un
// -----------------------------------------------------------------------------
sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
{
- OSL_TRACE("AcceptDrop::DropEvent.Action %i\n", _rEvt.mnAction);
+ OSL_TRACE("AcceptDrop::DropEvent.Action %i", _rEvt.mnAction);
::Point aDropPos(_rEvt.maPosPixel);
const MouseEvent aMouseEvt(aDropPos);
@@ -784,7 +784,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
// -----------------------------------------------------------------------------
sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
{
- OSL_TRACE("ExecuteDrop::DropEvent.Action %i\n", _rEvt.mnAction);
+ OSL_TRACE("ExecuteDrop::DropEvent.Action %i", _rEvt.mnAction);
::Point aDropPos(PixelToLogic(_rEvt.maPosPixel));
const MouseEvent aMouseEvt(aDropPos);
if ( m_pFunc->isOverlapping(aMouseEvt) )
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx
b/reportdesign/source/ui/report/ViewsWindow.cxx
index c6d2c6c..147f274 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1062,7 +1062,7 @@ bool OViewsWindow::isObjectInMyTempList(SdrObject *_pObj)
// -----------------------------------------------------------------------------
void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection)
{
- OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d\n", _aPnt.X(), _aPnt.Y() );
+ OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d", _aPnt.X(), _aPnt.Y() );
m_aBegDragTempList.clear();
@@ -1080,14 +1080,14 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const
OSectionVi
aAbsolutePnt.Y() += nSectionHeight;
}
m_aDragDelta = Point(SAL_MAX_INT32, SAL_MAX_INT32);
- OSL_TRACE("BegDragObj Absolute X:%d Y:%d\n", aAbsolutePnt.X(), aAbsolutePnt.Y() );
+ OSL_TRACE("BegDragObj Absolute X:%d Y:%d", aAbsolutePnt.X(), aAbsolutePnt.Y() );
// Create drag lines over all viewable Views
// Therefore we need to identify the marked objects
// and create temporary objects on all other views at the same position
// relative to its occurrence.
- OSL_TRACE("BegDragObj createInvisible Objects\n" );
+ OSL_TRACE("BegDragObj createInvisible Objects" );
int nViewCount = 0;
Point aNewObjPos(0,0);
Point aLeftTop = Point(SAL_MAX_INT32, SAL_MAX_INT32);
@@ -1112,7 +1112,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const
OSectionVi
aLeftTop.X() = ::std::min( aRect.Left(), aLeftTop.X() );
aLeftTop.Y() = ::std::min( aRect.Top(), aLeftTop.Y() );
- OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d\n", aRect.Left(),
aRect.Top(), nViewCount );
+ OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d", aRect.Left(),
aRect.Top(), nViewCount );
BegDragObj_createInvisibleObjectAtPosition(aRect, rView);
}
@@ -1149,7 +1149,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const
OSectionVi
pHdl = rHdlList.GetHdl(_pHdl->GetKind());
}
}
- OSL_TRACE("BegDragObj X:%d Y:%d on View#%d\n", aNewPos.X(), aNewPos.Y(), nViewCount++ );
+ OSL_TRACE("BegDragObj X:%d Y:%d on View#%d", aNewPos.X(), aNewPos.Y(), nViewCount++ );
rReportSection.getSectionView().BegDragObj(aNewPos, (OutputDevice*)NULL, pHdl, nDrgLog,
NULL);
const long nSectionHeight =
rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
@@ -1370,7 +1370,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView*
_pSection,bo
Point aRealMousePos = _aPnt;
Point aCurrentSectionPos;
- OSL_TRACE("MovAction X:%d Y:%d\n", aRealMousePos.X(), aRealMousePos.Y() );
+ OSL_TRACE("MovAction X:%d Y:%d", aRealMousePos.X(), aRealMousePos.Y() );
Point aHdlPos;
SdrHdl* pHdl = _pSection->GetDragHdl();
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index e026b04..c18b941 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -865,7 +865,7 @@ ERRTYPE RscCompiler::Link()
aSysSearchPath.Append( cSearchDelim );
aSysSearchPath.Append( aToken );
}
- OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(),
aSysSearchPath.GetBuffer() );
+ OSL_TRACE( "setting search path for language %s: %s", it->aLangName.GetBuffer(),
aSysSearchPath.GetBuffer() );
pTC->SetSysSearchPath( aSysSearchPath );
WriteRcContext aContext;
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 4654e5a..63fbc20 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -92,7 +92,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR
#if OSL_DEBUG_LEVEL > 1
if (pLib == 0)
- OSL_TRACE("Error osl_loadModule: %s\n", dlerror());
+ OSL_TRACE("Error osl_loadModule: %s", dlerror());
#endif /* OSL_DEBUG_LEVEL */
return ((oslModule)(pLib));
@@ -168,7 +168,7 @@ osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbol)
fcnAddr = dlsym(Module, pSymbol);
if (!fcnAddr)
- OSL_TRACE("Error osl_getAsciiFunctionSymbol: %s\n", dlerror());
+ OSL_TRACE("Error osl_getAsciiFunctionSymbol: %s", dlerror());
}
#endif
@@ -249,7 +249,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
if (workDir)
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", filename);
+ OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s", filename);
#endif
rtl_string2UString(ppLibraryUrl,
filename,
@@ -281,7 +281,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
if (workDir)
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", dl_info.dli_fname);
+ OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s", dl_info.dli_fname);
#endif
rtl_string2UString(ppLibraryUrl,
dl_info.dli_fname,
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 3dc687c..fcfb050 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -909,7 +909,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
setenv("LANG", locale, 1 );
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE("_imp_getProcessLocale() returning %s as current locale.\n", locale );
+ OSL_TRACE("_imp_getProcessLocale() returning %s as current locale.", locale );
#endif
// pthread_mutex_unlock( &aLocalMutex );
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index 5fdbcb0..6deac99 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -220,7 +220,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
pPipe->m_Socket = socket(AF_UNIX, SOCK_STREAM, 0);
if ( pPipe->m_Socket < 0 )
{
- OSL_TRACE("osl_createPipe socket failed. Errno: %d; %s\n",errno, strerror(errno));
+ OSL_TRACE("osl_createPipe socket failed. Errno: %d; %s",errno, strerror(errno));
__osl_destroyPipeImpl(pPipe);
return NULL;
}
@@ -233,7 +233,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
Flags |= FD_CLOEXEC;
if (fcntl(pPipe->m_Socket, F_SETFD, Flags) == -1)
{
- OSL_TRACE("osl_createPipe failed changing socket flags. Errno: %d;
%s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe failed changing socket flags. Errno: %d;
%s",errno,strerror(errno));
}
}
@@ -259,7 +259,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
{
if ( connect(pPipe->m_Socket,(struct sockaddr *)&addr,len) >= 0 )
{
- OSL_TRACE("osl_createPipe : Pipe already in use. Errno: %d;
%s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe : Pipe already in use. Errno: %d;
%s",errno,strerror(errno));
close (pPipe->m_Socket);
__osl_destroyPipeImpl(pPipe);
return NULL;
@@ -271,7 +271,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
/* ok, fs clean */
if ( bind(pPipe->m_Socket, (struct sockaddr *)&addr, len) < 0 )
{
- OSL_TRACE("osl_createPipe : failed to bind socket. Errno: %d;
%s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe : failed to bind socket. Errno: %d;
%s",errno,strerror(errno));
close (pPipe->m_Socket);
__osl_destroyPipeImpl(pPipe);
return NULL;
@@ -288,7 +288,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
if ( listen(pPipe->m_Socket, 5) < 0 )
{
- OSL_TRACE("osl_createPipe failed to listen. Errno: %d; %s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe failed to listen. Errno: %d; %s",errno,strerror(errno));
unlink(name); /* remove filesystem entry */
close (pPipe->m_Socket);
__osl_destroyPipeImpl(pPipe);
@@ -306,7 +306,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
return (pPipe);
}
- OSL_TRACE("osl_createPipe failed to connect. Errno: %d; %s\n",errno,strerror(errno));
+ OSL_TRACE("osl_createPipe failed to connect. Errno: %d; %s",errno,strerror(errno));
}
close (pPipe->m_Socket);
@@ -388,13 +388,13 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
nRet = shutdown(ConnFD, 2);
if ( nRet < 0 )
{
- OSL_TRACE("shutdown in destroyPipe failed : '%s'\n",strerror(errno));
+ OSL_TRACE("shutdown in destroyPipe failed : '%s'",strerror(errno));
}
nRet = close(ConnFD);
if ( nRet < 0 )
{
- OSL_TRACE("close in destroyPipe failed : '%s'\n",strerror(errno));
+ OSL_TRACE("close in destroyPipe failed : '%s'",strerror(errno));
}
/* remove filesystem entry */
if ( strlen(pPipe->m_Name) > 0 )
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 07cd315..de30ddb 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -275,7 +275,7 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
if ( ( nSend = sendmsg(PipeFD, &msg, 0) ) > 0 )
{
bRet = sal_True;
- OSL_TRACE("sendFdPipe : send '%i' bytes\n",nSend);
+ OSL_TRACE("sendFdPipe : send '%i' bytes",nSend);
}
else
@@ -287,11 +287,11 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
if ( bRet && RetCode == 1 )
{
- OSL_TRACE("sendFdPipe : resource was received\n");
+ OSL_TRACE("sendFdPipe : resource was received");
}
else
{
- OSL_TRACE("sendFdPipe : resource wasn't received (error %s)\n", strerror(errno));
+ OSL_TRACE("sendFdPipe : resource wasn't received (error %s)", strerror(errno));
}
#if defined(IOCHANNEL_TRANSFER_BSD_RENO)
@@ -318,7 +318,7 @@ static oslSocket receiveFdPipe(int PipeFD)
#if defined(IOCHANNEL_TRANSFER_BSD)
- OSL_TRACE("IOCHANNEL_TRANSFER_BSD receive\n");
+ OSL_TRACE("IOCHANNEL_TRANSFER_BSD receive");
iov[0].iov_base = buffer;
iov[0].iov_len = sizeof(buffer);
@@ -351,14 +351,14 @@ static oslSocket receiveFdPipe(int PipeFD)
if ( ( nRead = recvmsg(PipeFD, &msghdr, 0) ) > 0 )
{
- OSL_TRACE("receiveFdPipe : received '%i' bytes\n",nRead);
+ OSL_TRACE("receiveFdPipe : received '%i' bytes",nRead);
}
#else
if ( ( ( nRead = recvmsg(PipeFD, &msghdr, 0) ) > 0 ) &&
( msghdr.msg_controllen == CONTROLLEN ) )
{
- OSL_TRACE("receiveFdPipe : received '%i' bytes\n",nRead);
+ OSL_TRACE("receiveFdPipe : received '%i' bytes",nRead);
memcpy(&newfd, CMSG_DATA(cmptr), sizeof(int));
}
#endif
@@ -371,7 +371,7 @@ static oslSocket receiveFdPipe(int PipeFD)
{
pSocket = __osl_createSocketImpl(newfd);
nRetCode=1;
- OSL_TRACE("received fd %i\n",newfd);
+ OSL_TRACE("received fd %i",newfd);
}
OSL_TRACE("receiveFdPipe : writing back %i",nRetCode);
@@ -489,7 +489,7 @@ static void ChildStatusProc(void *pData)
OSL_ASSERT(geteuid() == 0); /* must be root */
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
- OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno,
strerror(errno));
+ OSL_TRACE("Failed to change uid and guid, errno=%d (%s)", errno, strerror(errno));
#if defined(LINUX) || defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) ||
defined(DRAGONFLY)
unsetenv("HOME");
#else
@@ -553,7 +553,7 @@ static void ChildStatusProc(void *pData)
execv(data.m_pszArgs[0], (sal_Char **)data.m_pszArgs);
}
- OSL_TRACE("Failed to exec, errno=%d (%s)\n", errno, strerror(errno));
+ OSL_TRACE("Failed to exec, errno=%d (%s)", errno, strerror(errno));
OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
@@ -618,7 +618,7 @@ static void ChildStatusProc(void *pData)
if ( child_pid < 0)
{
- OSL_TRACE("Failed to wait for child process, errno=%d (%s)\n", errno,
strerror(errno));
+ OSL_TRACE("Failed to wait for child process, errno=%d (%s)", errno,
strerror(errno));
/*
We got an other error than EINTR. Anyway we have to wake up the
@@ -658,7 +658,7 @@ static void ChildStatusProc(void *pData)
else
{
OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
- OSL_TRACE("Failed to launch child process, child reports errno=%d (%s)\n", status,
strerror(status));
+ OSL_TRACE("Failed to launch child process, child reports errno=%d (%s)", status,
strerror(status));
/* Close pipe ends */
if ( pdata->m_pInputWrite )
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index f4def51..cfdb5ea 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -201,32 +201,32 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char
*pszProfileName, o
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_openProfile\n");
+ OSL_TRACE("In osl_openProfile");
#endif
#ifdef DEBUG_OSL_PROFILE
Flags=osl_Profile_FLUSHWRITE;
- OSL_TRACE("opening '%s'\n",pszProfileName);
+ OSL_TRACE("opening '%s'",pszProfileName);
if ( Flags == osl_Profile_DEFAULT )
{
- OSL_TRACE("with osl_Profile_DEFAULT\n");
+ OSL_TRACE("with osl_Profile_DEFAULT");
}
if ( Flags & osl_Profile_SYSTEM )
{
- OSL_TRACE("with osl_Profile_SYSTEM\n");
+ OSL_TRACE("with osl_Profile_SYSTEM");
}
if ( Flags & osl_Profile_READLOCK )
{
- OSL_TRACE("with osl_Profile_READLOCK\n");
+ OSL_TRACE("with osl_Profile_READLOCK");
}
if ( Flags & osl_Profile_WRITELOCK )
{
- OSL_TRACE("with osl_Profile_WRITELOCK\n");
+ OSL_TRACE("with osl_Profile_WRITELOCK");
}
if ( Flags & osl_Profile_FLUSHWRITE )
{
- OSL_TRACE("with osl_Profile_FLUSHWRITE\n");
+ OSL_TRACE("with osl_Profile_FLUSHWRITE");
}
#endif
@@ -234,7 +234,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
if ( ( pFile = openFileImpl(pszProfileName, Flags ) ) == NULL )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [not opened]\n");
+ OSL_TRACE("Out osl_openProfile [not opened]");
#endif
return (NULL);
}
@@ -267,7 +267,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
closeFileImpl(pFile,pProfile->m_Flags);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [ok]\n");
+ OSL_TRACE("Out osl_openProfile [ok]");
#endif
return (pProfile);
}
@@ -278,13 +278,13 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
osl_TProfileImpl* pTmpProfile;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_closeProfile\n");
+ OSL_TRACE("In osl_closeProfile");
#endif
if ( Profile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [profile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [profile==0]");
#endif
return sal_False;
}
@@ -296,7 +296,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
OSL_ASSERT(pProfile->m_bIsValid);
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [not valid]\n");
+ OSL_TRACE("Out osl_closeProfile [not valid]");
#endif
return sal_False;
}
@@ -324,7 +324,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
{
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [pProfile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [pProfile==0]");
#endif
return sal_False;
}
@@ -377,7 +377,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
free(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [ok]\n");
+ OSL_TRACE("Out osl_closeProfile [ok]");
#endif
return (sal_True);
}
@@ -390,13 +390,13 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_flushProfile()\n");
+ OSL_TRACE("In osl_flushProfile()");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [pProfile == 0]\n");
+ OSL_TRACE("Out osl_flushProfile() [pProfile == 0]");
#endif
return sal_False;
}
@@ -408,7 +408,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
OSL_ASSERT(pProfile->m_bIsValid);
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile [not valid]\n");
+ OSL_TRACE("Out osl_flushProfile [not valid]");
#endif
return sal_False;
}
@@ -418,7 +418,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
{
pthread_mutex_unlock(&(pProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [invalid file]\n");
+ OSL_TRACE("Out osl_flushProfile() [invalid file]");
#endif
return sal_False;
}
@@ -426,14 +426,14 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( pProfile->m_Flags & FLG_MODIFIED )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("swapping to storeprofile\n");
+ OSL_TRACE("swapping to storeprofile");
#endif
bRet = storeProfile(pProfile,sal_False);
OSL_ASSERT(bRet);
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [ok]\n");
+ OSL_TRACE("Out osl_flushProfile() [ok]");
#endif
pthread_mutex_unlock(&(pProfile->m_AccessLock));
return bRet;
@@ -446,13 +446,13 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
#endif
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileImpl()\n");
+ OSL_TRACE("In osl_writeProfileImpl()");
#endif
if ( !( pFile != 0 && pFile->m_Handle >= 0 ) || ( pFile->m_pWriteBuf == 0 ) )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [invalid args]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [invalid args]");
#endif
return sal_False;
}
@@ -464,7 +464,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
if ( !safeWrite(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen -
pFile->m_nWriteBufFree) )
{
- OSL_TRACE("write failed '%s'\n",strerror(errno));
+ OSL_TRACE("write failed '%s'",strerror(errno));
return (sal_False);
}
@@ -473,7 +473,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
pFile->m_nWriteBufLen=0;
pFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [ok]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [ok]");
#endif
return sal_True;
}
@@ -492,7 +492,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileString\n");
+ OSL_TRACE("In osl_readProfileString");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -500,7 +500,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pTmpProfile==0]");
#endif
return sal_False;
}
@@ -511,7 +511,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [not valid]\n");
+ OSL_TRACE("Out osl_readProfileString [not valid]");
#endif
return sal_False;
}
@@ -521,7 +521,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if ( pProfile == NULL )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pProfile==0]");
#endif
return (sal_False);
}
@@ -561,7 +561,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pStr==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pStr==0]");
#endif
return sal_False;
}
@@ -569,7 +569,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [ok]\n");
+ OSL_TRACE("Out osl_readProfileString [ok]");
#endif
return (sal_True);
@@ -584,7 +584,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
Line[0] = '\0';
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileBool\n");
+ OSL_TRACE("In osl_readProfileBool");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -601,7 +601,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileBool [ok]\n");
+ OSL_TRACE("Out osl_readProfileBool [ok]");
#endif
return (Default);
@@ -618,7 +618,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
Line[0] = '\0';
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileIdent\n");
+ OSL_TRACE("In osl_readProfileIdent");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -636,7 +636,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileIdent [ok]\n");
+ OSL_TRACE("Out osl_readProfileIdent [ok]");
#endif
return (Default);
}
@@ -655,7 +655,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
osl_TProfileImpl* pTmpProfile = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileString\n");
+ OSL_TRACE("In osl_writeProfileString");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -663,7 +663,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_writeProfileString [pTmpProfile==0]");
#endif
return sal_False;
}
@@ -675,7 +675,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not valid]\n");
+ OSL_TRACE("Out osl_writeProfileString [not valid]");
#endif
return sal_False;
}
@@ -686,7 +686,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_writeProfileString [pProfile==0]");
#endif
return (sal_False);
}
@@ -716,7 +716,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
free(Line);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not added]\n");
+ OSL_TRACE("Out osl_writeProfileString [not added]");
#endif
return (sal_False);
}
@@ -747,7 +747,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
free(Line);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not inserted]\n");
+ OSL_TRACE("Out osl_writeProfileString [not inserted]");
#endif
return (sal_False);
}
@@ -778,7 +778,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [ok]\n");
+ OSL_TRACE("Out osl_writeProfileString [ok]");
#endif
return bRet;
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
sal_Bool bRet=sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileBool\n");
+ OSL_TRACE("In osl_writeProfileBool");
#endif
if (Value)
@@ -801,7 +801,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLZERO);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileBool [ok]\n");
+ OSL_TRACE("Out osl_writeProfileBool [ok]");
#endif
return bRet;
@@ -817,7 +817,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
sal_Bool bRet=sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileIdent\n");
+ OSL_TRACE("In osl_writeProfileIdent");
#endif
for (n = 0; Strings[n] != NULL; n++);
@@ -828,7 +828,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
bRet = osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileIdent\n");
+ OSL_TRACE("Out osl_writeProfileIdent");
#endif
return bRet;
}
@@ -844,7 +844,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_removeProfileEntry\n");
+ OSL_TRACE("In osl_removeProfileEntry");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -852,7 +852,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]");
#endif
return sal_False;
}
@@ -864,7 +864,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [not valid]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [not valid]");
#endif
return sal_False;
}
@@ -876,7 +876,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]");
#endif
return (sal_False);
}
@@ -913,7 +913,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [ok]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [ok]");
#endif
return bRet;
}
@@ -930,7 +930,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_getProfileSectionEntries\n");
+ OSL_TRACE("In osl_getProfileSectionEntries");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -938,7 +938,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [pTmpProfile==0]");
#endif
return sal_False;
@@ -953,7 +953,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [not valid]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [not valid]");
#endif
return sal_False;
@@ -966,7 +966,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]");
#endif
return (0);
@@ -1017,7 +1017,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const
sal_C
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [ok]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [ok]");
#endif
return (n);
@@ -1032,7 +1032,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char*
pszBuff
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_getProfileSections\n");
+ OSL_TRACE("In osl_getProfileSections");
#endif
pTmpProfile = (osl_TProfileImpl*) Profile;
@@ -1040,7 +1040,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char*
pszBuff
if ( pTmpProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [pTmpProfile==0]\n");
+ OSL_TRACE("Out osl_getProfileSections [pTmpProfile==0]");
#endif
return sal_False;
}
@@ -1052,7 +1052,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char*
pszBuff
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [not valid]\n");
+ OSL_TRACE("Out osl_getProfileSections [not valid]");
#endif
return sal_False;
}
@@ -1064,7 +1064,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char*
pszBuff
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [pProfile==0]\n");
+ OSL_TRACE("Out osl_getProfileSections [pProfile==0]");
#endif
return (0);
}
@@ -1109,7 +1109,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char*
pszBuff
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSections [ok]\n");
+ OSL_TRACE("Out osl_getProfileSections [ok]");
#endif
return (n);
@@ -1140,7 +1140,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode
eMode)
static sal_Bool bLockingDisabled;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In OslProfile_lockFile\n");
+ OSL_TRACE("In OslProfile_lockFile");
#endif
if ( !bIsInitialized )
@@ -1164,7 +1164,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode
eMode)
if (pFile->m_Handle < 0)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [invalid file handle]\n");
+ OSL_TRACE("Out OslProfile_lockFile [invalid file handle]");
#endif
return (sal_False);
}
@@ -1173,7 +1173,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode
eMode)
if ( bLockingDisabled )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [locking disabled]\n");
+ OSL_TRACE("Out OslProfile_lockFile [locking disabled]");
#endif
return (sal_True);
}
@@ -1205,15 +1205,15 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode
eMode)
if ( fcntl(pFile->m_Handle, F_SETLKW, &lock) == -1 && errno != ENOTSUP )
#endif /* MACOSX */
{
- OSL_TRACE("fcntl returned -1 (%s)\n",strerror(errno));
+ OSL_TRACE("fcntl returned -1 (%s)",strerror(errno));
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [fcntl F_SETLKW]\n");
+ OSL_TRACE("Out OslProfile_lockFile [fcntl F_SETLKW]");
#endif
return sal_False;
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out OslProfile_lockFile [ok]\n");
+ OSL_TRACE("Out OslProfile_lockFile [ok]");
#endif
return sal_True;
}
@@ -1227,7 +1227,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption
Pro
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("setting bWriteable to TRUE\n");
+ OSL_TRACE("setting bWriteable to TRUE");
#endif
bWriteable=sal_True;
}
@@ -1235,7 +1235,7 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption
Pro
if (! bWriteable)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("opening '%s' read only\n",pszFilename);
+ OSL_TRACE("opening '%s' read only",pszFilename);
#endif
pFile->m_Handle = open(pszFilename, O_RDONLY);
@@ -1245,14 +1245,14 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename,
oslProfileOption Pro
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("opening '%s' read/write\n",pszFilename);
+ OSL_TRACE("opening '%s' read/write",pszFilename);
#endif
if (((pFile->m_Handle = open(pszFilename, O_RDWR | O_CREAT | O_EXCL, DEFAULT_PMODE)) < 0)
&&
((pFile->m_Handle = open(pszFilename, O_RDWR)) < 0))
{
free(pFile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out openFileImpl [open read/write]\n");
+ OSL_TRACE("Out openFileImpl [open read/write]");
#endif
return (NULL);
}
@@ -1272,13 +1272,13 @@ static osl_TFile* openFileImpl(const sal_Char* pszFilename,
oslProfileOption Pro
if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("locking '%s' file\n",pszFilename);
+ OSL_TRACE("locking '%s' file",pszFilename);
#endif
OslProfile_lockFile(pFile, bWriteable ? write_lock : read_lock);
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out openFileImpl [ok]\n");
+ OSL_TRACE("Out openFileImpl [ok]");
#endif
return (pFile);
}
@@ -1288,13 +1288,13 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
osl_TStamp stamp = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In closeFileImpl\n");
+ OSL_TRACE("In closeFileImpl");
#endif
if ( pFile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out closeFileImpl [pFile == 0]\n");
+ OSL_TRACE("Out closeFileImpl [pFile == 0]");
#endif
return stamp;
}
@@ -1321,7 +1321,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
free(pFile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out closeFileImpl [ok]\n");
+ OSL_TRACE("Out closeFileImpl [ok]");
#endif
return(stamp);
@@ -1331,7 +1331,7 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
{
sal_Bool bRet = sal_True;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_OslProfile_rewindFile\n");
+ OSL_TRACE("In osl_OslProfile_rewindFile");
#endif
if (pFile->m_Handle >= 0)
@@ -1339,14 +1339,14 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("rewinding\n");
+ OSL_TRACE("rewinding");
#endif
bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0L);
if (bTruncate)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("truncating\n");
+ OSL_TRACE("truncating");
#endif
bRet &= (ftruncate(pFile->m_Handle, 0L) == 0);
}
@@ -1354,7 +1354,7 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_OslProfile_rewindFile [ok]\n");
+ OSL_TRACE("Out osl_OslProfile_rewindFile [ok]");
#endif
return bRet;
}
@@ -1389,7 +1389,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile)
if ((Max = read(pFile->m_Handle, &pFile->m_ReadBuf[Bytes], Free)) < 0)
{
- OSL_TRACE("read failed '%s'\n",strerror(errno));
+ OSL_TRACE("read failed '%s'",strerror(errno));
if( pLine )
rtl_freeMemory( pLine );
@@ -1945,7 +1945,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In storeProfile\n");
+ OSL_TRACE("In storeProfile");
#endif
if (pProfile->m_Lines != NULL)
@@ -1980,7 +1980,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
pTmpFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [not flushed]\n");
+ OSL_TRACE("Out storeProfile [not flushed]");
#endif
closeFileImpl(pTmpFile,pProfile->m_Flags);
@@ -2019,7 +2019,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [ok]\n");
+ OSL_TRACE("Out storeProfile [ok]");
#endif
return (sal_True);
}
@@ -2115,7 +2115,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
if (pProfile == NULL)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("AUTOOPEN MODE\n");
+ OSL_TRACE("AUTOOPEN MODE");
#endif
if ( ( pProfile = (osl_TProfileImpl*) osl_openProfile(0, PFlags ) ) != NULL )
@@ -2126,7 +2126,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("try to acquire\n");
+ OSL_TRACE("try to acquire");
#endif
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
@@ -2136,7 +2136,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
osl_TStamp Stamp;
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("Profile acquire DEFAULT MODE\n");
+ OSL_TRACE("Profile acquire DEFAULT MODE");
#endif
if (! (pProfile->m_pFile = openFileImpl(pProfile->m_FileName, pProfile->m_Flags |
PFlags )))
return NULL;
@@ -2157,7 +2157,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("Profile acquire READ/WRITELOCK MODE\n");
+ OSL_TRACE("Profile acquire READ/WRITELOCK MODE");
#endif
/* A readlock file could not be written */
if ((pProfile->m_Flags & osl_Profile_READLOCK) && bWriteable)
@@ -2174,13 +2174,13 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In releaseProfile\n");
+ OSL_TRACE("In releaseProfile");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [profile==0]\n");
+ OSL_TRACE("Out releaseProfile [profile==0]");
#endif
return sal_False;
}
@@ -2188,14 +2188,14 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
if (pProfile->m_Flags & FLG_AUTOOPEN)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [AUTOOPEN]\n");
+ OSL_TRACE("Out releaseProfile [AUTOOPEN]");
#endif
return (osl_closeProfile((oslProfile)pProfile));
}
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("DEFAULT MODE\n");
+ OSL_TRACE("DEFAULT MODE");
#endif
if (! (pProfile->m_Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK |
osl_Profile_FLUSHWRITE )))
{
@@ -2212,7 +2212,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [ok]\n");
+ OSL_TRACE("Out releaseProfile [ok]");
#endif
return (sal_True);
}
diff --git a/sal/osl/unx/semaphor.c b/sal/osl/unx/semaphor.c
index b34395e..7cb375f 100644
--- a/sal/osl/unx/semaphor.c
+++ b/sal/osl/unx/semaphor.c
@@ -205,7 +205,7 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
if(semctl(pSem->m_Id, 0, IPC_RMID, arg) < 0)
{
- OSL_TRACE("semctl(IPC_RMID) failed. Errno: %d; %s\n", errno, strerror(errno));
+ OSL_TRACE("semctl(IPC_RMID) failed. Errno: %d; %s", errno, strerror(errno));
}
free(Semaphore);
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 39a733a..bd114d5 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -1053,7 +1053,7 @@ static oslHostAddr _osl_hostentToHostAddr (const struct hostent *he)
/* unknown address family */
/* future extensions for new families might be implemented here */
- OSL_TRACE("_osl_hostentToHostAddr: unknown address family.\n");
+ OSL_TRACE("_osl_hostentToHostAddr: unknown address family.");
OSL_ASSERT(sal_False);
__osl_destroySocketAddr( pSockAddr );
@@ -1742,7 +1742,7 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
if ( nRet != 0 )
{
pSocket->m_nLastError=errno;
- OSL_TRACE("closeSocket close error '%s'\n",strerror(errno));
+ OSL_TRACE("closeSocket close error '%s'",strerror(errno));
}
pSocket->m_Socket = OSL_INVALID_SOCKET;
@@ -2032,7 +2032,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
if( Connection == OSL_SOCKET_ERROR )
{
pSocket->m_nLastError=errno;
- OSL_TRACE("osl_acceptConnectionOnSocket : accept error '%s'\n",strerror(errno));
+ OSL_TRACE("osl_acceptConnectionOnSocket : accept error '%s'",strerror(errno));
#if defined(LINUX)
pSocket->m_bIsAccepting = sal_False;
@@ -2047,7 +2047,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
if ( pSocket->m_bIsInShutdown == sal_True )
{
close(Connection);
- OSL_TRACE("osl_acceptConnectionOnSocket : close while accept\n");
+ OSL_TRACE("osl_acceptConnectionOnSocket : close while accept");
return 0;
}
#endif /* LINUX */
@@ -2506,7 +2506,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket,
if (nRet != 0 )
{
pSocket->m_nLastError=errno;
- OSL_TRACE("shutdown error '%s'\n",strerror(errno));
+ OSL_TRACE("shutdown error '%s'",strerror(errno));
}
return (nRet==0);
}
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index bfe86f7..5202743 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -766,7 +766,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = pthread_getschedparam(pthread_self(), &policy, ¶m)) != 0)
{
- OSL_TRACE("failed to get priority of thread [%s]\n",strerror(nRet));
+ OSL_TRACE("failed to get priority of thread [%s]",strerror(nRet));
return;
}
@@ -782,7 +782,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = sched_get_priority_min(policy) ) != -1)
{
- OSL_TRACE("Min Prioriy for policy '%i' == '%i'\n",policy,nRet);
+ OSL_TRACE("Min Prioriy for policy '%i' == '%i'",policy,nRet);
g_thread.m_priority.m_Lowest=nRet;
}
#if OSL_DEBUG_LEVEL > 1
@@ -794,7 +794,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = sched_get_priority_max(policy) ) != -1)
{
- OSL_TRACE("Max Prioriy for policy '%i' == '%i'\n",policy,nRet);
+ OSL_TRACE("Max Prioriy for policy '%i' == '%i'",policy,nRet);
g_thread.m_priority.m_Highest=nRet;
}
#if OSL_DEBUG_LEVEL > 1
@@ -817,7 +817,7 @@ static void osl_thread_priority_init_Impl (void)
if ((nRet = pthread_setschedparam(pthread_self(), policy, ¶m)) != 0)
{
- OSL_TRACE("failed to change base priority of thread [%s]\n",strerror(nRet));
+ OSL_TRACE("failed to change base priority of thread [%s]",strerror(nRet));
OSL_TRACE("Thread ID '%i', Policy '%i', Priority
'%i'\n",pthread_self(),policy,param.sched_priority);
}
@@ -907,7 +907,7 @@ void SAL_CALL osl_setThreadPriority (
if ((nRet = pthread_setschedparam(pImpl->m_hThread, policy, &Param)) != 0)
{
- OSL_TRACE("failed to change thread priority [%s]\n",strerror(nRet));
+ OSL_TRACE("failed to change thread priority [%s]",strerror(nRet));
}
#endif /* NO_PTHREAD_PRIORITY */
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index 923b14b..7411e7f 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -91,7 +91,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
ifc.ifc_buf = buff;
if ( ioctl(so, SIOCGIFCONF, &ifc) < 0 )
{
- OSL_TRACE( "SIOCGIFCONF: %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFCONF: %s", strerror(errno) );
close(so);
return sal_False;
}
@@ -140,7 +140,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
if ( ret < 0 )
{
- OSL_TRACE( "SIOCGIFFLAGS: %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFFLAGS: %s", strerror(errno) );
close(so);
return ret;
}
@@ -152,7 +152,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
if (ifr.ifr_flags & IFF_LOOPBACK)
{
- OSL_TRACE( "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFFLAGS : is LOOPBACK : %s", strerror(errno) );
close(so);
return 0;
}
@@ -169,7 +169,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
#endif
if (ret < 0) {
- OSL_TRACE( "SIOCGIFADDR: %s\n", strerror(errno) );
+ OSL_TRACE( "SIOCGIFADDR: %s", strerror(errno) );
memset(hard_addr, 0, 32);
close(so);
return ret;
@@ -192,7 +192,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
ret=osl_checkAddr(hard_addr);
if (ret < 0) {
- OSL_TRACE( "SIOCGIFADDR got '00:00:00:00:00:00'\n" );
+ OSL_TRACE( "SIOCGIFADDR got '00:00:00:00:00:00'" );
return ret;
}
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 3fec90a..718f293 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -596,7 +596,7 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
if (bRet)
{
sal_Int32 commitCode;
- OSL_TRACE("osl_sendResourcePipe: handle sent successfully, verify...\n");
+ OSL_TRACE("osl_sendResourcePipe: handle sent successfully, verify...");
if (
!ReadPipe(hPipe, &commitCode, sizeof(commitCode), &bytes) ||
@@ -605,7 +605,7 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
bRet = sal_False;
}
- OSL_TRACE("osl_sendResourcePipe: exit... %d\n", bRet);
+ OSL_TRACE("osl_sendResourcePipe: exit... %d", bRet);
return(bRet);
}
@@ -623,7 +623,7 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
DWORD myProcessID = GetCurrentProcessId();
oslDescriptorType code = osl_Process_TypeNone;
- OSL_TRACE("osl_receiveResourcePipe: enter...\n");
+ OSL_TRACE("osl_receiveResourcePipe: enter...");
if (
WritePipe(hPipe, &myProcessID, sizeof(myProcessID), &bytes) &&
@@ -638,7 +638,7 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
}
else
{
- OSL_TRACE("osl_receiveResourcePipe: UKNOWN\n");
+ OSL_TRACE("osl_receiveResourcePipe: UKNOWN");
bRet = sal_False;
}
}
@@ -650,7 +650,7 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
WritePipe(hPipe, &commitCode, sizeof(commitCode), &bytes);
- OSL_TRACE("osl_receiveResourcePipe: exit... %d, %p\n", bRet, pSocket);
+ OSL_TRACE("osl_receiveResourcePipe: exit... %d, %p", bRet, pSocket);
return pSocket;
}
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 54b9268..84403846 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -196,7 +196,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
rtl_uString *FileName=NULL;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_openProfile\n");
+ OSL_TRACE("In osl_openProfile");
#endif
OSL_VERIFY(strProfileName);
@@ -219,19 +219,19 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32
Flag
// OSL_TRACE("opening '%s'\n",FileName);
if ( Flags == osl_Profile_DEFAULT )
{
- OSL_TRACE("with osl_Profile_DEFAULT \n");
+ OSL_TRACE("with osl_Profile_DEFAULT");
}
if ( Flags & osl_Profile_SYSTEM )
{
- OSL_TRACE("with osl_Profile_SYSTEM \n");
+ OSL_TRACE("with osl_Profile_SYSTEM");
}
if ( Flags & osl_Profile_READLOCK )
{
- OSL_TRACE("with osl_Profile_READLOCK \n");
+ OSL_TRACE("with osl_Profile_READLOCK");
}
if ( Flags & osl_Profile_WRITELOCK )
{
- OSL_TRACE("with osl_Profile_WRITELOCK \n");
+ OSL_TRACE("with osl_Profile_WRITELOCK");
}
/* if ( Flags & osl_Profile_READWRITE ) */
/* { */
@@ -239,14 +239,14 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32
Flag
/* } */
if ( Flags & osl_Profile_FLUSHWRITE )
{
- OSL_TRACE("with osl_Profile_FLUSHWRITE \n");
+ OSL_TRACE("with osl_Profile_FLUSHWRITE");
}
#endif
if ( (! (Flags & osl_Profile_SYSTEM)) && ( (pFile = openFileImpl(FileName, Flags) ) == NULL ) )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [not opened]\n");
+ OSL_TRACE("Out osl_openProfile [not opened]");
#endif
if( FileName)
rtl_uString_release( FileName);
@@ -273,7 +273,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
closeFileImpl(pFile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_openProfile [ok]\n");
+ OSL_TRACE("Out osl_openProfile [ok]");
#endif
if( FileName)
rtl_uString_release( FileName);
@@ -286,13 +286,13 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_closeProfile\n");
+ OSL_TRACE("In osl_closeProfile");
#endif
if ( Profile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [profile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [profile==0]");
#endif
return sal_False;
}
@@ -319,7 +319,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [pProfile==0]\n");
+ OSL_TRACE("Out osl_closeProfile [pProfile==0]");
#endif
return sal_False;
}
@@ -364,7 +364,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
free(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_closeProfile [ok]\n");
+ OSL_TRACE("Out osl_closeProfile [ok]");
#endif
return (sal_True);
}
@@ -377,13 +377,13 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_flushProfile()\n");
+ OSL_TRACE("In osl_flushProfile()");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [pProfile == 0]\n");
+ OSL_TRACE("Out osl_flushProfile() [pProfile == 0]");
#endif
return sal_False;
}
@@ -392,7 +392,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( !( pFile != 0 && pFile->m_Handle >= 0 ) )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [invalid file]\n");
+ OSL_TRACE("Out osl_flushProfile() [invalid file]");
#endif
return sal_False;
}
@@ -400,13 +400,13 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( pProfile->m_Flags & FLG_MODIFIED )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("swapping to storeprofile\n");
+ OSL_TRACE("swapping to storeprofile");
#endif
bRet = storeProfile(pProfile,sal_False);
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_flushProfile() [ok]\n");
+ OSL_TRACE("Out osl_flushProfile() [ok]");
#endif
return bRet;
}
@@ -417,13 +417,13 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
BOOL bRet;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileImpl()\n");
+ OSL_TRACE("In osl_writeProfileImpl()");
#endif
if ( !( pFile != 0 && pFile->m_Handle != INVALID_HANDLE_VALUE ) || ( pFile->m_pWriteBuf == 0 )
)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [invalid args]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [invalid args]");
#endif
return sal_False;
}
@@ -439,7 +439,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
{
OSL_ENSURE(bRet,"WriteFile failed!!!");
- OSL_TRACE("write failed '%s'\n",strerror(errno));
+ OSL_TRACE("write failed '%s'",strerror(errno));
/* OSL_TRACE("Out osl_writeProfileImpl() [write '%s']\n",strerror(errno));*/
return (sal_False);
@@ -451,7 +451,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
pFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileImpl() [ok]\n");
+ OSL_TRACE("Out osl_writeProfileImpl() [ok]");
#endif
return sal_True;
}
@@ -469,7 +469,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileString\n");
+ OSL_TRACE("In osl_readProfileString");
#endif
pProfile = acquireProfile(Profile, sal_False);
@@ -477,7 +477,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pProfile==0]");
#endif
@@ -517,7 +517,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
if ( pStr == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [pStr==0]\n");
+ OSL_TRACE("Out osl_readProfileString [pStr==0]");
#endif
@@ -525,7 +525,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileString [ok]\n");
+ OSL_TRACE("Out osl_readProfileString [ok]");
#endif
@@ -542,7 +542,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
sal_Char Line[32];
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileBool\n");
+ OSL_TRACE("In osl_readProfileBool");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -559,7 +559,7 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileBool [ok]\n");
+ OSL_TRACE("Out osl_readProfileBool [ok]");
#endif
return (Default);
@@ -575,7 +575,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
sal_Char Line[256];
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_readProfileIdent\n");
+ OSL_TRACE("In osl_readProfileIdent");
#endif
if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), ""))
@@ -593,7 +593,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_readProfileIdent [ok]\n");
+ OSL_TRACE("Out osl_readProfileIdent [ok]");
#endif
return (Default);
}
@@ -611,7 +611,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
osl_TProfileImpl* pProfile = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileString\n");
+ OSL_TRACE("In osl_writeProfileString");
#endif
pProfile = acquireProfile(Profile, sal_True);
@@ -619,7 +619,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [pProfile==0]\n");
+ OSL_TRACE("Out osl_writeProfileString [pProfile==0]");
#endif
return (sal_False);
}
@@ -642,7 +642,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
{
releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not added]\n");
+ OSL_TRACE("Out osl_writeProfileString [not added]");
#endif
return (sal_False);
}
@@ -668,7 +668,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
{
releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [not inserted]\n");
+ OSL_TRACE("Out osl_writeProfileString [not inserted]");
#endif
return (sal_False);
}
@@ -695,7 +695,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
bRet = releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileString [ok]\n");
+ OSL_TRACE("Out osl_writeProfileString [ok]");
#endif
return bRet;
}
@@ -708,7 +708,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileBool\n");
+ OSL_TRACE("In osl_writeProfileBool");
#endif
if (Value)
@@ -717,7 +717,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLZERO);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileBool [ok]\n");
+ OSL_TRACE("Out osl_writeProfileBool [ok]");
#endif
return bRet;
@@ -733,7 +733,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_writeProfileIdent\n");
+ OSL_TRACE("In osl_writeProfileIdent");
#endif
for (n = 0; Strings[n] != NULL; n++);
@@ -744,7 +744,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
bRet=osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_writeProfileIdent\n");
+ OSL_TRACE("Out osl_writeProfileIdent");
#endif
return bRet;
}
@@ -759,7 +759,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
sal_Bool bRet = sal_False;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_removeProfileEntry\n");
+ OSL_TRACE("In osl_removeProfileEntry");
#endif
pProfile = acquireProfile(Profile, sal_True);
@@ -767,7 +767,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]");
#endif
@@ -806,7 +806,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
bRet = releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_removeProfileEntry [ok]\n");
+ OSL_TRACE("Out osl_removeProfileEntry [ok]");
#endif
return bRet;
}
@@ -821,7 +821,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
osl_TProfileImpl* pProfile = 0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In osl_getProfileSectionEntries\n");
+ OSL_TRACE("In osl_getProfileSectionEntries");
#endif
pProfile = acquireProfile(Profile, sal_False);
@@ -829,7 +829,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
if (pProfile == NULL)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]");
#endif
@@ -881,7 +881,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
releaseProfile(pProfile);
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out osl_getProfileSectionEntries [ok]\n");
+ OSL_TRACE("Out osl_getProfileSectionEntries [ok]");
#endif
return (n);
@@ -1269,7 +1269,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption
Profi
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("setting bWriteable to TRUE\n");
+ OSL_TRACE("setting bWriteable to TRUE");
#endif
bWriteable=sal_True;
}
@@ -1286,7 +1286,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption
Profi
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("opening '%s' read/write\n",pszFilename);
+ OSL_TRACE("opening '%s' read/write",pszFilename);
#endif
if ((pFile->m_Handle = CreateFileW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr(
strFileName )), GENERIC_READ | GENERIC_WRITE,
@@ -1306,7 +1306,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption
Profi
if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) )
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("locking '%s' file\n",pszFilename);
+ OSL_TRACE("locking '%s' file",pszFilename);
#endif
lockFile(pFile, bWriteable ? write_lock : read_lock);
@@ -1976,7 +1976,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In storeProfile\n");
+ OSL_TRACE("In storeProfile");
#endif
if (pProfile->m_Lines != NULL)
@@ -2011,7 +2011,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
pTmpFile->m_nWriteBufFree=0;
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [not flushed]\n");
+ OSL_TRACE("Out storeProfile [not flushed]");
#endif
closeFileImpl(pTmpFile);
@@ -2051,7 +2051,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out storeProfile [ok]\n");
+ OSL_TRACE("Out storeProfile [ok]");
#endif
return (sal_True);
}
@@ -2181,7 +2181,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
if (pProfile == NULL)
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("AUTOOPEN MODE\n");
+ OSL_TRACE("AUTOOPEN MODE");
#endif
@@ -2194,7 +2194,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("try to acquire\n");
+ OSL_TRACE("try to acquire");
#endif
@@ -2206,7 +2206,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
{
osl_TStamp Stamp;
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("DEFAULT MODE\n");
+ OSL_TRACE("DEFAULT MODE");
#endif
pProfile->m_pFile = openFileImpl(
pProfile->m_strFileName, pProfile->m_Flags | PFlags);
@@ -2225,7 +2225,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("READ/WRITELOCK MODE\n");
+ OSL_TRACE("READ/WRITELOCK MODE");
#endif
@@ -2244,13 +2244,13 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool
bWriteable)
static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("In releaseProfile\n");
+ OSL_TRACE("In releaseProfile");
#endif
if ( pProfile == 0 )
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [profile==0]\n");
+ OSL_TRACE("Out releaseProfile [profile==0]");
#endif
return sal_False;
}
@@ -2260,14 +2260,14 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
if (pProfile->m_Flags & FLG_AUTOOPEN)
{
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [AUTOOPEN]\n");
+ OSL_TRACE("Out releaseProfile [AUTOOPEN]");
#endif
return (osl_closeProfile((oslProfile)pProfile));
}
else
{
#ifdef DEBUG_OSL_PROFILE
- OSL_TRACE("DEFAULT MODE\n");
+ OSL_TRACE("DEFAULT MODE");
#endif
if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
@@ -2282,7 +2282,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
}
#ifdef TRACE_OSL_PROFILE
- OSL_TRACE("Out releaseProfile [ok]\n");
+ OSL_TRACE("Out releaseProfile [ok]");
#endif
return (sal_True);
}
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 505507d..8a0bc31 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -437,9 +437,9 @@ struct LeakWarning
~LeakWarning()
{
if( g_nSocketImpl )
- OSL_TRACE( "sal_socket: %d socket instances leak\n" , g_nSocketImpl );
+ OSL_TRACE( "sal_socket: %d socket instances leak" , g_nSocketImpl );
if( g_nSocketAddr )
- OSL_TRACE( "sal_socket: %d socket address instances leak\n" , g_nSocketAddr );
+ OSL_TRACE( "sal_socket: %d socket address instances leak" , g_nSocketAddr );
}
};
LeakWarning socketWarning;
@@ -756,7 +756,7 @@ static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he)
/* unknown address family */
/* future extensions for new families might be implemented here */
- OSL_TRACE("_osl_hostentToHostAddr(): unknown address family.\n");
+ OSL_TRACE("_osl_hostentToHostAddr(): unknown address family.");
OSL_ASSERT(sal_False);
__osl_destroySocketAddr( pSocketAddr );
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index 1d514f5..e03dead 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -115,7 +115,7 @@ static void doTestDurationF(char const*const pis)
void ConverterTest::testDuration()
{
- OSL_TRACE("\nSAX CONVERTER TEST BEGIN\n");
+ OSL_TRACE("\nSAX CONVERTER TEST BEGIN");
doTest( util::Duration(false, 1, 0, 0, 0, 0, 0, 0), "P1Y" );
doTest( util::Duration(false, 0, 42, 0, 0, 0, 0, 0), "P42M" );
doTest( util::Duration(false, 0, 0, 111, 0, 0, 0, 0), "P111D" );
@@ -143,7 +143,7 @@ void ConverterTest::testDuration()
doTestDurationF("PT.1S"); // invalid: no 0 preceding .
doTestDurationF("PT5M.134S"); // invalid: no 0 preceding .
doTestDurationF("PT1.S"); // invalid: no digit following .
- OSL_TRACE("\nSAX CONVERTER TEST END\n");
+ OSL_TRACE("\nSAX CONVERTER TEST END");
}
@@ -186,7 +186,7 @@ static void doTestDateTimeF(char const*const pis)
void ConverterTest::testDateTime()
{
- OSL_TRACE("\nSAX CONVERTER TEST BEGIN\n");
+ OSL_TRACE("\nSAX CONVERTER TEST BEGIN");
doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1), "0001-01-01T00:00:00" );
doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
"0001-01-01T00:00:00Z", "0001-01-01T00:00:00" );
@@ -237,7 +237,7 @@ void ConverterTest::testDateTime()
doTestDateTimeF( "0001-01-02T00:00:00+14:01" ); // invalid: TZ > +14:00
doTestDateTimeF( "0001-01-02T00:00:00-15:00" ); // invalid: TZ < -14:00
doTestDateTimeF( "0001-01-02T00:00:00-14:01" ); // invalid: TZ < -14:00
- OSL_TRACE("\nSAX CONVERTER TEST END\n");
+ OSL_TRACE("\nSAX CONVERTER TEST END");
}
CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 3e26ff6..f4091c8 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4870,13 +4870,13 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( Destination >>= xRange ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Destination
parameter should be a range" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set range\n");
+ OSL_TRACE("set range");
}
else
{
//set as current
xRange = this;
- OSL_TRACE("set range as himself\n");
+ OSL_TRACE("set range as himself");
}
sal_Int16 xlTextParsingType = excel::XlTextParsingType::xlDelimited;
@@ -4885,7 +4885,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( DataType >>= xlTextParsingType ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataType
parameter should be a short" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set Datatype\n" );
+ OSL_TRACE("set Datatype" );
}
sal_Bool bDilimited = ( xlTextParsingType == excel::XlTextParsingType::xlDelimited );
@@ -4895,7 +4895,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( TextQualifier >>= xlTextQualifier ))
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"TextQualifier parameter should be a short" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set TextQualifier\n");
+ OSL_TRACE("set TextQualifier");
}
sal_Bool bConsecutiveDelimiter = false;
@@ -4904,7 +4904,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( ConsecutiveDelimiter >>= bConsecutiveDelimiter ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"ConsecutiveDelimiter parameter should be a boolean" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set ConsecutiveDelimiter\n");
+ OSL_TRACE("set ConsecutiveDelimiter");
}
sal_Bool bTab = false;
@@ -4913,7 +4913,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( Tab >>= bTab ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Tab parameter
should be a boolean" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set Tab\n");
+ OSL_TRACE("set Tab");
}
sal_Bool bSemicolon = false;
@@ -4922,7 +4922,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( Semicolon >>= bSemicolon ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Semicolon
parameter should be a boolean" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set Semicolon\n");
+ OSL_TRACE("set Semicolon");
}
sal_Bool bComma = false;
if( Comma.hasValue() && bDilimited )
@@ -4930,7 +4930,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( Comma >>= bComma ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Comma
parameter should be a boolean" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set Comma\n");
+ OSL_TRACE("set Comma");
}
sal_Bool bSpace = false;
if( Space.hasValue() && bDilimited )
@@ -4938,7 +4938,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( Space >>= bSpace ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Space
parameter should be a boolean" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set Space\n");
+ OSL_TRACE("set Space");
}
sal_Bool bOther = false;
rtl::OUString sOtherChar;
@@ -4950,7 +4950,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( OtherChar >>= sOtherChar ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"OtherChar parameter should be a String" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set OtherChar\n" );
+ OSL_TRACE("set OtherChar" );
}
else if( bOther )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Other
parameter should be a True" )),
@@ -4970,7 +4970,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( DecimalSeparator >>= sDecimalSeparator ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"DecimalSeparator parameter should be a String" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set DecimalSeparator\n" );
+ OSL_TRACE("set DecimalSeparator" );
}
rtl::OUString sThousandsSeparator;
if( ThousandsSeparator.hasValue() )
@@ -4978,7 +4978,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const
css::uno::Any
if( !( ThousandsSeparator >>= sThousandsSeparator ) )
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"ThousandsSeparator parameter should be a String" )),
uno::Reference< uno::XInterface >() );
- OSL_TRACE("set ThousandsSpeparator\n" );
+ OSL_TRACE("set ThousandsSpeparator" );
}
//TODO* TrailingMinusNumbers Optional Variant. Numbers that begin with a minus character.
diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
index 10b0f86..371bef8 100644
--- a/scripting/source/provider/ScriptImpl.cxx
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -51,13 +51,13 @@ throw ( RuntimeException ) :
m_RunTimeManager( runtimeMgr, UNO_SET_THROW ),
m_ScriptURI( scriptURI )
{
- OSL_TRACE( "<!constucting a ScriptImpl>\n" );
+ OSL_TRACE( "<!constucting a ScriptImpl>" );
}
//*************************************************************************
ScriptImpl::~ScriptImpl()
{
- OSL_TRACE( "<Destructing a ScriptImpl>\n" );
+ OSL_TRACE( "<Destructing a ScriptImpl>" );
}
//*************************************************************************
diff --git a/scripting/source/provider/ScriptingContext.cxx
b/scripting/source/provider/ScriptingContext.cxx
index 063e48e..abc86c8 100644
--- a/scripting/source/provider/ScriptingContext.cxx
+++ b/scripting/source/provider/ScriptingContext.cxx
@@ -58,7 +58,7 @@ ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xCont
OPropertyContainer( GetBroadcastHelper() ),
m_xContext( xContext, UNO_SET_THROW )
{
- OSL_TRACE( "< ScriptingContext ctor called >\n" );
+ OSL_TRACE( "< ScriptingContext ctor called >" );
Any nullAny;
@@ -73,7 +73,7 @@ ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xCont
ScriptingContext::~ScriptingContext()
{
- OSL_TRACE( "< ScriptingContext dtor called >\n" );
+ OSL_TRACE( "< ScriptingContext dtor called >" );
}
// -----------------------------------------------------------------------------
// OPropertySetHelper
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index 99ea643..57d0823 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -73,7 +73,7 @@ ScriptNameResolverImpl::ScriptNameResolverImpl(
const Reference< XComponentContext > & xContext ) :
m_xContext( xContext, UNO_SET_THROW )
{
- OSL_TRACE( "< ScriptNameResolverImpl ctor called >\n" );
+ OSL_TRACE( "< ScriptNameResolverImpl ctor called >" );
validateXRef( m_xContext, "ScriptNameResolverImpl::ScriptNameResolverImpl: invalid context" );
m_xMultiComFac.set( m_xContext->getServiceManager(), UNO_SET_THROW );
@@ -97,7 +97,7 @@ ScriptNameResolverImpl::ScriptNameResolverImpl(
//*************************************************************************
ScriptNameResolverImpl::~ScriptNameResolverImpl()
{
- OSL_TRACE( "< ScriptNameResolverImpl dtor called >\n" );
+ OSL_TRACE( "< ScriptNameResolverImpl dtor called >" );
s_moduleCount.modCnt.release( &s_moduleCount.modCnt );
}
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
index f2b8b13..60732d9 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
@@ -70,7 +70,7 @@ ScriptRuntimeManager::ScriptRuntimeManager(
const Reference< XComponentContext > & xContext ) :
m_xContext( xContext, UNO_SET_THROW )
{
- OSL_TRACE( "< ScriptRuntimeManager ctor called >\n" );
+ OSL_TRACE( "< ScriptRuntimeManager ctor called >" );
m_xMgr.set( m_xContext->getServiceManager(), UNO_SET_THROW );
s_moduleCount.modCnt.acquire( &s_moduleCount.modCnt );
// test
@@ -81,7 +81,7 @@ ScriptRuntimeManager::ScriptRuntimeManager(
// ScriptRuntimeManager Destructor
ScriptRuntimeManager::~ScriptRuntimeManager()
{
- OSL_TRACE( "< ScriptRuntimeManager dtor called >\n" );
+ OSL_TRACE( "< ScriptRuntimeManager dtor called >" );
s_moduleCount.modCnt.release( &s_moduleCount.modCnt );
}
@@ -91,7 +91,7 @@ Reference< runtime::XScriptInvocation > SAL_CALL ScriptRuntimeManager::getScript
const Reference< XInterface >& scriptInfo )
throw( RuntimeException )
{
- OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptRuntime\n" );
+ OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptRuntime" );
Reference< runtime::XScriptInvocation > xScriptInvocation;
@@ -124,7 +124,7 @@ Reference< runtime::XScriptNameResolver > SAL_CALL
ScriptRuntimeManager::getScriptNameResolver()
throw( RuntimeException )
{
- OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptNameResolver\n" );
+ OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptNameResolver" );
Reference< runtime::XScriptNameResolver > xScriptNameResolver;
try
@@ -156,7 +156,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
throw ( lang::IllegalArgumentException, script::CannotConvertException,
reflection::InvocationTargetException, RuntimeException )
{
- OSL_TRACE( "** ==> ScriptRuntimeManager in runtimemgr invoke\n" );
+ OSL_TRACE( "** ==> ScriptRuntimeManager in runtimemgr invoke" );
Any results;
scripting_constants::ScriptingConstantsPool& scriptingConstantsPool =
@@ -191,7 +191,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
Reference< XInterface > () );
}
- OSL_TRACE("Storage sid is: %d\n", resolvedSid);
+ OSL_TRACE("Storage sid is: %d", resolvedSid);
// modifying the XPropertySet on the resolved Context to contain the
// full script info
@@ -276,7 +276,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
Reference< XInterface > () );
}
#endif
- OSL_TRACE( "** ==> ScriptRuntimeManager returned from invoke: %s\n", ::rtl::OUStringToOString(
results.getValueTypeName(), RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+ OSL_TRACE( "** ==> ScriptRuntimeManager returned from invoke: %s", ::rtl::OUStringToOString(
results.getValueTypeName(), RTL_TEXTENCODING_ASCII_US ).pData->buffer );
return results;
}
@@ -287,7 +287,7 @@ ScriptRuntimeManager::resolve( const ::rtl::OUString& scriptURI,
Any& invocationCtx )
throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeException )
{
- OSL_TRACE( "** ==> ScriptRuntimeManager in resolve\n" );
+ OSL_TRACE( "** ==> ScriptRuntimeManager in resolve" );
Reference< storage::XScriptInfo > resolvedURI;
Reference< runtime::XScriptNameResolver > xScriptNameResolver = getScriptNameResolver();
diff --git a/scripting/source/runtimemgr/StorageBridge.cxx
b/scripting/source/runtimemgr/StorageBridge.cxx
index 3b9a774..d641e6e 100644
--- a/scripting/source/runtimemgr/StorageBridge.cxx
+++ b/scripting/source/runtimemgr/StorageBridge.cxx
@@ -98,7 +98,7 @@ StorageBridge::getScriptLogicalNames()
throw ( lang::IllegalArgumentException,
RuntimeException )
{
- OSL_TRACE( "In StorageBridge getScriptLogicalNames...\n" );
+ OSL_TRACE( "In StorageBridge getScriptLogicalNames..." );
Sequence < ::rtl::OUString > results;
try
{
@@ -117,7 +117,7 @@ Sequence < Reference< storage::XScriptInfo > >
StorageBridge::getImplementations( const ::rtl::OUString& queryURI )
throw ( lang::IllegalArgumentException, RuntimeException )
{
- OSL_TRACE( "In StorageBridge getImplementations...\n" );
+ OSL_TRACE( "In StorageBridge getImplementations..." );
Sequence < Reference< storage::XScriptInfo > > results;
try
{
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 573330b..84d9c85 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -109,11 +109,11 @@ void ChangeRequestQueueProcessor::AddRequest (
#ifdef VERBOSE
if (maQueue.empty())
{
- OSL_TRACE("Adding requests to empty queue\n");
+ OSL_TRACE("Adding requests to empty queue");
ConfigurationTracer::TraceConfiguration(
mxConfiguration, "current configuration of queue processor");
}
- OSL_TRACE("Adding request\n");
+ OSL_TRACE("Adding request");
TraceRequest(rxRequest);
#endif
@@ -133,7 +133,7 @@ void ChangeRequestQueueProcessor::StartProcessing (void)
&& ! maQueue.empty())
{
#ifdef VERBOSE
- OSL_TRACE("ChangeRequestQueueProcessor scheduling processing\n");
+ OSL_TRACE("ChangeRequestQueueProcessor scheduling processing");
#endif
mnUserEventId = Application::PostUserEvent(
LINK(this,ChangeRequestQueueProcessor,ProcessEvent));
@@ -170,7 +170,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
::osl::MutexGuard aGuard (maMutex);
#ifdef VERBOSE
- OSL_TRACE("ProcessOneEvent\n");
+ OSL_TRACE("ProcessOneEvent");
#endif
if (mxConfiguration.is()
@@ -192,7 +192,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
if (maQueue.empty())
{
#ifdef VERBOSE
- OSL_TRACE("All requests are processed\n");
+ OSL_TRACE("All requests are processed");
#endif
// The queue is empty so tell the ConfigurationManager to update
// its state.
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 1724e76..52cc840 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -185,7 +185,7 @@ void SAL_CALL ConfigurationController::disposing (void)
return;
#if defined VERBOSE && VERBOSE>=1
- OSL_TRACE("ConfigurationController::disposing\n");
+ OSL_TRACE("ConfigurationController::disposing");
OSL_TRACE(" requesting empty configuration\n");
#endif
// To destroy all resources an empty configuration is requested and then,
@@ -194,7 +194,7 @@ void SAL_CALL ConfigurationController::disposing (void)
restoreConfiguration(new Configuration(this,false));
mpImplementation->mpQueueProcessor->ProcessUntilEmpty();
#if defined VERBOSE && VERBOSE>=1
- OSL_TRACE(" all requests processed\n");
+ OSL_TRACE(" all requests processed");
#endif
// Now that all resources have been deactivated, mark the controller as
@@ -550,7 +550,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration (
// Get lists of resources that are to be activated or deactivated.
Reference<XConfiguration> xCurrentConfiguration (mpImplementation->mxRequestedConfiguration);
#if defined VERBOSE && VERBOSE>=1
- OSL_TRACE("ConfigurationController::restoreConfiguration(\n");
+ OSL_TRACE("ConfigurationController::restoreConfiguration(");
ConfigurationTracer::TraceConfiguration(rxNewConfiguration, "requested configuration");
ConfigurationTracer::TraceConfiguration(xCurrentConfiguration, "current configuration");
#endif
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index e1c285f..f4327aa 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -176,7 +176,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
if (xResource.is())
{
#if defined VERBOSE && VERBOSE>=1
- OSL_TRACE(" successfully created\n");
+ OSL_TRACE(" successfully created");
#endif
// 3. Add resource to URL->Object map.
AddResource(xResource, xFactory);
@@ -193,7 +193,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
else
{
#if defined VERBOSE && VERBOSE>=1
- OSL_TRACE(" resource creation failed\n");
+ OSL_TRACE(" resource creation failed");
#endif
}
}
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 57c887d..893c506 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -366,7 +366,7 @@ void SlideSorterModel::Resync (void)
&& maPageDescriptors[nIndex]->GetPage()
!= GetPage(nIndex))
{
- OSL_TRACE("page %d differs\n", nIndex);
+ OSL_TRACE("page %d differs", nIndex);
bIsUpToDate = false;
break;
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 509d878..8a95f11 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -709,7 +709,7 @@ void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup)
void ToolBarManager::Implementation::ResetAllToolBars (void)
{
#ifdef VERBOSE
- OSL_TRACE("resetting all tool bars\n");
+ OSL_TRACE("resetting all tool bars");
#endif
for (int i=TBG__FIRST; i<=TBG__LAST; ++i)
ResetToolBars((ToolBarGroup)i);
@@ -823,7 +823,7 @@ void ToolBarManager::Implementation::PreUpdate (void)
}
#ifdef VERBOSE
- OSL_TRACE("ToolBarManager::PreUpdate ]\n");
+ OSL_TRACE("ToolBarManager::PreUpdate ]");
#endif
}
}
@@ -863,7 +863,7 @@ void ToolBarManager::Implementation::PostUpdate (void)
}
#ifdef VERBOSE
- OSL_TRACE("ToolBarManager::PostUpdate ]\n");
+ OSL_TRACE("ToolBarManager::PostUpdate ]");
#endif
}
}
@@ -884,7 +884,7 @@ void ToolBarManager::Implementation::LockViewShellManager (void)
void ToolBarManager::Implementation::LockUpdate (void)
{
#ifdef VERBOSE
- OSL_TRACE("LockUpdate %d\n", mnLockCount);
+ OSL_TRACE("LockUpdate %d", mnLockCount);
#endif
::osl::MutexGuard aGuard(maMutex);
@@ -904,7 +904,7 @@ void ToolBarManager::Implementation::LockUpdate (void)
void ToolBarManager::Implementation::UnlockUpdate (void)
{
#ifdef VERBOSE
- OSL_TRACE("UnlockUpdate %d\n", mnLockCount);
+ OSL_TRACE("UnlockUpdate %d", mnLockCount);
#endif
::osl::MutexGuard aGuard(maMutex);
@@ -1665,7 +1665,7 @@ void ToolBarShellList::UpdateShells (
for (GroupedShellList::iterator iShell=aList.begin(); iShell!=aList.end(); ++iShell)
{
#ifdef VERBOSE
- OSL_TRACE("deactivating tool bar shell %d\n", iShell->mnId);
+ OSL_TRACE("deactivating tool bar shell %d", iShell->mnId);
#endif
rpManager->DeactivateSubShell(*rpMainViewShell, iShell->mnId);
}
@@ -1679,7 +1679,7 @@ void ToolBarShellList::UpdateShells (
for (GroupedShellList::iterator iShell=aList.begin(); iShell!=aList.end(); ++iShell)
{
#ifdef VERBOSE
- OSL_TRACE("activating tool bar shell %d\n", iShell->mnId);
+ OSL_TRACE("activating tool bar shell %d", iShell->mnId);
#endif
rpManager->ActivateSubShell(*rpMainViewShell, iShell->mnId);
}
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index c75a3ee..54bba97 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -640,13 +640,13 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString&
chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" );
if( chk == pTrailer->m_pDict->m_aMap.end() )
{
- OSL_TRACE( "no DocChecksum entry\n" );
+ OSL_TRACE( "no DocChecksum entry" );
continue;
}
pdfparse::PDFName* pChkSumName = dynamic_cast<pdfparse::PDFName*>(chk->second);
if( pChkSumName == NULL )
{
- OSL_TRACE( "no name for DocChecksum entry\n" );
+ OSL_TRACE( "no name for DocChecksum entry" );
continue;
}
@@ -657,13 +657,13 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString&
add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" );
if( add_stream == pTrailer->m_pDict->m_aMap.end() )
{
- OSL_TRACE( "no AdditionalStreams entry\n" );
+ OSL_TRACE( "no AdditionalStreams entry" );
continue;
}
pdfparse::PDFArray* pStreams =
dynamic_cast<pdfparse::PDFArray*>(add_stream->second);
if( ! pStreams || pStreams->m_aSubElements.size() < 2 )
{
- OSL_TRACE( "AdditionalStreams array too small\n" );
+ OSL_TRACE( "AdditionalStreams array too small" );
continue;
}
@@ -727,7 +727,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString&
} while( bEntered && ! bAuthenticated );
}
- OSL_TRACE( "password: %s\n", bAuthenticated ? "matches" : "does
not match" );
+ OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not
match" );
if( ! bAuthenticated )
continue;
}
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx
b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 6ef2a17..36b9a99 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -151,7 +151,7 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler,
{
}
- OSL_TRACE( "request %s selected\n", pRequest->isSelected() ? "was" : "was not" );
+ OSL_TRACE( "request %s selected", pRequest->isSelected() ? "was" : "was not" );
if( pRequest->isSelected() )
{
bSuccess = true;
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index df1a689..f8aba49 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -116,7 +116,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
rtl::OUString aURL;
if( osl_createTempFile( NULL, &aFile, &aURL.pData ) == osl_File_E_None )
{
- OSL_TRACE( "created temp file %s\n", rtl::OUStringToOString( aURL,
RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE( "created temp file %s", rtl::OUStringToOString( aURL,
RTL_TEXTENCODING_UTF8 ).getStr() );
const sal_Int32 nBufSize = 4096;
uno::Sequence<sal_Int8> aBuf(nBufSize);
// copy the bytes
@@ -155,7 +155,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
aArgs[0] <<= m_xModel;
aArgs[1] <<= xSubStream;
- OSL_TRACE( "try to instantiate subfilter\n" );
+ OSL_TRACE( "try to instantiate subfilter" );
uno::Reference< document::XFilter > xSubFilter;
try {
xSubFilter = uno::Reference<document::XFilter>(
@@ -172,7 +172,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
- OSL_TRACE( "subfilter: %p\n", xSubFilter.get() );
+ OSL_TRACE( "subfilter: %p", xSubFilter.get() );
if( xSubFilter.is() )
{
if( bAddPwdProp )
@@ -194,12 +194,12 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence<
beans::Propert
}
#if OSL_DEBUG_LEVEL > 1
else
- OSL_TRACE( "PDFIAdaptor::filter: no embedded substream set\n" );
+ OSL_TRACE( "PDFIAdaptor::filter: no embedded substream set" );
#endif
}
#if OSL_DEBUG_LEVEL > 1
else
- OSL_TRACE( "PDFIAdaptor::filter: no model set\n" );
+ OSL_TRACE( "PDFIAdaptor::filter: no model set" );
#endif
return bRet;
@@ -212,7 +212,7 @@ void SAL_CALL PDFIHybridAdaptor::cancel() throw()
//XImporter
void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >&
xDocument ) throw( lang::IllegalArgumentException )
{
- OSL_TRACE( "PDFIAdaptor::setTargetDocument\n" );
+ OSL_TRACE( "PDFIAdaptor::setTargetDocument" );
m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY );
if( xDocument.is() && ! m_xModel.is() )
throw lang::IllegalArgumentException();
@@ -293,7 +293,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
sal_Int32 nAttribs = rSourceData.getLength();
for( sal_Int32 i = 0; i < nAttribs; i++, pAttribs++ )
{
- OSL_TRACE("importer Attrib: %s\n", OUStringToOString( pAttribs->Name,
RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE("importer Attrib: %s", OUStringToOString( pAttribs->Name, RTL_TEXTENCODING_UTF8
).getStr() );
if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) )
pAttribs->Value >>= xInput;
else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
@@ -321,7 +321,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
//XImporter
void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >&
xDocument ) throw( lang::IllegalArgumentException )
{
- OSL_TRACE( "PDFIAdaptor::setTargetDocument\n" );
+ OSL_TRACE( "PDFIAdaptor::setTargetDocument" );
m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY );
if( xDocument.is() && ! m_xModel.is() )
throw lang::IllegalArgumentException();
diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx
index a8278cc..f54f90e 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -94,7 +94,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if( !xFactory.is() )
{
- OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
+ OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting." );
return 1;
}
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx
b/sdext/source/pdfimport/tree/genericelements.cxx
index e6a50a0..5206e8e 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -109,7 +109,7 @@ void Element::emitStructure( int nLevel)
x, y, w, h );
for( std::list< Element* >::iterator it = Children.begin(); it != Children.end(); ++it )
(*it)->emitStructure(nLevel+1 );
- OSL_TRACE( "%*s</%s>\n", nLevel, "", typeid( *this ).name() );
+ OSL_TRACE( "%*s</%s>", nLevel, "", typeid( *this ).name() );
}
#endif
@@ -179,7 +179,7 @@ void PolyPolyElement::visitedBy( ElementTreeVisitor& rV
#if OSL_DEBUG_LEVEL > 1
void PolyPolyElement::emitStructure( int nLevel)
{
- OSL_TRACE( "%*s<%s %p>\n", nLevel, "", typeid( *this ).name(), this );
+ OSL_TRACE( "%*s<%s %p>", nLevel, "", typeid( *this ).name(), this );
OSL_TRACE( "path=" );
int nPoly = PolyPoly.count();
for( int i = 0; i < nPoly; i++ )
@@ -195,7 +195,7 @@ void PolyPolyElement::emitStructure( int nLevel)
}
for( std::list< Element* >::iterator it = Children.begin(); it != Children.end(); ++it )
(*it)->emitStructure( nLevel+1 );
- OSL_TRACE( "%*s</%s>\n", nLevel, "", typeid( *this ).name() );
+ OSL_TRACE( "%*s</%s>", nLevel, "", typeid( *this ).name() );
}
#endif
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 098ee58..cb51cd4 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -964,7 +964,7 @@ static bool checkEncryption( const rtl::OUString&
} while( bEntered && ! bAuthenticated );
}
- OSL_TRACE( "password: %s\n", bAuthenticated ? "matches" : "does not match" );
+ OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" );
bSuccess = bAuthenticated;
}
// trash password string on heap
diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx
b/sdext/source/presenter/PresenterPaneAnimator.cxx
index f386404..dc1c0f5 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.cxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.cxx
@@ -1305,7 +1305,7 @@ void InterpolatePosition (
{
const double nQ (1 - nP);
- OSL_TRACE("InterpolatePosition %f\n", nP);
+ OSL_TRACE("InterpolatePosition %f", nP);
rSetter(
geometry::RealPoint2D(
nQ * rInitialBox.X + nP * rFinalBox.X,
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index c17e82f..e5175ac 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -103,7 +103,7 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2)
void MetadatableTest::test()
{
- OSL_TRACE("SwMetadatable test(): start\n");
+ OSL_TRACE("SwMetadatable test(): start");
::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg(
::sfx2::createXmlIdRegistry(false) );
::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
@@ -270,7 +270,7 @@ void MetadatableTest::test()
CPPUNIT_ASSERT_MESSAGE("auto-detect (styles)",
m5.GetMetadataReference() == id4);
- OSL_TRACE("sfx2::Metadatable test(): finished\n");
+ OSL_TRACE("sfx2::Metadatable test(): finished");
}
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index ea1878f..595e80f 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -728,7 +728,7 @@ XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
void
XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
{
- OSL_TRACE("RegisterMetadatableAndCreateID: %p\n", &i_rObject);
+ OSL_TRACE("RegisterMetadatableAndCreateID: %p", &i_rObject);
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"RegisterMetadatableAndCreateID called for MetadatableUndo?");
@@ -771,7 +771,7 @@ XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
{
- OSL_TRACE("UnregisterMetadatable: %p\n", &i_rObject);
+ OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
::rtl::OUString path;
::rtl::OUString idref;
@@ -789,7 +789,7 @@ void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject)
{
- OSL_TRACE("RemoveXmlIdForElement: %p\n", &i_rObject);
+ OSL_TRACE("RemoveXmlIdForElement: %p", &i_rObject);
const XmlIdReverseMap_t::iterator iter(
m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -849,7 +849,7 @@ void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
::boost::shared_ptr<MetadatableUndo>
XmlIdRegistryDocument::CreateUndo(Metadatable const& i_rObject)
{
- OSL_TRACE("CreateUndo: %p\n", &i_rObject);
+ OSL_TRACE("CreateUndo: %p", &i_rObject);
return ::boost::shared_ptr<MetadatableUndo>(
new MetadatableUndo(i_rObject.IsInContent()) );
@@ -876,7 +876,7 @@ void
XmlIdRegistryDocument::JoinMetadatables(
Metadatable & i_rMerged, Metadatable const & i_rOther)
{
- OSL_TRACE("JoinMetadatables: %p <- %p\n", &i_rMerged, &i_rOther);
+ OSL_TRACE("JoinMetadatables: %p <- %p", &i_rMerged, &i_rOther);
bool mergedOwnsRef;
::rtl::OUString path;
@@ -1161,7 +1161,7 @@ XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
void
XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
{
- OSL_TRACE("RegisterMetadatableAndCreateID: %p\n", &i_rObject);
+ OSL_TRACE("RegisterMetadatableAndCreateID: %p", &i_rObject);
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"RegisterMetadatableAndCreateID called for MetadatableUndo?");
@@ -1195,7 +1195,7 @@ XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable &
i_rObject)
void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
{
- OSL_TRACE("UnregisterMetadatable: %p\n", &i_rObject);
+ OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
::rtl::OUString path;
::rtl::OUString idref;
@@ -1215,7 +1215,7 @@ void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable&
i_rObject)
void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject)
{
- OSL_TRACE("RemoveXmlIdForElement: %p\n", &i_rObject);
+ OSL_TRACE("RemoveXmlIdForElement: %p", &i_rObject);
ClipboardXmlIdReverseMap_t::iterator iter(
m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -1232,7 +1232,7 @@ void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable&
i_rObject)
::boost::shared_ptr<MetadatableClipboard>
XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent)
{
- OSL_TRACE("CreateClipboard: \n");
+ OSL_TRACE("CreateClipboard:");
return ::boost::shared_ptr<MetadatableClipboard>(
new MetadatableClipboard(i_isInContent) );
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 0027125..346808b 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -922,7 +922,7 @@ void OGLTransitionerImpl::disposing()
osl::MutexGuard const guard( m_aMutex );
#ifdef DEBUG
- OSL_TRACE("dispose %p\n", this);
+ OSL_TRACE("dispose %p", this);
if( frame_count ) {
t6 = microsec_clock::local_time();
time_duration duration = t6 - t5;
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index b70b8ac..d03d0e3 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -1256,7 +1256,7 @@ void OGLTransitionerImpl::disposing()
osl::MutexGuard const guard( m_aMutex );
#ifdef DEBUG
- OSL_TRACE("dispose %p\n", this);
+ OSL_TRACE("dispose %p", this);
if( frame_count ) {
t6 = microsec_clock::local_time();
time_duration duration = t6 - t5;
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index 6fa833b..80e2e73 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -1228,7 +1228,7 @@ void OGLTransitionerImpl::disposing()
osl::MutexGuard const guard( m_aMutex );
#ifdef DEBUG
- OSL_TRACE("dispose %p\n", this);
+ OSL_TRACE("dispose %p", this);
if( frame_count ) {
t6 = microsec_clock::local_time();
time_duration duration = t6 - t5;
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index fd97314..e43b20f 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -819,10 +819,10 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
sal_Bool bLoopSound = sal_False;
if( !getPropertyValue( aSound, xPropSet, OUSTR("Sound")) )
- OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from
XDrawPage - using no sound\n" );
+ OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from
XDrawPage - using no sound" );
if( !getPropertyValue( bLoopSound, xPropSet, OUSTR("LoopSound") ) )
- OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no
sound\n" );
+ OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no
sound" );
NumberAnimationSharedPtr pTransition(
TransitionFactory::createSlideTransition(
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index e9f9996..7e238da 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -557,7 +557,7 @@ void DemoApp::Main()
if( !xFactory.is() )
{
- OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
+ OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting." );
exit( 1 );
}
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index b6e397b..44928d5 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -167,7 +167,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> retrieved element \"" );
OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US
).getStr() );
- OSL_TRACE( "\" from cache <\n" );
+ OSL_TRACE( "\" from cache <" );
#endif
return pEntry->aVal;
}
@@ -192,7 +192,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
{
OSL_TRACE( "> kicking element \"" );
OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US
).getStr() );
- OSL_TRACE( "\" from cache <\n" );
+ OSL_TRACE( "\" from cache <" );
}
#endif
_aKey2Element.erase( pEntry->aKey );
@@ -204,7 +204,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> replacing element \"" );
OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US
).getStr() );
- OSL_TRACE( "\" in cache <\n" );
+ OSL_TRACE( "\" in cache <" );
#endif
}
pEntry->aVal = rValue;
@@ -224,7 +224,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear()
}
_nCachedElements = 0;
#ifdef __CACHE_DIAGNOSE
- OSL_TRACE( "> cleared cache <\n" );
+ OSL_TRACE( "> cleared cache <" );
#endif
}
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 123e0b1..d4b5a8e 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -271,7 +271,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::clear() SAL_THROW(
m_block[ nPos ].m_val = t_val();
}
#ifdef __CACHE_DIAGNOSE
- OSL_TRACE( "> cleared cache\n" );
+ OSL_TRACE( "> cleared cache" );
#endif
}
diff --git a/stoc/source/servicemanager/servicemanager.cxx
b/stoc/source/servicemanager/servicemanager.cxx
index efefe0a..2f826b1 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -1199,7 +1199,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext(
{
#if OSL_DEBUG_LEVEL > 1
OString aStr( OUStringToOString( rServiceSpecifier,
RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "### ignoring given context raising service %s !!!\n",
aStr.getStr() );
+ OSL_TRACE( "### ignoring given context raising service %s !!!",
aStr.getStr() );
#endif
return xFac2->createInstance();
}
@@ -1263,7 +1263,7 @@ Reference< XInterface >
OServiceManager::createInstanceWithArgumentsAndContext(
{
#if OSL_DEBUG_LEVEL > 1
OString aStr( OUStringToOString( rServiceSpecifier,
RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "### ignoring given context raising service %s !!!\n",
aStr.getStr() );
+ OSL_TRACE( "### ignoring given context raising service %s !!!",
aStr.getStr() );
#endif
return xFac2->createInstanceWithArguments( rArguments );
}
diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx
index 36f3c62..6af69d6 100644
--- a/stoc/source/tdmanager/lrucache.hxx
+++ b/stoc/source/tdmanager/lrucache.hxx
@@ -171,7 +171,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue(
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> retrieved element \"" );
OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US
).getStr() );
- OSL_TRACE( "\" from cache <\n" );
+ OSL_TRACE( "\" from cache <" );
#endif
return pEntry->aVal;
}
@@ -196,7 +196,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
{
OSL_TRACE( "> kicking element \"" );
OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US
).getStr() );
- OSL_TRACE( "\" from cache <\n" );
+ OSL_TRACE( "\" from cache <" );
}
#endif
_aKey2Element.erase( pEntry->aKey );
@@ -208,7 +208,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> replacing element \"" );
OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US
).getStr() );
- OSL_TRACE( "\" in cache <\n" );
+ OSL_TRACE( "\" in cache <" );
#endif
}
pEntry->aVal = rValue;
@@ -227,7 +227,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear()
_pBlock[nPos].aVal = t_Val();
}
#ifdef __CACHE_DIAGNOSE
- OSL_TRACE( "> cleared cache <\n" );
+ OSL_TRACE( "> cleared cache <" );
#endif
}
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 04e7896..510a1b6 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -293,7 +293,7 @@ ManagerImpl::ManagerImpl(
ManagerImpl::~ManagerImpl()
{
OSL_ENSURE( _aProviders.size() == 0, "### still providers left!" );
- OSL_TRACE( "> TypeDescriptionManager shut down. <\n" );
+ OSL_TRACE( "> TypeDescriptionManager shut down. <" );
::g_moduleCount.modCnt.release( &::g_moduleCount.modCnt );
}
//__________________________________________________________________________________________________
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index fbbcb64..f80a141 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -105,7 +105,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
jclass cls = p_env->FindClass( "TestJavaVM");
if (cls == 0) {
- OSL_TRACE( "Can't find Prog class\n");
+ OSL_TRACE( "Can't find Prog class");
exit(1);
}
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index b5f247b..b4fbec4 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -401,7 +401,7 @@ storeError SuperBlockPage::verify (OStorePageBIOS & rBIOS)
else
{
// Double Failure.
- OSL_TRACE("OStoreSuperBlockPage::verify(): double failure.\n");
+ OSL_TRACE("OStoreSuperBlockPage::verify(): double failure.");
}
}
@@ -684,7 +684,7 @@ void OStorePageBIOS::cleanup_Impl()
if (m_ace_head.m_used > 0)
{
// Report remaining referer count.
- OSL_TRACE("store::PageBIOS::cleanup_Impl(): referer count: %d\n", m_ace_head.m_used);
+ OSL_TRACE("store::PageBIOS::cleanup_Impl(): referer count: %d", m_ace_head.m_used);
for (Ace * ace = m_ace_head.m_next; ace != &m_ace_head; ace = m_ace_head.m_next)
{
m_ace_head.m_used -= ace->m_used;
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index e09109c..a44d642 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -59,7 +59,7 @@ public:
DbgStyleSheetReferences() : mnStyles(0), mnPools(0) {}
~DbgStyleSheetReferences()
{
- OSL_TRACE("DbgStyleSheetReferences\nSfxStyleSheetBase left %ld\nSfxStyleSheetBasePool left
%ld\n", mnStyles, mnPools );
+ OSL_TRACE("DbgStyleSheetReferences\nSfxStyleSheetBase left %ld\nSfxStyleSheetBasePool left
%ld", mnStyles, mnPools );
}
sal_uInt32 mnStyles;
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index 6a3d041..38fc78a 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -100,10 +100,10 @@ bool FileChangedChecker::hasFileChanged()
IMPL_LINK(FileChangedChecker, TimerHandler, Timer *, EMPTYARG)
{
// If the file has changed, then update the graphic in the doc
- OSL_TRACE("Timeout Called \n");
+ OSL_TRACE("Timeout Called");
if(hasFileChanged())
{
- OSL_TRACE("File modified \n");
+ OSL_TRACE("File modified");
mpCallback();
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index ab194ae..84cfe9d 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1198,7 +1198,7 @@ XubString SdrView::GetStatusText()
{
if (aDragStat.IsMinMoved())
{
- OSL_TRACE("SdrView::GetStatusText(%lx) %lx\n", this, mpCurrentSdrDragMethod);
+ OSL_TRACE("SdrView::GetStatusText(%lx) %lx", this, mpCurrentSdrDragMethod);
mpCurrentSdrDragMethod->TakeSdrDragComment(aStr);
}
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8ddc77c..bac0741 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1083,12 +1083,12 @@ void DocxAttributeOutput::RunText( const String& rText, rtl_TextEncoding
/*eChar
void DocxAttributeOutput::RawText( const String& /*rText*/, bool /*bForceUnicode*/,
rtl_TextEncoding /*eCharSet*/ )
{
- OSL_TRACE("TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode,
rtl_TextEncoding eCharSet )\n" );
+ OSL_TRACE("TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode,
rtl_TextEncoding eCharSet )" );
}
void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen nPos, const SwFmtRuby&
rRuby )
{
- OSL_TRACE("TODO DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRuby
)\n" );
+ OSL_TRACE("TODO DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRuby
)" );
m_pSerializer->startElementNS( XML_w, XML_ruby, FSEND );
m_pSerializer->startElementNS( XML_w, XML_rubyPr, FSEND );
// hps
@@ -1150,7 +1150,7 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen nPos,
co
void DocxAttributeOutput::EndRuby()
{
- OSL_TRACE( "TODO DocxAttributeOutput::EndRuby()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::EndRuby()" );
EndRun( );
m_pSerializer->endElementNS( XML_w, XML_rubyBase );
m_pSerializer->endElementNS( XML_w, XML_ruby );
@@ -1243,7 +1243,7 @@ void DocxAttributeOutput::FieldVanish( const String& rTxt, ww::eField eType )
void DocxAttributeOutput::Redline( const SwRedlineData* /*pRedline*/ )
{
- OSL_TRACE( "TODO DocxAttributeOutput::Redline( const SwRedlineData* pRedline )\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::Redline( const SwRedlineData* pRedline )" );
}
/// Append the number as 2-digit when less than 10.
@@ -1330,7 +1330,7 @@ void DocxAttributeOutput::StartRedline( const SwRedlineData* pRedlineData )
break;
case nsRedlineType_t::REDLINE_FORMAT:
- OSL_TRACE( "TODO DocxAttributeOutput::StartRedline()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::StartRedline()" );
default:
break;
}
@@ -1352,7 +1352,7 @@ void DocxAttributeOutput::EndRedline()
break;
case nsRedlineType_t::REDLINE_FORMAT:
- OSL_TRACE( "TODO DocxAttributeOutput::EndRedline()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::EndRedline()" );
break;
default:
break;
@@ -1363,7 +1363,7 @@ void DocxAttributeOutput::EndRedline()
void DocxAttributeOutput::FormatDrop( const SwTxtNode& /*rNode*/, const SwFmtDrop& /*rSwFmtDrop*/,
sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/,
ww8::WW8TableNodeInfoInner::Pointer_t )
{
- OSL_TRACE( "TODO DocxAttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop&
rSwFmtDrop, sal_uInt16 nStyle )\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop&
rSwFmtDrop, sal_uInt16 nStyle )" );
}
void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
@@ -1920,7 +1920,7 @@ void DocxAttributeOutput::TableVerticalCell(
ww8::WW8TableNodeInfoInner::Pointer
void DocxAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t /*pNodeInfo*/ )
{
- OSL_TRACE( "TODO: DocxAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t
pNodeInfo )\n" );
+ OSL_TRACE( "TODO: DocxAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t
pNodeInfo )" );
}
void DocxAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner
)
@@ -1934,7 +1934,7 @@ void DocxAttributeOutput::TableNodeInfoInner(
ww8::WW8TableNodeInfoInner::Pointe
void DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
/*pTableTextNodeInfoInner*/ )
{
- OSL_TRACE( "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner )\n" );
+ OSL_TRACE( "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner )" );
}
void DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t
/*pTableTextNodeInfoInner*/ )
@@ -1946,7 +1946,7 @@ void DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t
/*
void DocxAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
{
- OSL_TRACE( "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )\n" );
+ OSL_TRACE( "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )" );
}
void DocxAttributeOutput::StartStyles()
@@ -1965,7 +1965,7 @@ void DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )
{
// are these the values of enum ww::sti (see ../inc/wwstyles.hxx)?
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "TODO DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )- %d\n", nStyle );
+ OSL_TRACE( "TODO DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )- %d", nStyle );
#else
(void) nStyle; // to quiet the warning
#endif
@@ -1973,7 +1973,7 @@ void DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )
void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize )
{
- OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size&
rSize ) - some stuff still missing\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size&
rSize ) - some stuff still missing" );
// create the relation ID
OString aRelId;
sal_Int32 nImageType;
@@ -2525,7 +2525,7 @@ void DocxAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo*
pSectio
}
break;
default:
- OSL_TRACE( "Unknown section break to write: %d\n", nC );
+ OSL_TRACE( "Unknown section break to write: %d", nC );
break;
}
}
@@ -2692,7 +2692,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType,
sal_uInt16
m_pSerializer->singleElementNS( XML_w, XML_pgNumType, xAttrs );
// see 2.6.12 pgNumType (Page Numbering Settings)
- OSL_TRACE( "TODO DocxAttributeOutput::SectionPageNumbering()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::SectionPageNumbering()" );
}
void DocxAttributeOutput::SectionType( sal_uInt8 nBreakCode )
@@ -2806,7 +2806,7 @@ void DocxAttributeOutput::NumberingDefinition( sal_uInt16 nId, const
SwNumRule &
#if OSL_DEBUG_LEVEL > 1
// TODO ww8 version writes this, anything to do about it here?
if ( rRule.IsContinusNum() )
- OSL_TRACE( "TODO DocxAttributeOutput::NumberingDefinition()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::NumberingDefinition()" );
#else
(void) rRule; // to quiet the warning...
#endif
@@ -3159,7 +3159,7 @@ void DocxAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
void DocxAttributeOutput::CharAutoKern( const SvxAutoKernItem& )
{
- OSL_TRACE( "TODO DocxAttributeOutput::CharAutoKern()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::CharAutoKern()" );
}
void DocxAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
@@ -3355,7 +3355,7 @@ void DocxAttributeOutput::RefField( const SwField& rFld, const String& rRef )
void DocxAttributeOutput::HiddenField( const SwField& /*rFld*/ )
{
- OSL_TRACE( "TODO DocxAttributeOutput::HiddenField()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::HiddenField()" );
}
void DocxAttributeOutput::PostitField( const SwField* pFld )
@@ -3902,7 +3902,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
void DocxAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
{
- OSL_TRACE( "TODO DocxAttributeOutput::FormatPaperBin()\n" );
+ OSL_TRACE( "TODO DocxAttributeOutput::FormatPaperBin()" );
}
void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index bec163a..2436f13 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -301,7 +301,7 @@ void DocxExport::DoComboBox(const rtl::OUString& rName,
void DocxExport::DoFormText(const SwInputField* /*pFld*/)
{
- OSL_TRACE( "TODO DocxExport::ForFormText()\n" );
+ OSL_TRACE( "TODO DocxExport::ForFormText()" );
}
rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount )
@@ -356,7 +356,7 @@ void DocxExport::ExportDocument_Impl()
void DocxExport::OutputPageSectionBreaks( const SwTxtNode& )
{
- OSL_TRACE( "TODO DocxExport::OutputPageSectionBreaks( const SwTxtNode& )\n" );
+ OSL_TRACE( "TODO DocxExport::OutputPageSectionBreaks( const SwTxtNode& )" );
}
@@ -404,17 +404,17 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
void DocxExport::OutputTableNode( const SwTableNode& )
{
- OSL_TRACE( "TODO DocxExport::OutputTableNode( const SwTableNode& )\n" );
+ OSL_TRACE( "TODO DocxExport::OutputTableNode( const SwTableNode& )" );
}
void DocxExport::OutputGrfNode( const SwGrfNode& )
{
- OSL_TRACE( "TODO DocxExport::OutputGrfNode( const SwGrfNode& )\n" );
+ OSL_TRACE( "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" );
}
void DocxExport::OutputOLENode( const SwOLENode& )
{
- OSL_TRACE( "TODO DocxExport::OutputOLENode( const SwOLENode& )\n" );
+ OSL_TRACE( "TODO DocxExport::OutputOLENode( const SwOLENode& )" );
}
void DocxExport::OutputLinkedOLE( const OUString& )
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d633a84c..23af249 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2759,7 +2759,7 @@ void MSWordExportBase::OutputContentNode( const SwCntntNode& rNode )
OutputOLENode( *rNode.GetOLENode() );
break;
default:
- OSL_TRACE("Unhandled node, type == %d\n", rNode.GetNodeType() );
+ OSL_TRACE("Unhandled node, type == %d", rNode.GetNodeType() );
break;
}
}
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 04e440a..60383c6 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -95,7 +95,7 @@ using namespace nsFieldFlags;
void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ )
{
- OSL_TRACE("WW8Export::OutputGrfNode( const SwGrfNode& )\n" );
+ OSL_TRACE("WW8Export::OutputGrfNode( const SwGrfNode& )" );
OSL_ENSURE( mpParentFrame, "frame not set!" );
if ( mpParentFrame )
{
@@ -211,7 +211,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
{
- OSL_TRACE("WW8Export::OutputOLENode( const SwOLENode& rOLENode )\n" );
+ OSL_TRACE("WW8Export::OutputOLENode( const SwOLENode& rOLENode )" );
sal_uInt8 *pSpecOLE;
sal_uInt8 *pDataAdr;
short nSize;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 8841a07..873f642 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5219,7 +5219,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
break;
default:
- OSL_TRACE("Unhandled SfxPoolItem with id %d.\n", rHt.Which() );
+ OSL_TRACE("Unhandled SfxPoolItem with id %d.", rHt.Which() );
break;
}
}
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index 0b09050..f915d19 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.cxx
@@ -158,7 +158,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno:
}
catch( uno::Exception & )
{
- OSL_TRACE( "Warning: %s is not a recognized type\n", OUSTRING_CSTR( name ) );
+ OSL_TRACE( "Warning: %s is not a recognized type", OUSTRING_CSTR( name ) );
return uno::Reference< awt::XLayoutConstrains >();
}
@@ -526,7 +526,7 @@ Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *paren
{
window = new Control( parent, ImplGetWinBits( attributes, 0 ) );
#ifndef __SUNPRO_CC
- OSL_TRACE( "%s: parent=%p (%s)\n", __FUNCTION__, parent, typeid( *parent ).name() );
+ OSL_TRACE( "%s: parent=%p (%s)", __FUNCTION__, parent, typeid( *parent ).name() );
#endif
*component = new layoutimpl::VCLXPlugin( window, ImplGetWinBits( attributes, 0 ) );
}
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 99e3594..893b518 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -191,7 +191,7 @@ uno::Any anyFromString( OUString const& value, uno::Type const& type )
}
default:
- OSL_TRACE( "ERROR: unknown property type of value: `%s'\n", OUSTRING_CSTR( value ) );
+ OSL_TRACE( "ERROR: unknown property type of value: `%s'", OUSTRING_CSTR( value ) );
break;
}
throw uno::RuntimeException();
@@ -241,7 +241,7 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer,
for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
++it )
{
- OSL_TRACE( "%s=%s\n", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) );
+ OSL_TRACE( "%s=%s", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) );
}
return;
}
@@ -268,13 +268,13 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer,
}
catch( beans::UnknownPropertyException & )
{
- OSL_TRACE( "Warning: unknown attribute: `%s'\n", OUSTRING_CSTR( unoAttr ) );
+ OSL_TRACE( "Warning: unknown attribute: `%s'", OUSTRING_CSTR( unoAttr ) );
return;
}
if ( prop.Name.getLength() <= 0 )
{
- OSL_TRACE( "Warning: missing prop: `%s'\n", OUSTRING_CSTR( unoAttr ) );
+ OSL_TRACE( "Warning: missing prop: `%s'", OUSTRING_CSTR( unoAttr ) );
return;
}
@@ -286,7 +286,7 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer,
}
catch( uno::RuntimeException & )
{
- OSL_TRACE( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )\n",
OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ), OUSTRING_CSTR(
prop.Type.getTypeName() ), OUSTRING_CSTR( value ) );
+ OSL_TRACE( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )",
OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ), OUSTRING_CSTR(
prop.Type.getTypeName() ), OUSTRING_CSTR( value ) );
return;
}
@@ -297,7 +297,7 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer,
}
catch( ... )
{
- OSL_TRACE( "Warning: cannot set attribute %s to %s \n", OUSTRING_CSTR( unoAttr ),
OUSTRING_CSTR( value ) );
+ OSL_TRACE( "Warning: cannot set attribute %s to %s", OUSTRING_CSTR( unoAttr ),
OUSTRING_CSTR( value ) );
}
}
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index f83f42a..e108572 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -102,7 +102,7 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
void LayoutRoot::error( OUString const& message )
{
- OSL_TRACE( "%s\n", OUSTRING_CSTR( message ) );
+ OSL_TRACE( "%s", OUSTRING_CSTR( message ) );
ShowMessageBox( mxFactory, mxToolkit,
OUString(RTL_CONSTASCII_USTRINGPARAM("Fatal error")),
message );
diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index 7df8e36..5c72b17 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -64,7 +64,7 @@ class ImageImpl
{
if ( !mxGraphic.is() )
{
- OSL_TRACE( "ERROR: failed to load image: `%s'\n", pName );
+ OSL_TRACE( "ERROR: failed to load image: `%s'", pName );
}
}
};
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8dc52aa..4d9d749 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -261,7 +261,7 @@ void ResMgrContainer::init()
}
#if OSL_DEBUG_LEVEL > 1
else
- OSL_TRACE( "opening dir %s failed\n", OUStringToOString( *dir_it,
osl_getThreadTextEncoding() ).getStr() );
+ OSL_TRACE( "opening dir %s failed", OUStringToOString( *dir_it,
osl_getThreadTextEncoding() ).getStr() );
#endif
}
#if OSL_DEBUG_LEVEL > 1
@@ -1451,7 +1451,7 @@ ResMgr* ResMgr::CreateFallbackResMgr( const ResId& rId, const Resource*
pResourc
ResMgrContainer::get().freeResMgr( pRes );
return NULL;
}
- OSL_TRACE( "trying fallback: %s\n", OUStringToOString( pRes->aFileName,
osl_getThreadTextEncoding() ).getStr() );
+ OSL_TRACE( "trying fallback: %s", OUStringToOString( pRes->aFileName,
osl_getThreadTextEncoding() ).getStr() );
pFallback = new ResMgr( pRes );
pFallback->pOriginalResMgr = this;
// try to recreate the resource stack
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 64555b2..aa0d1b4 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -448,7 +448,7 @@ OUString getExecutableBaseName()
sExecutable = sExecutable.copy(0,nExtIndex);
}
else
- OSL_TRACE("Cannot get executable name: osl_getExecutableFile failed\n");
+ OSL_TRACE("Cannot get executable name: osl_getExecutableFile failed");
return sExecutable;
}
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx
b/vbahelper/source/vbahelper/vbacommandbar.cxx
index e377fe1..bf790b3 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -124,7 +124,7 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
}
catch(const uno::Exception&)
{
- OSL_TRACE( "SetVisible get an exception\n" );
+ OSL_TRACE( "SetVisible get an exception" );
}
}
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx
b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index b483977..3e39ff1 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx
@@ -99,7 +99,7 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
attachRecursive(xAccessible);
}
- OSL_TRACE( "Invalidate all children called\n" );
+ OSL_TRACE( "Invalidate all children called" );
break;
default:
break;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index df0625c..f426c112 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1788,7 +1788,7 @@ void Application::ShowNativeErrorBox(const String& sTitle ,
SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK,
SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK);
if (btn != SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK) {
- OSL_TRACE("ShowNativeMessageBox returned %d\n", btn);
+ OSL_TRACE("ShowNativeMessageBox returned %d", btn);
}
}
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 0569de5..b973ee3 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1109,7 +1109,7 @@ public:
sTransporters.erase( maID );
if( maUDigest )
rtl_digest_destroyMD5( maUDigest );
- OSL_TRACE( "EncHashTransporter freed\n" );
+ OSL_TRACE( "EncHashTransporter freed" );
}
rtlDigest getUDigest() const { return maUDigest; };
diff --git a/vcl/unx/generic/gdi/salprnpsp.cxx b/vcl/unx/generic/gdi/salprnpsp.cxx
index 3a3b406..0119003 100644
--- a/vcl/unx/generic/gdi/salprnpsp.cxx
+++ b/vcl/unx/generic/gdi/salprnpsp.cxx
@@ -1378,7 +1378,7 @@ sal_Bool PspSalPrinter::StartJob( const String* i_pFileName, const String&
i_rJo
for( size_t i = 0; i < aPDFFiles.size(); i++ )
{
osl_removeFile( aPDFFiles[i].maTmpURL.pData );
- OSL_TRACE( "removed print PDF file %s\n", rtl::OUStringToOString(
aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE( "removed print PDF file %s", rtl::OUStringToOString( aPDFFiles[i].maTmpURL,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index c438053..9bdb1be 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -1911,7 +1911,7 @@ ElementBase::~ElementBase()
#if OSL_DEBUG_LEVEL > 1
::rtl::OString aStr( ::rtl::OUStringToOString(
_aLocalName, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "ElementBase::~ElementBase(): %s\n", aStr.getStr() );
+ OSL_TRACE( "ElementBase::~ElementBase(): %s", aStr.getStr() );
#endif
}
@@ -1980,7 +1980,7 @@ DialogImport::~DialogImport()
SAL_THROW( () )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "DialogImport::~DialogImport().\n" );
+ OSL_TRACE( "DialogImport::~DialogImport()." );
#endif
}
//__________________________________________________________________________________________________
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 2be008d..3167b0d 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -134,7 +134,7 @@ LibElementBase::~LibElementBase()
#if OSL_DEBUG_LEVEL > 1
OString aStr( OUStringToOString( _aLocalName, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "LibElementBase::~LibElementBase(): %s\n", aStr.getStr() );
+ OSL_TRACE( "LibElementBase::~LibElementBase(): %s", aStr.getStr() );
#endif
}
@@ -219,7 +219,7 @@ LibraryImport::~LibraryImport()
SAL_THROW( () )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "LibraryImport::~LibraryImport().\n" );
+ OSL_TRACE( "LibraryImport::~LibraryImport()." );
#endif
}
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index ab64e9e..6abf6a6 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -134,7 +134,7 @@ ModuleElement::~ModuleElement()
#if OSL_DEBUG_LEVEL > 1
OString aStr( OUStringToOString( _aLocalName, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "ModuleElement::~ModuleElement(): %s\n", aStr.getStr() );
+ OSL_TRACE( "ModuleElement::~ModuleElement(): %s", aStr.getStr() );
#endif
}
@@ -213,7 +213,7 @@ ModuleImport::~ModuleImport()
SAL_THROW( () )
{
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "ModuleImport::~ModuleImport().\n" );
+ OSL_TRACE( "ModuleImport::~ModuleImport()." );
#endif
}
--
1.7.6.1
Context
- [Libreoffice] [PATCH] OSL_TRACE: Remove trailing newlines · Thomas Arnhold
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.