From be6a8677a6ddb6387272a78406ec2149c4319f3d Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Tue, 20 Sep 2011 10:18:12 +0200
Subject: 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
---
 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 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'scripting/source')

diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
index 10b0f86c0bfc..371bef8b07cb 100644
--- a/scripting/source/provider/ScriptImpl.cxx
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -51,13 +51,13 @@ throw ( RuntimeException ) :
         m_RunTimeManager( runtimeMgr, UNO_SET_THROW ),
         m_ScriptURI( scriptURI )
 {
-    OSL_TRACE( "<!constucting a ScriptImpl>\n" );
+    OSL_TRACE( "<!constucting a ScriptImpl>" );
 }
 
 //*************************************************************************
 ScriptImpl::~ScriptImpl()
 {
-    OSL_TRACE( "<Destructing a ScriptImpl>\n" );
+    OSL_TRACE( "<Destructing a ScriptImpl>" );
 }
 
 //*************************************************************************
diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx
index 063e48ed3094..abc86c82617f 100644
--- a/scripting/source/provider/ScriptingContext.cxx
+++ b/scripting/source/provider/ScriptingContext.cxx
@@ -58,7 +58,7 @@ ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xCont
     OPropertyContainer( GetBroadcastHelper() ),
         m_xContext( xContext, UNO_SET_THROW )
 {
-    OSL_TRACE( "< ScriptingContext ctor called >\n" );
+    OSL_TRACE( "< ScriptingContext ctor called >" );
 
     Any nullAny;
 
@@ -73,7 +73,7 @@ ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xCont
 
 ScriptingContext::~ScriptingContext()
 {
-    OSL_TRACE( "< ScriptingContext dtor called >\n" );
+    OSL_TRACE( "< ScriptingContext dtor called >" );
 }
 // -----------------------------------------------------------------------------
 // OPropertySetHelper
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index 99ea643115dd..57d0823e8701 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -73,7 +73,7 @@ ScriptNameResolverImpl::ScriptNameResolverImpl(
     const Reference< XComponentContext > & xContext ) :
     m_xContext( xContext, UNO_SET_THROW )
 {
-    OSL_TRACE( "< ScriptNameResolverImpl ctor called >\n" );
+    OSL_TRACE( "< ScriptNameResolverImpl ctor called >" );
     validateXRef( m_xContext, "ScriptNameResolverImpl::ScriptNameResolverImpl: invalid context" );
     m_xMultiComFac.set( m_xContext->getServiceManager(), UNO_SET_THROW );
 
@@ -97,7 +97,7 @@ ScriptNameResolverImpl::ScriptNameResolverImpl(
 //*************************************************************************
 ScriptNameResolverImpl::~ScriptNameResolverImpl()
 {
-    OSL_TRACE( "< ScriptNameResolverImpl dtor called >\n" );
+    OSL_TRACE( "< ScriptNameResolverImpl dtor called >" );
     s_moduleCount.modCnt.release( &s_moduleCount.modCnt );
 }
 
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
index f2b8b13399bc..60732d9c2c97 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
@@ -70,7 +70,7 @@ ScriptRuntimeManager::ScriptRuntimeManager(
     const Reference< XComponentContext > & xContext ) :
     m_xContext( xContext, UNO_SET_THROW )
 {
-    OSL_TRACE( "< ScriptRuntimeManager ctor called >\n" );
+    OSL_TRACE( "< ScriptRuntimeManager ctor called >" );
     m_xMgr.set( m_xContext->getServiceManager(), UNO_SET_THROW );
     s_moduleCount.modCnt.acquire( &s_moduleCount.modCnt );
     // test
@@ -81,7 +81,7 @@ ScriptRuntimeManager::ScriptRuntimeManager(
 // ScriptRuntimeManager Destructor
 ScriptRuntimeManager::~ScriptRuntimeManager()
 {
-    OSL_TRACE( "< ScriptRuntimeManager dtor called >\n" );
+    OSL_TRACE( "< ScriptRuntimeManager dtor called >" );
     s_moduleCount.modCnt.release( &s_moduleCount.modCnt );
 }
 
@@ -91,7 +91,7 @@ Reference< runtime::XScriptInvocation > SAL_CALL ScriptRuntimeManager::getScript
 const Reference< XInterface >& scriptInfo )
 throw( RuntimeException )
 {
-    OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptRuntime\n" );
+    OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptRuntime" );
 
     Reference< runtime::XScriptInvocation > xScriptInvocation;
 
@@ -124,7 +124,7 @@ Reference< runtime::XScriptNameResolver > SAL_CALL
 ScriptRuntimeManager::getScriptNameResolver()
 throw( RuntimeException )
 {
-    OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptNameResolver\n" );
+    OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptNameResolver" );
     Reference< runtime::XScriptNameResolver > xScriptNameResolver;
 
     try
@@ -156,7 +156,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
     throw ( lang::IllegalArgumentException, script::CannotConvertException,
             reflection::InvocationTargetException, RuntimeException )
 {
-    OSL_TRACE( "** ==> ScriptRuntimeManager in runtimemgr invoke\n" );
+    OSL_TRACE( "** ==> ScriptRuntimeManager in runtimemgr invoke" );
 
     Any results;
     scripting_constants::ScriptingConstantsPool& scriptingConstantsPool =
@@ -191,7 +191,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
                 Reference< XInterface > () );
         }
 
-        OSL_TRACE("Storage sid is: %d\n", resolvedSid);
+        OSL_TRACE("Storage sid is: %d", resolvedSid);
 
         // modifying the XPropertySet on the resolved Context to contain the
         // full script info
@@ -276,7 +276,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
                                 Reference< XInterface > () );
     }
 #endif
-    OSL_TRACE( "** ==> ScriptRuntimeManager returned from invoke: %s\n", ::rtl::OUStringToOString( results.getValueTypeName(),  RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+    OSL_TRACE( "** ==> ScriptRuntimeManager returned from invoke: %s", ::rtl::OUStringToOString( results.getValueTypeName(),  RTL_TEXTENCODING_ASCII_US ).pData->buffer );
     return results;
 }
 
@@ -287,7 +287,7 @@ ScriptRuntimeManager::resolve( const ::rtl::OUString& scriptURI,
     Any& invocationCtx )
 throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeException )
 {
-    OSL_TRACE( "** ==> ScriptRuntimeManager in resolve\n" );
+    OSL_TRACE( "** ==> ScriptRuntimeManager in resolve" );
     Reference< storage::XScriptInfo > resolvedURI;
 
     Reference< runtime::XScriptNameResolver > xScriptNameResolver = getScriptNameResolver();
diff --git a/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx
index 3b9a774556fd..d641e6eabb6a 100644
--- a/scripting/source/runtimemgr/StorageBridge.cxx
+++ b/scripting/source/runtimemgr/StorageBridge.cxx
@@ -98,7 +98,7 @@ StorageBridge::getScriptLogicalNames()
 throw ( lang::IllegalArgumentException,
         RuntimeException )
 {
-    OSL_TRACE( "In StorageBridge getScriptLogicalNames...\n" );
+    OSL_TRACE( "In StorageBridge getScriptLogicalNames..." );
     Sequence < ::rtl::OUString  > results;
     try
     {
@@ -117,7 +117,7 @@ Sequence < Reference< storage::XScriptInfo > >
 StorageBridge::getImplementations( const ::rtl::OUString& queryURI )
 throw ( lang::IllegalArgumentException, RuntimeException )
 {
-    OSL_TRACE( "In StorageBridge getImplementations...\n" );
+    OSL_TRACE( "In StorageBridge getImplementations..." );
     Sequence < Reference< storage::XScriptInfo > > results;
     try
     {
-- 
cgit