[Libreoffice-commits] .: slideshow/source

[Caolán McNamara]

 slideshow/source/engine/animationnodes/animationbasenode.cxx |    2 +-
 slideshow/source/engine/slide/slideimpl.cxx                  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e9a562ed69d304f0e844d3cb51ac8cf2d3164a63
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 5 11:14:49 2011 +0100

    cast is gone now

diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 22c4266..98c5e26 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -219,7 +219,7 @@ bool AnimationBaseNode::init_st()
     catch (uno::Exception const&) {
         OSL_FAIL( rtl::OUStringToOString(
                         comphelper::anyToString(cppu::getCaughtException()),
-                        RTL_TEXTENCODING_UTF8 ) );
+                        RTL_TEXTENCODING_UTF8).getStr() );
         // catch and ignore. We later handle empty activities, but for
         // other nodes to function properly, the core functionality of
         // this node must remain up and running.
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 4c749ee..0b6c373 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -876,7 +876,7 @@ bool SlideImpl::implPrefetchShow()
         OSL_FAIL(
             rtl::OUStringToOString(
                 comphelper::anyToString(cppu::getCaughtException()),
-                RTL_TEXTENCODING_UTF8 ) );
+                RTL_TEXTENCODING_UTF8).getStr() );
         // TODO(E2): Error handling. For now, bail out
     }
 
@@ -1003,7 +1003,7 @@ bool SlideImpl::applyInitialShapeAttributes(
         OSL_FAIL(
             rtl::OUStringToOString(
                 comphelper::anyToString(cppu::getCaughtException()),
-                RTL_TEXTENCODING_UTF8 ) );
+                RTL_TEXTENCODING_UTF8).getStr() );
 
         // could not determine initial shape attributes - this
         // is an error, as some effects might then be plainly