diff options
author | Noel <noelgrandin@gmail.com> | 2020-11-30 14:19:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-12-01 09:28:52 +0100 |
commit | d6d80c4e1783b4459bd4a8fbcbdfeebe416c1cb5 (patch) | |
tree | 995c41a30f4224233267a8cfb05da41ae8c10275 /sd/source | |
parent | 102fdc08b86599b9e538d2f38df865d56b3ec63d (diff) |
OSL_FAIL.*exception -> TOOLS_WARN_EXCEPTION
Change-Id: I6800e23ead2767d245d5da71d2d40e0f8a6d7e1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106859
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
24 files changed, 105 insertions, 107 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index bf4c3dab60db..bbff1b9f6fdc 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <com/sun/star/animations/AnimationNodeType.hpp> #include <com/sun/star/animations/AnimateColor.hpp> @@ -360,7 +361,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In catch( Exception& ) { nSubItems = 0; - OSL_FAIL( "sd::CustomAnimationEffect::getNumberOfSubitems(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::getNumberOfSubitems(), exception caught!" ); } return nSubItems; @@ -685,7 +686,7 @@ void CustomAnimationEffect::setTarget( const css::uno::Any& rTarget ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setTarget(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setTarget()" ); } } @@ -720,7 +721,7 @@ void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setTargetSubItem(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setTargetSubItem()" ); } } @@ -772,7 +773,7 @@ void CustomAnimationEffect::setDuration( double fDuration ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setDuration(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setDuration()" ); } } @@ -785,7 +786,7 @@ void CustomAnimationEffect::setBegin( double fBegin ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setBegin(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setBegin()" ); } } @@ -798,7 +799,7 @@ void CustomAnimationEffect::setAcceleration( double fAcceleration ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setAcceleration(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setAcceleration()" ); } } @@ -811,7 +812,7 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setDecelerate(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setDecelerate()" ); } } @@ -824,7 +825,7 @@ void CustomAnimationEffect::setAutoReverse( bool bAutoReverse ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setAutoReverse(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setAutoReverse()" ); } } @@ -1072,7 +1073,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationEffect::setIterateType(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setIterateType()" ); } } @@ -1113,7 +1114,7 @@ OUString CustomAnimationEffect::getPath() const } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::getPath(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::getPath()" ); } return aPath; @@ -1142,7 +1143,7 @@ void CustomAnimationEffect::setPath( const OUString& rPath ) } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::setPath(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setPath()" ); } } @@ -1180,7 +1181,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, std::u16string_view } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::getProperty(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::getProperty()" ); } return aProperty; @@ -1232,7 +1233,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, std::u16string_vie } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::setProperty(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setProperty()" ); } return bChanged; @@ -1285,7 +1286,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex ) } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::getColor(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::getColor()" ); } return aColor; @@ -1342,7 +1343,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::setColor(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setColor()" ); } } @@ -1377,7 +1378,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::getTransformationProperty(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::getTransformationProperty()" ); } return aProperty; @@ -1426,7 +1427,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::setTransformationProperty(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setTransformationProperty()" ); } return bChanged; @@ -1449,7 +1450,7 @@ void CustomAnimationEffect::createAudio( const css::uno::Any& rSource ) } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::createAudio(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::createAudio()" ); } } @@ -1470,7 +1471,7 @@ static Reference< XCommand > findCommandNode( const Reference< XAnimationNode >& } catch( Exception& ) { - OSL_FAIL("sd::findCommandNode(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::findCommandNode()" ); } return xCommand; @@ -1502,7 +1503,7 @@ void CustomAnimationEffect::removeAudio() } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::removeAudio(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::removeAudio()" ); } } @@ -1522,7 +1523,7 @@ void CustomAnimationEffect::setAudio( const Reference< css::animations::XAudio > } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::setAudio(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setAudio()" ); } } @@ -1548,7 +1549,7 @@ void CustomAnimationEffect::setStopAudio() } catch( Exception& ) { - OSL_FAIL("sd::CustomAnimationEffect::setStopAudio(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationEffect::setStopAudio()" ); } } @@ -1762,7 +1763,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb } catch( Exception& ) { - OSL_FAIL( "sd::EffectSequenceHelper::append(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::append()" ); } return pEffect; @@ -1787,7 +1788,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con } catch( Exception& ) { - OSL_FAIL( "sd::EffectSequenceHelper::replace(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::replace()" ); } } @@ -1946,7 +1947,7 @@ void EffectSequenceHelper::implRebuild() } catch( Exception& ) { - OSL_FAIL( "sd::EffectSequenceHelper::rebuild(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::rebuild()" ); } } @@ -2083,7 +2084,7 @@ void stl_process_after_effect_node_func(AfterEffectNode const & rNode) } catch( Exception& ) { - OSL_FAIL( "ppt::stl_process_after_effect_node_func::operator(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "ppt::stl_process_after_effect_node_func::operator()" ); } } @@ -2585,7 +2586,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( const CustomAnimatio } catch( Exception& ) { - OSL_FAIL("sd::EffectSequenceHelper::createTextGroup(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::createTextGroup()" ); } } @@ -2889,7 +2890,7 @@ void EffectSequenceHelper::create( const css::uno::Reference< css::animations::X } catch( Exception& ) { - OSL_FAIL( "sd::EffectSequenceHelper::create(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::create()" ); } } @@ -2913,7 +2914,7 @@ void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode } catch( Exception& ) { - OSL_FAIL( "sd::EffectSequenceHelper::createEffectsequence(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::createEffectsequence()" ); } } @@ -2960,7 +2961,7 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo } catch( Exception& ) { - OSL_FAIL( "sd::EffectSequenceHelper::createEffects(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::createEffects()" ); } } @@ -3010,7 +3011,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode > } catch( Exception& ) { - OSL_FAIL( "sd::EffectSequenceHelper::processAfterEffect(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::EffectSequenceHelper::processAfterEffect()" ); } } @@ -3159,7 +3160,7 @@ void MainSequence::createMainSequence() } catch( Exception& ) { - OSL_FAIL( "sd::MainSequence::create(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::MainSequence::create()" ); return; } @@ -3514,7 +3515,7 @@ InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSe } catch( Exception& ) { - OSL_FAIL( "sd::InteractiveSequence::InteractiveSequence(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::InteractiveSequence::InteractiveSequence()" ); return; } } diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index d65d8aebce65..1082f9d8500b 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -79,7 +79,7 @@ static Reference< XNameAccess > getNodeAccess( const Reference< XMultiServiceFac } catch (const Exception&) { - OSL_FAIL( "sd::getNodeAccess(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::getNodeAccess()" ); } return xConfigAccess; @@ -109,13 +109,9 @@ void implImportLabels( const Reference< XMultiServiceFactory >& xConfigProvider, } } } - catch (const lang::WrappedTargetException&) - { - OSL_FAIL( "sd::implImportLabels(), WrappedTargetException caught!" ); - } catch (const Exception&) { - OSL_FAIL( "sd::implImportLabels(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::implImportLabels()" ); } } @@ -171,7 +167,7 @@ Reference< XAnimationNode > CustomAnimationPreset::create( const OUString& rstrS } catch (const Exception&) { - OSL_FAIL( "sd::CustomAnimationPresets::create(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPresets::create()" ); } Reference< XAnimationNode > xNode; @@ -306,21 +302,9 @@ void CustomAnimationPresets::importEffects() } } } - catch (const xml::sax::SAXParseException&) - { - OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), SAXParseException caught!" ); - } - catch (const xml::sax::SAXException&) - { - OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), SAXException caught!" ); - } - catch (const io::IOException&) - { - OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), IOException caught!" ); - } catch (const Exception&) { - OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPresets::importEffects()" ); } } @@ -350,13 +334,9 @@ void CustomAnimationPresets::importResources() importPresets( xConfigProvider, "/org.openoffice.Office.UI.Effects/Presets/Misc", maMiscPresets ); } - catch (const lang::WrappedTargetException&) - { - OSL_FAIL( "sd::CustomAnimationPresets::importResources(), WrappedTargetException caught!" ); - } catch (const Exception&) { - OSL_FAIL( "sd::CustomAnimationPresets::importResources(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPresets::importResources()" ); } } @@ -410,7 +390,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor } catch (const Exception&) { - OSL_FAIL( "sd::CustomAnimationPresets::importPresets(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPresets::importPresets()" ); } #ifdef DEBUG diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 1a8f55b90aed..19914e3498e4 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -34,6 +34,7 @@ #include <comphelper/lok.hxx> #include <unotools/syslocaleoptions.hxx> #include <officecfg/Office/UI/Effects.hxx> +#include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <osl/diagnose.h> @@ -354,7 +355,7 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) } catch( Exception& ) { - OSL_FAIL( "sd::TransitionPreset::importResources(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::TransitionPreset::importResources()" ); } return bRet; diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 143b5a47a2fd..a09abf0ecf57 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -26,6 +26,7 @@ #include <sfx2/app.hxx> #include <svl/itemset.hxx> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <sfx2/fcontnr.hxx> #include <svl/style.hxx> @@ -931,7 +932,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( } catch(...) { - OSL_FAIL("Exception while renaming styles @ SdDrawDocument::InsertBookmarkAsPage"); + TOOLS_WARN_EXCEPTION( "sd", "Exception while renaming styles @ SdDrawDocument::InsertBookmarkAsPage"); } } // remove copied styles not used on any inserted page and create diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index db487a74471a..d1949de20fb2 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -29,6 +29,7 @@ #include <DrawDocShell.hxx> #include <editeng/eeitem.hxx> +#include <tools/diagnose_ex.h> #include <vcl/idle.hxx> #include <vcl/settings.hxx> @@ -621,7 +622,7 @@ static void implCreateTableTemplate( const Reference< XNameContainer >& xTableFa } catch( Exception& ) { - OSL_FAIL("sd::implCreateTableTemplate(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::implCreateTableTemplate()"); } } diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index fb670e9585d4..aa44c9170b83 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -52,6 +52,7 @@ #include <svx/sdtagitm.hxx> #include <svx/sdtcfitm.hxx> #include <svx/xfillit0.hxx> +#include <tools/diagnose_ex.h> #include <com/sun/star/animations/XAnimationNode.hpp> #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -2713,7 +2714,7 @@ SdPage* SdPage::getImplementation( const css::uno::Reference< css::drawing::XDra } catch( css::uno::Exception& ) { - OSL_FAIL("sd::SdPage::getImplementation(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::SdPage::getImplementation()" ); } return nullptr; diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 30707c9be125..eab931cf0971 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -46,6 +46,7 @@ #include <editeng/emphasismarkitem.hxx> #include <svx/sdr/table/tabledesign.hxx> #include <editeng/autokernitem.hxx> +#include <tools/diagnose_ex.h> #include <editeng/lrspitem.hxx> #include <editeng/adjustitem.hxx> @@ -551,7 +552,7 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool const & rSourcePool) } catch( Exception& ) { - OSL_FAIL( "sd::SdStyleSheetPool::CopyTableStyles(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::SdStyleSheetPool::CopyTableStyles()" ); } if( xTargetStyle.is() ) @@ -568,7 +569,7 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool const & rSourcePool) } catch( Exception& ) { - OSL_FAIL("sd::SdStyleSheetPool::CopyTableStyles(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::SdStyleSheetPool::CopyTableStyles()"); } } diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 707d14bf885b..64b2333226ea 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -27,6 +27,7 @@ #include <sdresid.hxx> #include <CustomAnimationEffect.hxx> #include <drawdoc.hxx> +#include <tools/diagnose_ex.h> namespace com::sun::star::animations { class XAnimationNode; } @@ -58,7 +59,7 @@ UndoAnimation::UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage ) } catch( Exception& ) { - OSL_FAIL("sd::UndoAnimation::UndoAnimation(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::UndoAnimation::UndoAnimation()"); } } @@ -85,7 +86,7 @@ void UndoAnimation::Undo() } catch( Exception& ) { - OSL_FAIL("sd::UndoAnimation::Undo(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::UndoAnimation::Undo()"); } } @@ -100,7 +101,7 @@ void UndoAnimation::Redo() } catch( Exception& ) { - OSL_FAIL("sd::UndoAnimation::Redo(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::UndoAnimation::Redo()"); } } diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index d1659dd730d3..1b8f314dff38 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -58,6 +58,7 @@ #include <filter/msfilter/escherex.hxx> #include <osl/diagnose.h> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <algorithm> @@ -393,7 +394,7 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode } catch( Exception& ) { - OSL_FAIL( "(@CL)AnimationExporter::processAfterEffectNodes(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "(@CL)AnimationExporter::processAfterEffectNodes()" ); } } diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index cb382303287f..8f9ec50423a2 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -33,6 +33,7 @@ #include <vcl/virdev.hxx> #include <vcl/image.hxx> #include <unotools/pathoptions.hxx> +#include <tools/diagnose_ex.h> #include <memory> @@ -72,7 +73,7 @@ ButtonsImpl::ButtonsImpl( const OUString& rURL ) } catch( Exception& ) { - OSL_FAIL("sd::ButtonsImpl::ButtonsImpl(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::ButtonsImpl()" ); } } @@ -87,7 +88,7 @@ Reference< XInputStream > ButtonsImpl::getInputStream( const OUString& rName ) } catch( Exception& ) { - OSL_FAIL( "sd::ButtonsImpl::getInputStream(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::getInputStream()" ); } return xInputStream; } @@ -110,7 +111,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi } catch( Exception& ) { - OSL_FAIL( "sd::ButtonsImpl::getGraphic(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::getGraphic()" ); } return false; } @@ -131,7 +132,7 @@ bool ButtonsImpl::copyGraphic( const OUString& rName, const OUString& rPath ) } catch( Exception& ) { - OSL_FAIL( "sd::ButtonsImpl::copyGraphic(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::copyGraphic()" ); } return false; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 67e0e0cc66b1..ee22e18fc28a 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -47,6 +47,7 @@ #include <sfx2/objsh.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> +#include <tools/diagnose_ex.h> #include <editeng/flstitem.hxx> @@ -1397,7 +1398,7 @@ void CustomAnimationEffectTabPage::onSoundPreview() } catch( uno::Exception& ) { - OSL_FAIL("CustomAnimationEffectTabPage::onSoundPreview(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "CustomAnimationEffectTabPage::onSoundPreview()" ); } #endif } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index b0299ddf0f20..2b24919a57a0 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -37,6 +37,7 @@ #include <vcl/weldutils.hxx> #include <tools/debug.hxx> #include <tools/gen.hxx> +#include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <sdresid.hxx> @@ -144,7 +145,7 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText } catch( Exception& ) { - OSL_FAIL("sd::getShapeDescription(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::getShapeDescription()" ); } if (bAppendIndex) @@ -909,7 +910,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) } catch (const Exception&) { - OSL_FAIL("sd::CustomAnimationList::append(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationList::append()" ); } } @@ -963,7 +964,7 @@ void CustomAnimationList::onSelectionChanged(const Any& rSelection) } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationList::onSelectionChanged(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationList::onSelectionChanged()" ); } } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 4832de20446a..95a0eb941597 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -51,6 +51,7 @@ #include <comphelper/sequence.hxx> #include <sfx2/frame.hxx> #include <sfx2/sidebar/Theme.hxx> +#include <tools/diagnose_ex.h> #include <svx/unoapi.hxx> #include <svx/svxids.hrc> @@ -194,7 +195,7 @@ void CustomAnimationPane::initialize() } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationPane::CustomAnimationPane(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPane::CustomAnimationPane()" ); } // get current page and update custom animation list @@ -845,7 +846,7 @@ void CustomAnimationPane::onSelectionChanged() } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationPane::onSelectionChanged(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPane::onSelectionChanged()" ); } } @@ -1659,7 +1660,7 @@ void CustomAnimationPane::onChangeCurrentPage() } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationPane::onChangeCurrentPage(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPane::onChangeCurrentPage()" ); } } @@ -1718,7 +1719,7 @@ static bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape } catch( Exception& ) { - OSL_FAIL( "sd::CustomAnimationPane::getTextSelection(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPane::getTextSelection()" ); } return false; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index c98b433ee350..d72dba3d8181 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -41,6 +41,7 @@ #include <tools/datetime.hxx> #include <tools/UnitConversion.hxx> +#include <tools/diagnose_ex.h> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> @@ -185,7 +186,7 @@ void AnnotationManagerImpl::init() } catch( Exception& ) { - OSL_FAIL( "sd::AnnotationManagerImpl::AnnotationManagerImpl(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::AnnotationManagerImpl::AnnotationManagerImpl()" ); } try @@ -911,7 +912,7 @@ void AnnotationManagerImpl::onSelectionChanged() } catch( Exception& ) { - OSL_FAIL( "sd::AnnotationManagerImpl::onSelectionChanged(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::AnnotationManagerImpl::onSelectionChanged()" ); } } @@ -985,7 +986,7 @@ void AnnotationManagerImpl::CreateTags() } catch( Exception& ) { - OSL_FAIL( "sd::AnnotationManagerImpl::onSelectionChanged(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::AnnotationManagerImpl::onSelectionChanged()" ); } } diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index a5d599de1a1e..6302608f93cc 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -40,6 +40,7 @@ #include <svx/ImageMapInfo.hxx> #include <sot/formats.hxx> #include <svl/urlbmk.hxx> +#include <tools/diagnose_ex.h> #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -588,7 +589,7 @@ bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* } catch( Exception& ) { - OSL_FAIL( "sd::SdTransferable::WriteObject(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::SdTransferable::WriteObject()" ); bRet = false; } } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index e4f36ff7fe14..0aa637d0dc43 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1456,7 +1456,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape ) } catch( uno::Exception& ) { - OSL_FAIL("sd::SlideshowImpl::click(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::click()" ); } #endif } @@ -2520,7 +2520,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn) } catch( Exception& ) { - OSL_FAIL("sd::SlideshowImpl::setAutoSaveState(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::SlideshowImpl::setAutoSaveState()"); } } diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index d3fba2087432..6a7772cd75de 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -23,6 +23,7 @@ #include <sdpage.hxx> #include <comphelper/profilezone.hxx> +#include <tools/diagnose_ex.h> namespace sd::slidesorter::cache { @@ -161,13 +162,9 @@ void QueueProcessor::ProcessOneRequest ( } } } - catch (css::uno::RuntimeException &) - { - OSL_FAIL("RuntimeException caught in QueueProcessor"); - } catch (css::uno::Exception &) { - OSL_FAIL("Exception caught in QueueProcessor"); + TOOLS_WARN_EXCEPTION( "sd", "QueueProcessor"); } } diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 47e033bf80a2..6ae302375449 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -43,6 +43,7 @@ #include <view/SlsToolTip.hxx> #include <cache/SlsPageCache.hxx> #include <cache/SlsPageCacheManager.hxx> +#include <tools/diagnose_ex.h> #include <drawdoc.hxx> #include <ViewShellBase.hxx> @@ -157,7 +158,7 @@ SlideSorterController::~SlideSorterController() } catch( uno::Exception& ) { - OSL_FAIL( "sd::SlideSorterController::~SlideSorterController(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::SlideSorterController::~SlideSorterController()" ); } // dispose should have been called by now so that nothing is to be done diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 4847ff3114bd..1bda593e16be 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -29,6 +29,7 @@ #include <model/SlsPageEnumerationProvider.hxx> #include <model/SlsPageDescriptor.hxx> #include <view/SlideSorterView.hxx> +#include <tools/diagnose_ex.h> #include <drawdoc.hxx> #include <sdpage.hxx> #include <drawview.hxx> @@ -174,7 +175,7 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& } catch( Exception& ) { - OSL_FAIL("SelectionManager::DeleteSelectedNormalPages(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "SelectionManager::DeleteSelectedNormalPages()"); } } @@ -207,7 +208,7 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>& } catch( Exception& ) { - OSL_FAIL("SelectionManager::DeleteSelectedMasterPages(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "SelectionManager::DeleteSelectedMasterPages()"); } } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 028d8f2a4266..b8c5ccd3cfc9 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -54,6 +54,7 @@ #include <svx/svxids.hrc> #include <vcl/EnumContext.hxx> #include <svx/sidebar/ContextChangeEventMultiplexer.hxx> +#include <tools/diagnose_ex.h> using namespace ::sd::slidesorter; #define ShellClass_SlideSorterViewShell @@ -139,7 +140,7 @@ SlideSorterViewShell::~SlideSorterViewShell() } catch( css::uno::Exception& ) { - OSL_FAIL("sd::SlideSorterViewShell::~SlideSorterViewShell(), exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::SlideSorterViewShell::~SlideSorterViewShell()" ); } GetFrameView()->Disconnect(); } diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 0680c268d3b4..4fce1f9bf324 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -35,6 +35,7 @@ #include <vcl/virdev.hxx> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <svl/style.hxx> #include <svl/stritem.hxx> #include <sfx2/bindings.hxx> @@ -118,7 +119,7 @@ TableDesignWidget::TableDesignWidget(weld::Builder& rBuilder, ViewShellBase& rBa } catch (const Exception&) { - OSL_FAIL( "sd::CustomAnimationPane::CustomAnimationPane(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::CustomAnimationPane::CustomAnimationPane()" ); } onSelectionChanged(); @@ -197,7 +198,7 @@ void TableDesignWidget::ApplyStyle() } catch( Exception& ) { - OSL_FAIL("TableDesignWidget::implValueSetHdl(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "TableDesignWidget::implValueSetHdl()"); } } @@ -272,7 +273,7 @@ void TableDesignWidget::onSelectionChanged() } catch( Exception& ) { - OSL_FAIL( "sd::TableDesignWidget::onSelectionChanged(), Exception caught!" ); + TOOLS_WARN_EXCEPTION( "sd", "sd::TableDesignWidget::onSelectionChanged()" ); } if( mxSelectedTable != xNewSelection ) @@ -355,7 +356,7 @@ void TableDesignWidget::updateControls() } catch( Exception& ) { - OSL_FAIL("sd::TableDesignWidget::updateControls(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::TableDesignWidget::updateControls()"); } m_aCheckBoxes[i]->set_active(bUse); m_aCheckBoxes[i]->set_sensitive(bHasTable); @@ -505,7 +506,7 @@ static void FillCellInfoVector( const Reference< XIndexAccess >& xTableStyle, Ce } catch(Exception&) { - OSL_FAIL("sd::FillCellInfoVector(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::FillCellInfoVector()"); } } @@ -734,7 +735,7 @@ void TableDesignWidget::FillDesignPreviewControl() } catch( Exception& ) { - OSL_FAIL("sd::TableDesignWidget::FillDesignPreviewControl(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::TableDesignWidget::FillDesignPreviewControl()"); } sal_Int32 nCols = 3; sal_Int32 nRows = (nCount+2)/3; @@ -754,7 +755,7 @@ void TableDesignWidget::FillDesignPreviewControl() } catch( Exception& ) { - OSL_FAIL("sd::TableDesignWidget::FillDesignPreviewControl(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::TableDesignWidget::FillDesignPreviewControl()"); } m_xValueSet->SelectItem(nSelectedItem); } diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 6f84adf95d6f..c19445429128 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -35,6 +35,7 @@ #include <sfx2/request.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <svl/style.hxx> +#include <tools/diagnose_ex.h> #include <tablefunction.hxx> #include <DrawViewShell.hxx> @@ -80,7 +81,7 @@ static void apply_table_style( SdrTableObj* pObj, SdrModel const * pModel, const } catch( Exception& ) { - OSL_FAIL("sd::apply_default_table_style(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::apply_default_table_style()"); } } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 11417c30651b..54a779ade127 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -37,6 +37,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/metaact.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <AnnotationEnumeration.hxx> #include <createunopageimpl.hxx> @@ -2860,7 +2861,7 @@ void SdMasterPage::setBackground( const Any& rValue ) } catch( Exception& ) { - OSL_FAIL("sd::SdMasterPage::setBackground(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "sd::SdMasterPage::setBackground()"); } } @@ -2917,8 +2918,8 @@ void SdMasterPage::getBackground( Any& rValue ) } catch( Exception& ) { + TOOLS_WARN_EXCEPTION( "sd", "sd::SdMasterPage::getBackground()"); rValue.clear(); - OSL_FAIL("sd::SdMasterPage::getBackground(), exception caught!"); } } diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index b6a9d424a8db..ee6ab513e4f0 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -40,6 +40,7 @@ #include <editeng/editview.hxx> #include <vcl/cursor.hxx> #include <vcl/commandevent.hxx> +#include <tools/diagnose_ex.h> #include <app.hrc> #include <strings.hrc> @@ -102,7 +103,7 @@ void DrawViewShell::DeleteActualPage() } catch( Exception& ) { - OSL_FAIL("SelectionManager::DeleteSelectedMasterPages(), exception caught!"); + TOOLS_WARN_EXCEPTION( "sd", "SelectionManager::DeleteSelectedMasterPages()"); } } |