summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx3
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx7
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx9
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx7
-rw-r--r--sd/source/ui/app/sdxfer.cxx3
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx7
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx3
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx5
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx3
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx15
-rw-r--r--sd/source/ui/table/tablefunction.cxx3
-rw-r--r--sd/source/ui/unoidl/unopage.cxx5
-rw-r--r--sd/source/ui/view/drviews4.cxx3
14 files changed, 43 insertions, 34 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;
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()");
}
}
generated by cgit (git 2.34.1) at 2024-07-28 13:05:08 +0000