diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-09-20 10:18:12 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-21 09:28:39 +0200 |
commit | be6a8677a6ddb6387272a78406ec2149c4319f3d (patch) | |
tree | 0e6be3608de08f831f596a5c2dc5a3590d4a62c6 /stoc | |
parent | 6058133765a1f874d6bf9fb9f4d0811db32adc10 (diff) |
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
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/corereflection/lrucache.hxx | 8 | ||||
-rw-r--r-- | stoc/source/security/lru_cache.h | 2 | ||||
-rw-r--r-- | stoc/source/servicemanager/servicemanager.cxx | 4 | ||||
-rw-r--r-- | stoc/source/tdmanager/lrucache.hxx | 8 | ||||
-rw-r--r-- | stoc/source/tdmanager/tdmgr.cxx | 2 | ||||
-rw-r--r-- | stoc/test/javavm/testjavavm.cxx | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx index b6e397b56306..44928d51948f 100644 --- a/stoc/source/corereflection/lrucache.hxx +++ b/stoc/source/corereflection/lrucache.hxx @@ -167,7 +167,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t #ifdef __CACHE_DIAGNOSE OSL_TRACE( "> retrieved element \"" ); OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() ); - OSL_TRACE( "\" from cache <\n" ); + OSL_TRACE( "\" from cache <" ); #endif return pEntry->aVal; } @@ -192,7 +192,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue( { OSL_TRACE( "> kicking element \"" ); OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() ); - OSL_TRACE( "\" from cache <\n" ); + OSL_TRACE( "\" from cache <" ); } #endif _aKey2Element.erase( pEntry->aKey ); @@ -204,7 +204,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue( #ifdef __CACHE_DIAGNOSE OSL_TRACE( "> replacing element \"" ); OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() ); - OSL_TRACE( "\" in cache <\n" ); + OSL_TRACE( "\" in cache <" ); #endif } pEntry->aVal = rValue; @@ -224,7 +224,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() } _nCachedElements = 0; #ifdef __CACHE_DIAGNOSE - OSL_TRACE( "> cleared cache <\n" ); + OSL_TRACE( "> cleared cache <" ); #endif } diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h index 123e0b181a19..d4b5a8e79775 100644 --- a/stoc/source/security/lru_cache.h +++ b/stoc/source/security/lru_cache.h @@ -271,7 +271,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::clear() SAL_THROW( m_block[ nPos ].m_val = t_val(); } #ifdef __CACHE_DIAGNOSE - OSL_TRACE( "> cleared cache\n" ); + OSL_TRACE( "> cleared cache" ); #endif } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index efefe0ad10e1..2f826b12bcdf 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -1199,7 +1199,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( { #if OSL_DEBUG_LEVEL > 1 OString aStr( OUStringToOString( rServiceSpecifier, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### ignoring given context raising service %s !!!\n", aStr.getStr() ); + OSL_TRACE( "### ignoring given context raising service %s !!!", aStr.getStr() ); #endif return xFac2->createInstance(); } @@ -1263,7 +1263,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( { #if OSL_DEBUG_LEVEL > 1 OString aStr( OUStringToOString( rServiceSpecifier, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### ignoring given context raising service %s !!!\n", aStr.getStr() ); + OSL_TRACE( "### ignoring given context raising service %s !!!", aStr.getStr() ); #endif return xFac2->createInstanceWithArguments( rArguments ); } diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx index 36f3c62390c5..6af69d6b4270 100644 --- a/stoc/source/tdmanager/lrucache.hxx +++ b/stoc/source/tdmanager/lrucache.hxx @@ -171,7 +171,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( #ifdef __CACHE_DIAGNOSE OSL_TRACE( "> retrieved element \"" ); OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() ); - OSL_TRACE( "\" from cache <\n" ); + OSL_TRACE( "\" from cache <" ); #endif return pEntry->aVal; } @@ -196,7 +196,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue( { OSL_TRACE( "> kicking element \"" ); OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() ); - OSL_TRACE( "\" from cache <\n" ); + OSL_TRACE( "\" from cache <" ); } #endif _aKey2Element.erase( pEntry->aKey ); @@ -208,7 +208,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue( #ifdef __CACHE_DIAGNOSE OSL_TRACE( "> replacing element \"" ); OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() ); - OSL_TRACE( "\" in cache <\n" ); + OSL_TRACE( "\" in cache <" ); #endif } pEntry->aVal = rValue; @@ -227,7 +227,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() _pBlock[nPos].aVal = t_Val(); } #ifdef __CACHE_DIAGNOSE - OSL_TRACE( "> cleared cache <\n" ); + OSL_TRACE( "> cleared cache <" ); #endif } diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx index 04e78969d05c..510a1b625951 100644 --- a/stoc/source/tdmanager/tdmgr.cxx +++ b/stoc/source/tdmanager/tdmgr.cxx @@ -293,7 +293,7 @@ ManagerImpl::ManagerImpl( ManagerImpl::~ManagerImpl() { OSL_ENSURE( _aProviders.size() == 0, "### still providers left!" ); - OSL_TRACE( "> TypeDescriptionManager shut down. <\n" ); + OSL_TRACE( "> TypeDescriptionManager shut down. <" ); ::g_moduleCount.modCnt.release( &::g_moduleCount.modCnt ); } //__________________________________________________________________________________________________ diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index fbbcb646a7c6..f80a1418a694 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -105,7 +105,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) jclass cls = p_env->FindClass( "TestJavaVM"); if (cls == 0) { - OSL_TRACE( "Can't find Prog class\n"); + OSL_TRACE( "Can't find Prog class"); exit(1); } |