[Libreoffice-commits] core.git: xmloff/source

[Eike Rathke]

 xmloff/source/draw/shapeexport.cxx |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit db05c78ef5571d4204ed555d6d7cff906d25a6dd
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Nov 25 18:11:18 2016 +0100

    replace useless OSL_FAIL with DBG_UNHANDLED_EXCEPTION_WHEN
    
    Change-Id: I7eebb09d1725eff4793330362e5bfba84a237195

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index a6656c7..afcecd4 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -96,6 +96,7 @@
 #include <tools/globname.hxx>
 #include <tools/helpers.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <xmloff/contextid.hxx>
 #include <xmloff/families.hxx>
@@ -527,7 +528,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
             }
             catch(const uno::Exception&)
             {
-                OSL_FAIL( "XMLShapeExport::collectShapeAutoStyles(): exception caught while collection auto styles for a table!" );
+                DBG_UNHANDLED_EXCEPTION_WHEN( "collecting auto styles for a table" );
             }
             break;
         }
@@ -719,7 +720,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
             }
             catch(const uno::Exception&)
             {
-                OSL_FAIL( "could not export layer name for shape!" );
+                DBG_UNHANDLED_EXCEPTION_WHEN( "exporting layer name for shape" );
             }
         }
     }
@@ -753,7 +754,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
         }
         catch(const uno::Exception&)
         {
-            OSL_FAIL( "XMLShapeExport::exportShape(), exception caught!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -1797,7 +1798,7 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
     }
     catch( uno::Exception& )
     {
-        OSL_FAIL( "could not export Title and/or Description for shape!" );
+        DBG_UNHANDLED_EXCEPTION_WHEN( "exporting Title and/or Description for shape" );
     }
 }
 
@@ -4913,7 +4914,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
                             }
                             catch( uno::Exception& )
                             {
-                            OSL_FAIL("XMLShapeExport::ImpExportTableShape(), exception caught!");
+                                DBG_UNHANDLED_EXCEPTION();
                             }
                         }
                     }
@@ -4996,7 +4997,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
             }
             catch( uno::Exception& )
             {
-                OSL_FAIL("xmloff::XMLShapeExport::ImpExportTableShape(), exception caught!");
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
 
@@ -5006,7 +5007,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
     }
     catch( uno::Exception& )
     {
-        OSL_FAIL( "xmloff::XMLShapeExport::ImpExportTableShape(), exception caught!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
 }