summaryrefslogtreecommitdiff
path: root/sd/source/ui/table
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-30 14:19:29 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-12-01 09:28:52 +0100
commitd6d80c4e1783b4459bd4a8fbcbdfeebe416c1cb5 (patch)
tree995c41a30f4224233267a8cfb05da41ae8c10275 /sd/source/ui/table
parent102fdc08b86599b9e538d2f38df865d56b3ec63d (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/ui/table')
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx15
-rw-r--r--sd/source/ui/table/tablefunction.cxx3
2 files changed, 10 insertions, 8 deletions
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()");
}
}