summaryrefslogtreecommitdiffstats
path: root/reportdesign/source/ui
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/source/ui
parentMove OSL_ENSURE(false,...) to OSL_FAIL(...) (diff)
downloadcore-f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1.tar.gz
core-f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1.zip
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'reportdesign/source/ui')
-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
9 files changed, 26 insertions, 26 deletions
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;
}