summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source/filter')
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlComponent.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.cxx5
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx5
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlReport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlSection.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx5
15 files changed, 32 insertions, 18 deletions
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");
}
}
generated by cgit (git 2.34.1) at 2024-07-10 14:49:59 +0000