summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-09-20 10:18:12 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-09-21 09:28:39 +0200
commitbe6a8677a6ddb6387272a78406ec2149c4319f3d (patch)
tree0e6be3608de08f831f596a5c2dc5a3590d4a62c6 /slideshow
parent6058133765a1f874d6bf9fb9f4d0811db32adc10 (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 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm2
-rw-r--r--slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx2
-rw-r--r--slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx2
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx4
-rw-r--r--slideshow/test/demoshow.cxx2
5 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 00271253086e..346808b5ca84 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -922,7 +922,7 @@ void OGLTransitionerImpl::disposing()
osl::MutexGuard const guard( m_aMutex );
#ifdef DEBUG
- OSL_TRACE("dispose %p\n", this);
+ OSL_TRACE("dispose %p", this);
if( frame_count ) {
t6 = microsec_clock::local_time();
time_duration duration = t6 - t5;
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index b70b8acb4ad8..d03d0e3a1fa2 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -1256,7 +1256,7 @@ void OGLTransitionerImpl::disposing()
osl::MutexGuard const guard( m_aMutex );
#ifdef DEBUG
- OSL_TRACE("dispose %p\n", this);
+ OSL_TRACE("dispose %p", this);
if( frame_count ) {
t6 = microsec_clock::local_time();
time_duration duration = t6 - t5;
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index 6fa833b22c48..80e2e73a4ccc 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -1228,7 +1228,7 @@ void OGLTransitionerImpl::disposing()
osl::MutexGuard const guard( m_aMutex );
#ifdef DEBUG
- OSL_TRACE("dispose %p\n", this);
+ OSL_TRACE("dispose %p", this);
if( frame_count ) {
t6 = microsec_clock::local_time();
time_duration duration = t6 - t5;
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index fd9731484a99..e43b20f17c4c 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -819,10 +819,10 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
sal_Bool bLoopSound = sal_False;
if( !getPropertyValue( aSound, xPropSet, OUSTR("Sound")) )
- OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound\n" );
+ OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" );
if( !getPropertyValue( bLoopSound, xPropSet, OUSTR("LoopSound") ) )
- OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound\n" );
+ OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound" );
NumberAnimationSharedPtr pTransition(
TransitionFactory::createSlideTransition(
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index e9f99967241c..7e238da41274 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -557,7 +557,7 @@ void DemoApp::Main()
if( !xFactory.is() )
{
- OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
+ OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting." );
exit( 1 );
}