[Libreoffice-commits] core.git: slideshow/source svx/source

[Caolán McNamara]

 slideshow/source/engine/activitiesqueue.cxx                    |    7 +-----
 slideshow/source/engine/eventqueue.cxx                         |    7 +-----
 slideshow/source/engine/rehearsetimingsactivity.cxx            |    7 +-----
 slideshow/source/engine/shapesubset.cxx                        |    7 +-----
 slideshow/source/engine/slide/userpaintoverlay.cxx             |    7 +-----
 slideshow/source/engine/transitions/shapetransitionfactory.cxx |   10 +--------
 slideshow/source/engine/usereventqueue.cxx                     |    8 ++-----
 svx/source/svdraw/svdoole2.cxx                                 |   11 +++-------
 8 files changed, 19 insertions(+), 45 deletions(-)

New commits:
commit 01112d2a6383bbb777db973c60b809b29576f39f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 9 20:57:31 2017 +0000

    some OSL_FAIL to SAL_WARN
    
    Change-Id: I5101e42b7a34cca9055fc805d9a392ba4f920a3d

diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 8ece2a3..4a159c2 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -55,12 +55,9 @@ namespace slideshow
                 for( const auto& pActivity : maCurrentActivitiesReinsert )
                     pActivity->dispose();
             }
-            catch (uno::Exception &)
+            catch (const uno::Exception&)
             {
-                OSL_FAIL( OUStringToOString(
-                                comphelper::anyToString(
-                                    cppu::getCaughtException() ),
-                                RTL_TEXTENCODING_UTF8 ).getStr() );
+                SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
             }
         }
 
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 4a34400..bcf8d1b 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -73,12 +73,9 @@ namespace slideshow
                 {
                     maEvents.top().pEvent->dispose();
                 }
-                catch (uno::Exception &)
+                catch (const uno::Exception&)
                 {
-                    OSL_FAIL( OUStringToOString(
-                                    comphelper::anyToString(
-                                        cppu::getCaughtException() ),
-                                    RTL_TEXTENCODING_UTF8 ).getStr() );
+                    SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
                 }
                 maEvents.pop();
             }
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index a08b50d..788f043 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -179,12 +179,9 @@ RehearseTimingsActivity::~RehearseTimingsActivity()
     {
         stop();
     }
-    catch (uno::Exception &)
+    catch (const uno::Exception&)
     {
-        OSL_FAIL( OUStringToOString(
-                        comphelper::anyToString(
-                            cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
+        SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
     }
 }
 
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 23fd809..46c0d0c 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -79,12 +79,9 @@ namespace slideshow
                 // if not done yet: revoke subset from original
                 disableSubsetShape();
             }
-            catch (uno::Exception &)
+            catch (const uno::Exception&)
             {
-                OSL_FAIL( OUStringToOString(
-                                comphelper::anyToString(
-                                    cppu::getCaughtException() ),
-                                RTL_TEXTENCODING_UTF8 ).getStr() );
+                SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
             }
         }
 
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 3e720c3..3657de8 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -487,12 +487,9 @@ namespace slideshow
                 mrMultiplexer.removeViewHandler( mpHandler );
                 mpHandler->dispose();
             }
-            catch (uno::Exception &)
+            catch (const uno::Exception&)
             {
-                OSL_FAIL( OUStringToOString(
-                                comphelper::anyToString(
-                                    cppu::getCaughtException() ),
-                                RTL_TEXTENCODING_UTF8 ).getStr() );
+                SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
             }
         }
     }
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 63c0fa6..8b46d97 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -110,12 +110,9 @@ ClippingAnimation::~ClippingAnimation()
     {
         end_();
     }
-    catch (uno::Exception &)
+    catch (const uno::Exception&)
     {
-        OSL_FAIL( OUStringToOString(
-                        comphelper::anyToString(
-                            cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
+        SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
     }
 }
 
@@ -354,9 +351,6 @@ AnimationActivitySharedPtr createShapeTransitionByType(
         SAL_WARN("slideshow",
             "createShapeTransitionByType(): Unknown type/subtype combination encountered: "
             << xTransition->getTransition() << " " << xTransition->getSubtype() );
-        OSL_FAIL(
-            "createShapeTransitionByType(): Unknown type/subtype "
-            "combination encountered" );
     }
 
     return pGeneratedActivity;
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index d221de2..9db1913 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -558,11 +558,9 @@ UserEventQueue::~UserEventQueue()
         // unregister all handlers
         clear();
     }
-    catch (uno::Exception &) {
-        OSL_FAIL( OUStringToOString(
-                        comphelper::anyToString(
-                            cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
+    catch (const uno::Exception&)
+    {
+        SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
     }
 }
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 34b6ec0..030cafc 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -945,14 +945,11 @@ void SdrOle2Obj::CheckFileLink_Impl()
                 }
             }
         }
-        catch( css::uno::Exception& )
+        catch (const css::uno::Exception&)
         {
-            OSL_FAIL(
-                OString(OString("SdrOle2Obj::CheckFileLink_Impl(), "
-                        "exception caught: ") +
-                OUStringToOString(
-                    comphelper::anyToString( cppu::getCaughtException() ),
-                    RTL_TEXTENCODING_UTF8 )).getStr() );
+            SAL_WARN( "svx", "SdrOle2Obj::CheckFileLink_Impl(),"
+                        "exception caught: "
+                 << comphelper::anyToString(cppu::getCaughtException() ) );
         }
     }
 }