diff options
Diffstat (limited to 'sd/source/ui/animations')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 9 |
3 files changed, 11 insertions, 8 deletions
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; |