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
---
 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 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index 0b0905011fbc..f915d197c709 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.cxx
@@ -158,7 +158,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno:
     }
     catch( uno::Exception & )
     {
-        OSL_TRACE( "Warning: %s is not a recognized type\n", OUSTRING_CSTR( name ) );
+        OSL_TRACE( "Warning: %s is not a recognized type", OUSTRING_CSTR( name ) );
         return uno::Reference< awt::XLayoutConstrains >();
     }
 
@@ -526,7 +526,7 @@ Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *paren
     {
         window = new Control( parent, ImplGetWinBits( attributes, 0 ) );
 #ifndef __SUNPRO_CC
-        OSL_TRACE( "%s: parent=%p (%s)\n", __FUNCTION__, parent, typeid( *parent ).name() );
+        OSL_TRACE( "%s: parent=%p (%s)", __FUNCTION__, parent, typeid( *parent ).name() );
 #endif
         *component = new layoutimpl::VCLXPlugin( window, ImplGetWinBits( attributes, 0 ) );
     }
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 99e35941e6f4..893b51889782 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -191,7 +191,7 @@ uno::Any anyFromString( OUString const& value, uno::Type const& type )
         }
 
         default:
-            OSL_TRACE( "ERROR: unknown property type of value: `%s'\n", OUSTRING_CSTR( value ) );
+            OSL_TRACE( "ERROR: unknown property type of value: `%s'", OUSTRING_CSTR( value ) );
             break;
     }
     throw uno::RuntimeException();
@@ -241,7 +241,7 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer,
         for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
               ++it )
         {
-            OSL_TRACE( "%s=%s\n", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) );
+            OSL_TRACE( "%s=%s", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) );
         }
         return;
     }
@@ -268,13 +268,13 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer,
     }
     catch( beans::UnknownPropertyException & )
     {
-        OSL_TRACE( "Warning: unknown attribute: `%s'\n", OUSTRING_CSTR( unoAttr ) );
+        OSL_TRACE( "Warning: unknown attribute: `%s'", OUSTRING_CSTR( unoAttr ) );
         return;
     }
 
     if ( prop.Name.getLength() <= 0 )
     {
-        OSL_TRACE( "Warning: missing prop: `%s'\n", OUSTRING_CSTR( unoAttr ) );
+        OSL_TRACE( "Warning: missing prop: `%s'", OUSTRING_CSTR( unoAttr ) );
         return;
     }
 
@@ -286,7 +286,7 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer,
     }
     catch( uno::RuntimeException & )
     {
-        OSL_TRACE( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )\n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ),  OUSTRING_CSTR( prop.Type.getTypeName() ), OUSTRING_CSTR( value ) );
+        OSL_TRACE( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ),  OUSTRING_CSTR( prop.Type.getTypeName() ), OUSTRING_CSTR( value ) );
         return;
     }
 
@@ -297,7 +297,7 @@ setProperty( uno::Reference< uno::XInterface > const& xPeer,
     }
     catch( ... )
     {
-        OSL_TRACE( "Warning: cannot set attribute %s to %s \n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ) );
+        OSL_TRACE( "Warning: cannot set attribute %s to %s", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ) );
     }
 }
 
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index f83f42a94cec..e10857280613 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -102,7 +102,7 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
 
 void LayoutRoot::error( OUString const& message )
 {
-    OSL_TRACE( "%s\n", OUSTRING_CSTR( message ) );
+    OSL_TRACE( "%s", OUSTRING_CSTR( message ) );
     ShowMessageBox( mxFactory, mxToolkit,
                     OUString(RTL_CONSTASCII_USTRINGPARAM("Fatal error")),
                     message );
diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index 7df8e36811c4..5c72b1707f3d 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -64,7 +64,7 @@ class ImageImpl
     {
         if ( !mxGraphic.is() )
         {
-            OSL_TRACE( "ERROR: failed to load image: `%s'\n", pName );
+            OSL_TRACE( "ERROR: failed to load image: `%s'", pName );
         }
     }
 };
-- 
cgit