From e9b90a771e541ccf0dfc130f897bdea9e6e4771e Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Thu, 3 Mar 2011 15:21:20 +0100 Subject: Move DBG_ERROR to OSL_FAIL for getStr() (multiline) --- sd/source/core/CustomAnimationCloner.cxx | 6 ++--- sd/source/core/drawdoc3.cxx | 2 +- sd/source/filter/grf/sdgrffilter.cxx | 2 +- sd/source/filter/html/htmlex.cxx | 4 ++-- sd/source/ui/slideshow/slideshowimpl.cxx | 38 ++++++++++++++++---------------- sd/source/ui/unoidl/DrawController.cxx | 2 +- sd/source/ui/view/drviews1.cxx | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sd/source') diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 3a039fb18af1..5776e930c93e 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -140,7 +140,7 @@ namespace sd catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::CustomAnimationClonerImpl::Clone(), " "exception caught: ") + rtl::OUStringToOString( @@ -225,7 +225,7 @@ namespace sd catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::CustomAnimationClonerImpl::transformNode(), " "exception caught: ") + rtl::OUStringToOString( @@ -300,7 +300,7 @@ namespace sd catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::CustomAnimationClonerImpl::transformValue(), " "exception caught: ") + rtl::OUStringToOString( diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index b4a698c9cfdf..ee3016e33b84 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1276,7 +1276,7 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) catch( uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (rtl::OString("sd::SdDrawDocument::GetDocumentStream(), " "exception caught: ") + rtl::OUStringToOString( diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 162379581d3d..318b7cee79ca 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -547,7 +547,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su } catch( Exception& ) { - DBG_ERROR( + OSL_FAIL( (rtl::OString("SdGRFFilter::SaveGraphic(), " "exception caught: ") + rtl::OUStringToOString( diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 80f21e0676f7..5c74509013c8 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3084,7 +3084,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA catch( com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR((OString("sd::HtmlExport::checkFileExists(), exception caught: ") + + OSL_FAIL((OString("sd::HtmlExport::checkFileExists(), exception caught: ") + rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -3147,7 +3147,7 @@ bool HtmlExport::checkForExistingFiles() catch( Exception& e ) { (void)e; - DBG_ERROR((OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") + + OSL_FAIL((OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") + rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); bFound = false; } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 63bce31f8cb8..7a53fc8bb9ee 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -344,7 +344,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::AnimationSlideController::getSlideAPI(), " "exception caught: ") + rtl::OUStringToOString( @@ -651,7 +651,7 @@ void SAL_CALL SlideshowImpl::disposing() catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::stop(), " "exception caught: ") + rtl::OUStringToOString( @@ -786,7 +786,7 @@ bool SlideshowImpl::startPreview( if (supportedServices[pos].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.MasterPage") )) { - DBG_ERROR("sd::SlideshowImpl::startPreview() " + OSL_FAIL("sd::SlideshowImpl::startPreview() " "not allowed on master page!"); return false; } @@ -1122,7 +1122,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::startShow(), " "exception caught: ") + rtl::OUStringToOString( @@ -1185,7 +1185,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::startShowImpl(), " "exception caught: ") + rtl::OUStringToOString( @@ -1222,7 +1222,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::paint(), " "exception caught: ") + rtl::OUStringToOString( @@ -1277,7 +1277,7 @@ void SlideshowImpl::removeShapeEvents() catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::removeShapeEvents(), " "exception caught: ") + rtl::OUStringToOString( @@ -1313,7 +1313,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) catch( Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::registerShapeEvents(), " "exception caught: ") + rtl::OUStringToOString( @@ -1393,7 +1393,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::registerShapeEvents(), " "exception caught: ") + rtl::OUStringToOString( @@ -1473,7 +1473,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::pause(), " "exception caught: ") + rtl::OUStringToOString( @@ -1510,7 +1510,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::resume(), " "exception caught: ") + rtl::OUStringToOString( @@ -1927,7 +1927,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ") + rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), @@ -2059,7 +2059,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) { bRet = false; static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::keyInput(), " "exception caught: ") + rtl::OUStringToOString( @@ -2568,7 +2568,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const catch( uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::createSlideShow(), " "exception caught: ") + rtl::OUStringToOString( @@ -2778,7 +2778,7 @@ void SlideshowImpl::resize( const Size& rSize ) catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::resize(), " "exception caught: ") + rtl::OUStringToOString( @@ -3156,7 +3156,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::setUsePen(), " "exception caught: ") + rtl::OUStringToOString( @@ -3194,7 +3194,7 @@ void SAL_CALL SlideshowImpl::setUseEraser( sal_Bool bMouseAsPen ) throw (Runtime catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::setUseEraser(), " "exception caught: ") + rtl::OUStringToOString( @@ -3505,7 +3505,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::gotoPreviousSlide(), " "exception caught: ") + rtl::OUStringToOString( @@ -3606,7 +3606,7 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) catch( Exception& e ) { static_cast(e); - DBG_ERROR( + OSL_FAIL( (OString("sd::SlideshowImpl::stopSound(), " "exception caught: ") + rtl::OUStringToOString( diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 9f2ec7e3964b..68cdf820c75b 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -532,7 +532,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw() catch( uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (::rtl::OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), " "exception caught: ") + ::rtl::OUStringToOString( diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index c2810502dc2f..cf2663ae5976 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -258,7 +258,7 @@ void DrawViewShell::SelectionHasChanged (void) catch( ::com::sun::star::uno::Exception& e ) { (void)e; - DBG_ERROR( + OSL_FAIL( (rtl::OString("sd::DrawViewShell::SelectionHasChanged(), " "exception caught: ") + rtl::OUStringToOString( -- cgit