diff options
Diffstat (limited to 'slideshow/source/engine/shapes')
8 files changed, 16 insertions, 22 deletions
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index ef5ba29fe169..323f16849123 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -969,8 +969,7 @@ boost::shared_ptr<Activity> createDrawingLayerAnimActivity( catch( uno::Exception& ) { // translate any error into empty factory product. - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index e018c8015b0a..e2492a4ddd3a 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -174,7 +174,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -791,7 +791,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1101,7 +1101,7 @@ namespace slideshow { if (!maHyperlinkIndices.empty() && maHyperlinkIndices.back().second == -1) { - OSL_ENSURE( false, "### pending FIELD_SEQ_END!" ); + OSL_FAIL( "### pending FIELD_SEQ_END!" ); maHyperlinkIndices.pop_back(); maHyperlinkRegions.pop_back(); } @@ -1133,7 +1133,7 @@ namespace slideshow } if (!maHyperlinkIndices.empty() && maHyperlinkIndices.back().second == -1) { - OSL_ENSURE( false, "### pending FIELD_SEQ_END!" ); + OSL_FAIL( "### pending FIELD_SEQ_END!" ); maHyperlinkIndices.pop_back(); maHyperlinkRegions.pop_back(); } diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index ed4238a538f7..f0ede5bf4bea 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -639,8 +639,7 @@ namespace slideshow case DocTreeNode::NODETYPE_INVALID: // FALLTHROUGH intended default: - OSL_ENSURE(false, - "DrawShapeSubsetting::mapDocTreeNode(): unexpected node type"); + OSL_FAIL("DrawShapeSubsetting::mapDocTreeNode(): unexpected node type"); return DrawShapeSubsetting::CLASS_NOOP; case DocTreeNode::NODETYPE_LOGICAL_SHAPE: diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 7874143ca916..25ffa679a789 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -123,7 +123,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index fde007e17d23..355a16c58608 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -99,7 +99,7 @@ bool importShapeGraphic( if(nIndex >= aURL.getLength()) { - OSL_ENSURE( false, "ShapeImporter::importShape(): " + OSL_FAIL( "ShapeImporter::importShape(): " "embedded graphic has no graphic ID" ); return false; } @@ -137,7 +137,7 @@ bool importShapeGraphic( STREAM_READ ) ); if( !pGraphicStream ) { - OSL_ENSURE( false, "ShapeImporter::importShape(): " + OSL_FAIL( "ShapeImporter::importShape(): " "cannot create input stream for graphic" ); return false; } @@ -146,7 +146,7 @@ bool importShapeGraphic( if( GraphicConverter::Import( *pGraphicStream, aTmpGraphic ) != ERRCODE_NONE ) { - OSL_ENSURE( false, "ShapeImporter::importShape(): " + OSL_FAIL( "ShapeImporter::importShape(): " "Failed to import shape graphic from given URL" ); return false; } diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index f22927ddd520..e7e638a632b3 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -121,7 +121,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index e8b0930e1940..18f9bc94a956 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -198,8 +198,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index e861b789e561..fc3bfacde25c 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -115,7 +115,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -335,8 +335,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -499,8 +498,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -560,8 +558,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } |