summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 12:04:35 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:05:07 +0100
commitf6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (patch)
treec2c0b2f76362e442e1cbdec027ea4625f8ed3165 /reportdesign
parent7a7f390db3656b976a5c9fc8d081d5e3c60582e8 (diff)
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/FixedLine.cxx2
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx6
-rw-r--r--reportdesign/source/core/sdr/PropertyForward.cxx2
-rw-r--r--reportdesign/source/core/sdr/RptModel.cxx2
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx14
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlComponent.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlSection.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlSubDocument.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx6
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx2
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx10
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx10
-rw-r--r--reportdesign/source/ui/misc/Undo.cxx10
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx6
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx8
-rw-r--r--reportdesign/source/ui/report/dlgedfac.cxx2
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx2
35 files changed, 68 insertions, 68 deletions
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index a409f13bdf43..6db745085f61 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -188,7 +188,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"OFixedLine::OFixedLine: Exception caught!");
+ OSL_FAIL("OFixedLine::OFixedLine: Exception caught!");
}
osl_decrementInterlockedCount( &m_refCount );
}
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 7c0b013879bd..4bec3a6fa7c9 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -769,7 +769,7 @@ void OReportDefinition::init()
}
catch(uno::Exception)
{
- OSL_ENSURE(0,"Error!");
+ OSL_FAIL("Error!");
}
}
// -----------------------------------------------------------------------------
@@ -1183,7 +1183,7 @@ void SAL_CALL OReportDefinition::setParent( const uno::Reference< uno::XInterfac
// XCloneable
uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) throw (uno::RuntimeException)
{
- OSL_ENSURE(0,"Not yet implemented correctly");
+ OSL_FAIL("Not yet implemented correctly");
uno::Reference< report::XReportComponent> xSource = this;
uno::Reference< report::XReportDefinition> xSet(cloneObject(xSource,m_aProps->m_xFactory,SERVICE_REPORTDEFINITION),uno::UNO_QUERY_THROW);
return xSet.get();
@@ -1600,7 +1600,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
}
catch(uno::Exception)
{
- OSL_ENSURE(0,"Exception Caught: Could not commit report storage!");
+ OSL_FAIL("Exception Caught: 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 09d9b1037b3b..b645d3b3a812 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -164,7 +164,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched!");
+ OSL_FAIL("Exception catched!");
}
m_bInChange = sal_False;
}
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 5fd634c61264..f2dab3fc8e12 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -93,7 +93,7 @@ void OReportModel::detachController()
SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/)
{
DBG_CHKTHIS( rpt_OReportModel, 0);
- OSL_ENSURE(0,"Who called me!");
+ OSL_FAIL("Who called me!");
return NULL;
}
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 9410c75019e6..573bce8980df 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -172,7 +172,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
pNewObj = OOle2Obj::Create( _xComponent,nType );
break;
default:
- OSL_ENSURE(0,"Unknown object id");
+ OSL_FAIL("Unknown object id");
break;
}
@@ -205,7 +205,7 @@ namespace
nTextAlign = style::ParagraphAdjust_RIGHT;
break;
default:
- OSL_ENSURE(0,"Illegal text alignment value!");
+ OSL_FAIL("Illegal text alignment value!");
break;
}
aRet <<= (style::ParagraphAdjust)nTextAlign;
@@ -228,7 +228,7 @@ namespace
nTextAlign = awt::TextAlign::RIGHT;
break;
default:
- OSL_ENSURE(0,"Illegal text alignment value!");
+ OSL_FAIL("Illegal text alignment value!");
break;
}
aRet <<= nTextAlign;
@@ -396,7 +396,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
}
catch(uno::Exception)
{
- OSL_ENSURE(0,"OObjectBase::EndListening: Exception caught!");
+ OSL_FAIL("OObjectBase::EndListening: Exception caught!");
}
}
m_xPropertyChangeListener.clear();
@@ -532,7 +532,7 @@ sal_Int32 OCustomShape::GetStep() const
{
// get step property
sal_Int32 nStep = 0;
- OSL_ENSURE(0,"Who called me!");
+ OSL_FAIL("Who called me!");
return nStep;
}
//----------------------------------------------------------------------------
@@ -718,7 +718,7 @@ sal_Int32 OUnoObject::GetStep() const
DBG_CHKTHIS( rpt_OUnoObject,NULL);
// get step property
sal_Int32 nStep = 0;
- OSL_ENSURE(0,"Who called me!");
+ OSL_FAIL("Who called me!");
return nStep;
}
@@ -1013,7 +1013,7 @@ sal_Int32 OOle2Obj::GetStep() const
DBG_CHKTHIS( rpt_OOle2Obj,NULL);
// get step property
sal_Int32 nStep = 0;
- OSL_ENSURE(0,"Who called me!");
+ OSL_FAIL("Who called me!");
return nStep;
}
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 737e43af74be..9a4d66740f17 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -224,7 +224,7 @@ void OUndoContainerAction::Undo()
implReInsert();
break;
default:
- OSL_ENSURE(0,"Illegal case value");
+ OSL_FAIL("Illegal case value");
break;
}
}
@@ -252,7 +252,7 @@ void OUndoContainerAction::Redo()
implReRemove();
break;
default:
- OSL_ENSURE(0,"Illegal case value");
+ OSL_FAIL("Illegal case value");
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index f47f360c4687..868a73002315 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -245,7 +245,7 @@ void OXMLCell::EndElement()
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"OXMLCell::EndElement -> exception catched");
+ OSL_FAIL("OXMLCell::EndElement -> exception catched");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index dd1387db40da..aa8da4c42b62 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -98,7 +98,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
}
catch(const Exception&)
{
- OSL_ENSURE(0,"Exception catched while putting props into report component!");
+ OSL_FAIL("Exception catched while putting props into report component!");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 16135095268a..56eb0c4eabb9 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -81,7 +81,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
}
catch(const Exception&)
{
- OSL_ENSURE(0,"Exception catched while putting Function props!");
+ OSL_FAIL("Exception catched while putting Function props!");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index c156b7ffd58e..89fe02a0336a 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -165,7 +165,7 @@ void OXMLControlProperty::EndElement()
}
catch(const Exception&)
{
- OSL_ENSURE(0,"Unknown property found!");
+ OSL_FAIL("Unknown property found!");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 5794e46a9886..e79603a6294b 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -473,7 +473,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Can not access format condition!");
+ OSL_FAIL("Can not access format condition!");
}
}
// -----------------------------------------------------------------------------
@@ -720,7 +720,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Can not access format condition!");
+ OSL_FAIL("Can not access format condition!");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 9f3c7e5e3c8e..faec25209fbf 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -106,7 +106,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl)
m_pFixedContent->Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")));
break;
default:
- OSL_ENSURE(0,"Not supported control character");
+ OSL_FAIL("Not supported control character");
break;
}
}
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 6d70a78ec147..71b4f05f95be 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -95,7 +95,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the report definition props");
+ OSL_FAIL("Exception catched while filling the report definition props");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 65fdbe1ee81f..73fd83dc474d 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -92,7 +92,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the report definition props");
+ OSL_FAIL("Exception catched while filling the report definition props");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index fd0ede7b2244..998e40839bd2 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -101,7 +101,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
}
catch(const Exception&)
{
- OSL_ENSURE(0,"Exception catched while putting Function props!");
+ OSL_FAIL("Exception catched while putting Function props!");
}
}
}
@@ -132,7 +132,7 @@ void OXMLFunction::EndElement()
m_xFunction.clear();
}catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched!");
+ OSL_FAIL("Exception catched!");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index c5fad4d165cd..d2524371ae98 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -193,7 +193,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
}
catch(const Exception&)
{
- OSL_ENSURE(0,"Exception catched while putting group props!");
+ OSL_FAIL("Exception catched while putting group props!");
}
}
}
@@ -271,7 +271,7 @@ void OXMLGroup::EndElement()
m_xGroups->insertByIndex(0,uno::makeAny(m_xGroup));
}catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched!");
+ OSL_FAIL("Exception catched!");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index c00b0cd579ea..8446bf6bdd5f 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -330,7 +330,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"OXMLHelper::copyStyleElements -> exception catched");
+ OSL_FAIL("OXMLHelper::copyStyleElements -> exception catched");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index ab7567214fdf..0e254e92eab2 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -114,7 +114,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the image props");
+ OSL_FAIL("Exception catched while filling the image props");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index a0f883c8ad2a..c2dea15b7023 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -233,7 +233,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the report definition props");
+ OSL_FAIL("Exception catched 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 6990c9144b20..3edb30acd555 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -111,7 +111,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the report definition props");
+ OSL_FAIL("Exception catched while filling the report definition props");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 2ef2ad192423..6ed989c06dbb 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -85,7 +85,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the report definition props");
+ OSL_FAIL("Exception catched while filling the report definition props");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 01de1e714bf9..0a86638028b9 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -108,7 +108,7 @@ void OXMLReportElementBase::EndElement()
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception caught while inserting a new control!");
+ OSL_FAIL("Exception caught while inserting a new control!");
}
}
//----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 098858190d28..5d19b6e9c202 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -102,13 +102,13 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
break;
default:
- OSL_ENSURE(0,"OXMLSection: Unknown attribute!");
+ OSL_FAIL("OXMLSection: Unknown attribute!");
}
}
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the section props");
+ OSL_FAIL("Exception catched while filling the section props");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index e93e7f37a3e9..eab257017a91 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -311,7 +311,7 @@ SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext(
xAttrList, *this, nFamily );
break;
default:
- OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
+ OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
break;
}
}
@@ -368,7 +368,7 @@ Reference < XNameContainer >
xStyles = ((SvXMLImport *)&GetImport())->GetTextImport()->GetFrameStyles();
break;
default:
- OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
+ OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
break;
}
if( !xStyles.is() && sName.getLength() && GetOwnImport().GetModel().is() )
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 63ed9b92f77e..847752adaeae 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -144,7 +144,7 @@ void OXMLSubDocument::EndElement()
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Can not access format condition!");
+ OSL_FAIL("Can not access format condition!");
}
}
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 78ff08494a5e..92fbf0658867 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -122,7 +122,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport
}
catch(Exception&)
{
- OSL_ENSURE(0,"Exception catched while filling the section props");
+ OSL_FAIL("Exception catched while filling the section props");
}
}
// -----------------------------------------------------------------------------
@@ -269,7 +269,7 @@ void OXMLTable::EndElement()
}
catch(beans::PropertyVetoException)
{
- OSL_ENSURE(0,"Could not set the correct position or size!");
+ OSL_FAIL("Could not set the correct position or size!");
}
}
}
@@ -282,7 +282,7 @@ void OXMLTable::EndElement()
}
catch(Exception&)
{
- OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched");
+ OSL_FAIL("OXMLTable::EndElement -> exception catched");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 898779094953..343d82b67b9d 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -394,7 +394,7 @@ namespace rptui
}
catch(Exception&)
{
- OSL_ENSURE(0,"Can not access format condition!");
+ OSL_FAIL("Can not access format condition!");
}
impl_conditionCountChanged();
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 09cf0e6eb14d..15b34d1ac91e 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -243,7 +243,7 @@ uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Can not access group!");
+ OSL_FAIL("Can not access group!");
}
}
if ( !vClipboardList.empty() )
@@ -514,7 +514,7 @@ BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow)
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"OFieldExpressionControl::SaveModified: Exception caught!");
+ OSL_FAIL("OFieldExpressionControl::SaveModified: Exception caught!");
}
}
@@ -545,7 +545,7 @@ String OFieldExpressionControl::GetCellText( long nRow, USHORT /*nColId*/ ) cons
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught while getting expression value from the group");
+ OSL_FAIL("Exception caught while getting expression value from the group");
}
}
return sText;
@@ -626,7 +626,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception cathced while try to get a group!");
+ OSL_FAIL("Exception cathced while try to get a group!");
}
}
return EditBrowseBox::CLEAN;
@@ -1163,7 +1163,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const ::rtl::OUString& _sColum
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Eception caught while getting the type of a column");
+ OSL_FAIL("Eception caught while getting the type of a column");
}
return nDataType;
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index ba82ca8f104b..99142605a24c 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -76,7 +76,7 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ),
AddTabPage( RID_SVXPAGE_LINE,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 );
break;
default:
- OSL_ENSURE(0,"Unknown page id");
+ OSL_FAIL("Unknown page id");
}
SvtCJKOptions aCJKOptions;
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index f816433b17f4..a3f2191c33c5 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1706,7 +1706,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
}
// -----------------------------------------------------------------------------
@@ -1738,7 +1738,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
}
// -----------------------------------------------------------------------------
@@ -1856,7 +1856,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
return bDefaultFunction;
}
@@ -1896,7 +1896,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
return bDefaultFunction;
}
@@ -1987,7 +1987,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx
index 249bac85b1b0..949627285f93 100644
--- a/reportdesign/source/ui/misc/Undo.cxx
+++ b/reportdesign/source/ui/misc/Undo.cxx
@@ -91,7 +91,7 @@ namespace
}
catch(const uno::Exception&)
{
- OSL_ENSURE(0,"lcl_insertElements:Exception caught!");
+ OSL_FAIL("lcl_insertElements:Exception caught!");
}
}
}
@@ -111,7 +111,7 @@ namespace
}
catch(const uno::Exception&)
{
- OSL_ENSURE(0,"lcl_setValues:Exception caught!");
+ OSL_FAIL("lcl_setValues:Exception caught!");
}
}
}
@@ -156,7 +156,7 @@ OSectionUndo::~OSectionUndo()
}
catch(uno::Exception)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
}
}
@@ -359,7 +359,7 @@ void OGroupUndo::implReInsert( )
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched while undoing remove group");
+ OSL_FAIL("Exception catched while undoing remove group");
}
}
//----------------------------------------------------------------------------
@@ -371,7 +371,7 @@ void OGroupUndo::implReRemove( )
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched while redoing remove group");
+ OSL_FAIL("Exception catched while redoing remove group");
}
}
//----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 6259f195f4eb..822590c65d44 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -221,7 +221,7 @@ namespace
aFontDescriptor.Underline = awt::FontUnderline::SINGLE - aFontDescriptor.Underline;
break;
default:
- OSL_ENSURE(0,"Illegal value in default!");
+ OSL_FAIL("Illegal value in default!");
break;
}
@@ -358,7 +358,7 @@ void OReportController::disposing()
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught while disposing row sets.");
+ OSL_FAIL("Exception caught while disposing row sets.");
}
m_xRowSet.clear();
m_xRowSetMediator.clear();
@@ -2209,7 +2209,7 @@ void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEven
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
- OSL_ENSURE(0,"Not yet implemented!");
+ OSL_FAIL("Not yet implemented!");
}
// -----------------------------------------------------------------------------
void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index bf34f824f175..2a6b51578245 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -111,7 +111,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception catched!");
+ OSL_FAIL("Exception catched!");
}
m_pFunc.reset(new DlgEdFuncSelect( this ));
@@ -315,7 +315,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught while pasting a new object!");
+ OSL_FAIL("Exception caught while pasting a new object!");
}
if ( !_bForce )
break;
@@ -391,7 +391,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Can't copy report elements!");
+ OSL_FAIL("Can't copy report elements!");
}
}
}
@@ -604,7 +604,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
}
catch(uno::Exception)
{
- OSL_ENSURE(0,"Exception caught: OReportSection::_propertyChanged(");
+ OSL_FAIL("Exception caught: OReportSection::_propertyChanged(");
}
Resize();
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index 1ca2e5cadbee..d5db6eb1d101 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -101,7 +101,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")),OBJ_OLE2);
break;
default:
- OSL_ENSURE(0,"Unknown object id");
+ OSL_FAIL("Unknown object id");
break;
}
}
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index fd4ecfbd5f65..358007d9b87d 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -408,7 +408,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface>
}
else
{
- OSL_ENSURE(0,"Unknown service name!");
+ OSL_FAIL("Unknown service name!");
nResId = RID_STR_CLASS_FORMATTEDFIELD;
}