diff options
author | Noel <noelgrandin@gmail.com> | 2020-11-30 14:19:29 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-03-31 10:28:06 +0200 |
commit | 54bfbdc2ffb8938dbef5febe50c22e4eaf4b3c03 (patch) | |
tree | 11c99039401b885c8809b7ffff8ffeebf9781cb9 /reportdesign | |
parent | 09deac70e486ca609a25a817cdbea754eb7c5649 (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 'reportdesign')
27 files changed, 70 insertions, 52 deletions
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 984bf7d26305..42082bfc3e95 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -21,6 +21,7 @@ #include <strings.hrc> #include <core_resource.hxx> #include <cppuhelper/supportsservice.hxx> +#include <tools/diagnose_ex.h> #include <Tools.hxx> #include <FormatCondition.hxx> #include <ReportHelperImpl.hxx> @@ -171,7 +172,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex } catch(uno::Exception&) { - OSL_FAIL("OFixedLine::OFixedLine: Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "OFixedLine::OFixedLine"); } osl_atomic_decrement( &m_refCount ); } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 981c42bdf00b..4ae9e44be52b 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1069,7 +1069,7 @@ void SAL_CALL OReportDefinition::close(sal_Bool bDeliverOwnership) catch (const util::CloseVetoException&) { throw; } catch (const uno::Exception&) { - OSL_FAIL( "ODatabaseDocument::impl_closeControllerFrames: caught an unexpected exception!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "ODatabaseDocument::impl_closeControllerFrames" ); } } } @@ -1374,7 +1374,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS } catch (const uno::Exception&) { - OSL_FAIL("Exception Caught: Could not commit report storage!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Could not commit report storage!"); throw io::IOException(); } diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index bf652d01f343..0450e2d342ba 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -137,7 +137,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } catch(Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } m_bInChange = false; } diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 0486c787fc2f..b83f742676c6 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -374,7 +374,7 @@ void OObjectBase::EndListening() } catch(const uno::Exception &) { - OSL_FAIL("OObjectBase::EndListening: Exception caught!"); + TOOLS_WARN_EXCEPTION( "package", "OObjectBase::EndListening"); } } m_xPropertyChangeListener.clear(); diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index a118970e106b..1ce789210df1 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/table/BorderLine2.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <strings.hxx> #include "xmlTable.hxx" #include "xmlFormattedField.hxx" @@ -232,7 +233,7 @@ void OXMLCell::endFastElement(sal_Int32) } catch(uno::Exception&) { - OSL_FAIL("OXMLCell::EndElement -> exception caught"); + TOOLS_WARN_EXCEPTION( "reportdesign", "OXMLCell::EndElement -> exception caught"); } } } diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index c6433d2a87ed..ab55e9215bf3 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -22,6 +22,7 @@ #include <xmloff/xmlnamespace.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml { @@ -56,7 +57,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport } catch(const Exception&) { - OSL_FAIL("Exception caught while putting props into report component!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while putting props into report component!"); } } } diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 5ffd0284e520..35167e338095 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -23,6 +23,7 @@ #include <strings.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml { @@ -58,7 +59,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport } catch(const Exception&) { - OSL_FAIL("Exception caught while putting Function props!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while putting Function props!"); } } diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index ca381b22760b..235f6931778f 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -23,6 +23,7 @@ #include "xmlHelper.hxx" #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml { @@ -67,7 +68,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception caught while filling the report definition props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the report definition props"); } } diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 4c419844e756..c34f8adf2414 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -22,6 +22,7 @@ #include <xmloff/xmlnamespace.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml @@ -64,7 +65,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport } catch(Exception&) { - OSL_FAIL("Exception caught while filling the report definition props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the report definition props"); } } diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 1c26aa4dd27c..62dcaa9256f7 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -22,6 +22,7 @@ #include <xmloff/xmlnamespace.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml { @@ -76,7 +77,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport } catch(const Exception&) { - OSL_FAIL("Exception caught while putting Function props!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while putting Function props!"); } } } @@ -106,7 +107,7 @@ void OXMLFunction::endFastElement(sal_Int32 ) m_xFunction.clear(); }catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } } } diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index be7fc44e4d5d..94f6028494ce 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/report/KeepTogether.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml { @@ -164,7 +165,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport } catch(const Exception&) { - OSL_FAIL("Exception caught while putting group props!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while putting group props!"); } } } @@ -236,7 +237,7 @@ void OXMLGroup::endFastElement(sal_Int32 ) m_xGroups->insertByIndex(0,uno::makeAny(m_xGroup)); }catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } } diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 68ba54601959..e26f30be6492 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/style/VerticalAlignment.hpp> #include <xmloff/EnumPropertyHdl.hxx> #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> #define XML_RPT_ALIGNMENT (XML_DB_TYPES_START+1) namespace rptxml @@ -309,7 +310,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName, } catch(uno::Exception&) { - OSL_FAIL("OXMLHelper::copyStyleElements -> exception caught"); + TOOLS_WARN_EXCEPTION( "reportdesign", "OXMLHelper::copyStyleElements"); } } diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index fe4d9395232f..9f27b6151e82 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -25,6 +25,7 @@ #include <unotools/pathoptions.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> #include <com/sun/star/awt/ImageScaleMode.hpp> @@ -90,7 +91,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception caught while filling the image props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the image props"); } } diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 4012f2632dc7..81ff22b0b26a 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -35,6 +35,7 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmlnamespace.hxx> +#include <tools/diagnose_ex.h> #include "xmlHelper.hxx" #include "xmlEnums.hxx" @@ -229,7 +230,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const } catch(uno::Exception&) { - OSL_FAIL("Exception caught while filling the report definition props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the report definition props"); } bExport = false; } diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index a60b42133f69..a559946fc848 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -94,7 +94,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception caught while filling the report definition props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the report definition props"); } } diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 14e3958d3c94..0c49c9fb47e3 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -27,6 +27,7 @@ #include "xmlFormatCondition.hxx" #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml { @@ -67,7 +68,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception caught while filling the report definition props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the report definition props"); } } diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 532cac436429..590af5a2f687 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -25,6 +25,7 @@ #include "xmlEnums.hxx" #include "xmlTable.hxx" #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> namespace rptxml { @@ -86,7 +87,7 @@ void OXMLReportElementBase::endFastElement(sal_Int32 ) } catch(Exception&) { - OSL_FAIL("Exception caught while inserting a new control!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while inserting a new control!"); } } diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 5e1c47e1869c..6e1954ab0456 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -26,6 +26,7 @@ #include "xmlTable.hxx" #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> namespace rptxml @@ -79,7 +80,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception caught while filling the section props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the section props"); } } diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 55c44df062c2..2c3bc48cbdda 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/report/XFixedLine.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <numeric> @@ -106,7 +107,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport } catch(Exception&) { - OSL_FAIL("Exception caught while filling the section props"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while filling the section props"); } } @@ -251,7 +252,7 @@ void OXMLTable::endFastElement(sal_Int32 ) } catch(Exception&) { - OSL_FAIL("OXMLTable::EndElement -> exception caught"); + TOOLS_WARN_EXCEPTION( "reportdesign", "OXMLTable::EndElement"); } } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 2aca2085fad5..42ed619445e2 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -38,6 +38,7 @@ #include <cppuhelper/implbase.hxx> #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> +#include <tools/diagnose_ex.h> #include <algorithm> @@ -476,7 +477,7 @@ bool OFieldExpressionControl::SaveModified() } catch(uno::Exception&) { - OSL_FAIL("OFieldExpressionControl::SaveModified: Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "OFieldExpressionControl::SaveModified"); } } @@ -501,7 +502,7 @@ OUString OFieldExpressionControl::GetCellText( sal_Int32 nRow, sal_uInt16 /*nCol } catch (const uno::Exception&) { - OSL_FAIL("Exception caught while getting expression value from the group"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while getting expression value from the group"); } } return sText; @@ -573,7 +574,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(sal_Int32 nRow) c } catch(uno::Exception&) { - OSL_FAIL("Exception caught while try to get a group!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while try to get a group!"); } } return EditBrowseBox::CLEAN; @@ -921,7 +922,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName) } catch(uno::Exception&) { - OSL_FAIL("Exception caught while getting the type of a column"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while getting the type of a column"); } return nDataType; diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 92c53478df73..9f22c4e5ae35 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <metadata.hxx> #include <osl/mutex.hxx> +#include <tools/diagnose_ex.h> #include <core_resource.hxx> #include <helpids.h> #include <strings.hrc> @@ -287,7 +288,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _ } catch( const uno::Exception& ) { - OSL_FAIL( "DataProviderHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "DataProviderHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } break; case PROPERTY_ID_MASTERFIELDS: @@ -321,7 +322,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _r } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } break; default: diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 079812ccb1c9..b5b78e02f74e 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -987,7 +987,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } } } @@ -1160,7 +1160,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::convertToControlValue: caught an exception while converting via TypeConverter!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "GeometryHandler::convertToControlValue: caught an exception while converting via TypeConverter!" ); } } break; @@ -1687,7 +1687,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } } @@ -1718,7 +1718,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } } @@ -1832,7 +1832,7 @@ bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } return bDefaultFunction; } @@ -1871,7 +1871,7 @@ bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< repo } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } return bDefaultFunction; } @@ -1956,7 +1956,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } } diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index c9cfbbd4ba72..d5265a514bfb 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -21,6 +21,7 @@ #include <o3tl/safeint.hxx> #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> #include <formula/funcvarargs.h> @@ -167,7 +168,7 @@ OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArgu } catch(const uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } return sFormula; } diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index bb319b668377..be280a8368f2 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -85,7 +85,7 @@ namespace } catch(const uno::Exception&) { - OSL_FAIL("lcl_insertElements:Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "lcl_insertElements"); } } } @@ -103,7 +103,7 @@ namespace } catch(const uno::Exception&) { - OSL_FAIL("lcl_setValues:Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "lcl_setValues"); } } } @@ -143,7 +143,7 @@ OSectionUndo::~OSectionUndo() } catch(const uno::Exception &) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } } } @@ -334,7 +334,7 @@ void OGroupUndo::implReInsert( ) } catch(uno::Exception&) { - OSL_FAIL("Exception caught while undoing remove group"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while undoing remove group"); } } @@ -346,7 +346,7 @@ void OGroupUndo::implReRemove( ) } catch(uno::Exception&) { - OSL_FAIL("Exception caught while redoing remove group"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while redoing remove group"); } } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index cae05f329d5a..53d6fb125813 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -309,7 +309,7 @@ void OReportController::disposing() } catch(const uno::Exception&) { - OSL_FAIL("Exception caught while disposing row sets."); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while disposing row sets."); } m_xRowSet.clear(); m_xRowSetMediator.clear(); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 9eb402e841e3..ace815efbf9b 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -91,7 +91,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + TOOLS_WARN_EXCEPTION( "reportdesign", ""); } m_pFunc.reset(new DlgEdFuncSelect( this )); @@ -274,7 +274,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC } catch(uno::Exception&) { - OSL_FAIL("Exception caught while pasting a new object!"); + TOOLS_WARN_EXCEPTION( "reportdesign", "Exception caught while pasting a new object!"); } if ( !_bForce ) break; @@ -541,7 +541,7 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I } catch(const uno::Exception &) { - OSL_FAIL("Exception caught: OReportSection::impl_adjustObjectSizePosition()"); + TOOLS_WARN_EXCEPTION( "reportdesign", "OReportSection::impl_adjustObjectSizePosition()"); } } diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index fe4c7df47f0b..84656ded767f 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -235,7 +235,7 @@ OUString PropBrw::getCurrentPage() const } catch( const Exception& ) { - OSL_FAIL( "PropBrw::getCurrentPage: caught an exception while retrieving the current page!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "PropBrw::getCurrentPage: caught an exception while retrieving the current page!" ); } return sCurrentPage; } @@ -255,7 +255,7 @@ bool PropBrw::Close() } catch( const Exception& ) { - OSL_FAIL( "FmPropBrw::Close: caught an exception while asking the controller!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "FmPropBrw::Close: caught an exception while asking the controller!" ); } } implDetachController(); @@ -310,7 +310,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> } catch( const Exception& ) { - OSL_FAIL( "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } } SetText( GetHeadlineName(_aObjects) ); @@ -446,7 +446,7 @@ void PropBrw::Update( OSectionView* pNewView ) } catch( const Exception& ) { - OSL_FAIL( "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } } } @@ -489,7 +489,7 @@ void PropBrw::Update( OSectionView* pNewView ) } catch ( Exception& ) { - OSL_FAIL( "PropBrw::Update: Exception occurred!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "PropBrw::Update" ); } } @@ -512,7 +512,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) } catch ( Exception& ) { - OSL_FAIL( "PropBrw::Update: Exception occurred!" ); + TOOLS_WARN_EXCEPTION( "reportdesign", "PropBrw::Update: Exception occurred!" ); } } |