[Libreoffice-commits] .: basebmp/test basegfx/source bridges/source canvas/source chart2/source comphelper/source connectivity/source connectivity/workben cppuhelper/source cppu/source dbaccess/source desktop/source editeng/source extensions/source fpicker/source oox/source reportdesign/source sal/osl sax/qa scripting/source sc/source sdext/source sd/source sfx2/qa sfx2/source slideshow/source slideshow/test stoc/source stoc/test store/source svl/source svtools/source svx/source sw/source toolkit/source tools/source unotools/source vbahelper/source vcl/aqua vcl/source vcl/unx xmlscript/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Sep 21 00:29:22 PDT 2011
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
bridges/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 -
connectivity/source/drivers/mozab/MDatabaseMetaData.cxx | 6
connectivity/source/drivers/mozab/MResultSet.cxx | 34 -
connectivity/source/drivers/mozab/MStatement.cxx | 4
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 28 -
connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 34 -
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 6
connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx | 10
connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx | 58 +--
connectivity/source/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
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 6
editeng/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
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
scripting/source/runtimemgr/ScriptNameResolverImpl.cxx | 4
scripting/source/runtimemgr/ScriptRuntimeManager.cxx | 16
scripting/source/runtimemgr/StorageBridge.cxx | 4
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 10
sd/source/ui/framework/configuration/ConfigurationController.cxx | 6
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 4
sd/source/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
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 2
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 2
slideshow/source/engine/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
105 files changed, 625 insertions(+), 625 deletions(-)
New commits:
commit be6a8677a6ddb6387272a78406ec2149c4319f3d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Sep 20 10:18:12 2011 +0200
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
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..be020f4 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list