summaryrefslogtreecommitdiff
path: root/svx/source/table
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-01 19:07:44 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-02 15:04:37 +0100
commit65c053ca1a5a8c7318ab1e42cdde2d540a283673 (patch)
tree2e1a29f5d832ff0cb0d4c095f038392b472459d1 /svx/source/table
parent40afe52c92f340d0fedbb59d1071a542e6fb61e3 (diff)
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'svx/source/table')
-rw-r--r--svx/source/table/accessibletableshape.cxx4
-rw-r--r--svx/source/table/cell.cxx16
-rw-r--r--svx/source/table/cellcursor.cxx6
-rw-r--r--svx/source/table/svdotable.cxx18
-rw-r--r--svx/source/table/tablecontroller.cxx12
-rw-r--r--svx/source/table/tablelayouter.cxx22
-rw-r--r--svx/source/table/tablemodel.cxx14
-rw-r--r--svx/source/table/tablertfexporter.cxx4
-rw-r--r--svx/source/table/tablertfimporter.cxx2
9 files changed, 49 insertions, 49 deletions
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index b3ca15255362..0fbb214e6170 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -236,7 +236,7 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/
}
catch( Exception& )
{
- DBG_ERROR("svx::AccessibleTableShape::modified(), exception caught!");
+ OSL_FAIL("svx::AccessibleTableShape::modified(), exception caught!");
}
}
@@ -277,7 +277,7 @@ void AccessibleTableShape::Init()
}
catch( Exception& )
{
- DBG_ERROR("AccessibleTableShape::init(), exception caught?");
+ OSL_FAIL("AccessibleTableShape::init(), exception caught?");
}
AccessibleTableShape_Base::Init();
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 359517193e82..1c296f1d82a2 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -182,7 +182,7 @@ namespace sdr
BaseProperties& CellProperties::Clone(SdrObject& rObj) const
{
- DBG_ERROR("CellProperties::Clone(), does not work yet!");
+ OSL_FAIL("CellProperties::Clone(), does not work yet!");
return *(new CellProperties(*this, rObj,0));
}
@@ -334,7 +334,7 @@ void Cell::dispose()
}
catch( Exception& )
{
- DBG_ERROR("Cell::dispose(), exception caught!");
+ OSL_FAIL("Cell::dispose(), exception caught!");
}
mxTable.clear();
}
@@ -554,7 +554,7 @@ const SfxItemSet& Cell::GetObjectItemSet()
}
else
{
- DBG_ERROR("Cell::GetObjectItemSet(), called without properties!");
+ OSL_FAIL("Cell::GetObjectItemSet(), called without properties!");
return GetObject().GetObjectItemSet();
}
}
@@ -977,7 +977,7 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa
}
else
{
- DBG_ERROR("GetAnyForItem() Returnvalue has wrong Type!" );
+ OSL_FAIL("GetAnyForItem() Returnvalue has wrong Type!" );
}
}
@@ -1272,11 +1272,11 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName
}
catch( UnknownPropertyException& )
{
- DBG_ERROR("svx::Cell::setPropertyValues(), unknown property!" );
+ OSL_FAIL("svx::Cell::setPropertyValues(), unknown property!" );
}
catch( Exception& )
{
- DBG_ERROR("svx::Cell::setPropertyValues(), Exception caught!" );
+ OSL_FAIL("svx::Cell::setPropertyValues(), Exception caught!" );
}
}
}
@@ -1304,11 +1304,11 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP
}
catch( UnknownPropertyException& )
{
- DBG_ERROR("svx::Cell::setPropertyValues(), unknown property!" );
+ OSL_FAIL("svx::Cell::setPropertyValues(), unknown property!" );
}
catch( Exception& )
{
- DBG_ERROR( "svx::Cell::getPropertyValues(), Exception caught!" );
+ OSL_FAIL( "svx::Cell::getPropertyValues(), Exception caught!" );
}
}
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 2946c59a2773..f73f843b3d94 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -250,7 +250,7 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd )
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::SvmxTableController::GetMergedSelection(), exception caught!");
+ OSL_FAIL("sdr::table::SvmxTableController::GetMergedSelection(), exception caught!");
}
return false;
}
@@ -280,7 +280,7 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException)
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::CellCursor::merge(), exception caught!");
+ OSL_FAIL("sdr::table::CellCursor::merge(), exception caught!");
}
if( bUndo )
@@ -550,7 +550,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::CellCursor::split(), exception caught!");
+ OSL_FAIL("sdr::table::CellCursor::split(), exception caught!");
throw NoSupportException();
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index a133e3b2e7ed..4e6f6572d23d 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -357,7 +357,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel)
}
catch( Exception& )
{
- DBG_ERROR("svx::SdrTableObjImpl::SetModel(), exception caught!");
+ OSL_FAIL("svx::SdrTableObjImpl::SetModel(), exception caught!");
}
mxTableStyle = xNewTableStyle;
@@ -524,7 +524,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset
}
catch( Exception& )
{
- DBG_ERROR( "svx::SdrTableObjImpl::DragEdge(), exception caught!" );
+ OSL_FAIL( "svx::SdrTableObjImpl::DragEdge(), exception caught!" );
}
}
@@ -629,7 +629,7 @@ CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const
}
catch( Exception& )
{
- DBG_ERROR( "svx::SdrTableObjImpl::getCell(), exception caught!" );
+ OSL_FAIL( "svx::SdrTableObjImpl::getCell(), exception caught!" );
}
return xCell;
}
@@ -1169,7 +1169,7 @@ void SdrTableObj::InsertRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
}
catch( Exception& )
{
- DBG_ERROR("SdrTableObj::InsertRows(), exception caught!");
+ OSL_FAIL("SdrTableObj::InsertRows(), exception caught!");
}
}
@@ -1184,7 +1184,7 @@ void SdrTableObj::InsertColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
}
catch( Exception& )
{
- DBG_ERROR("SdrTableObj::InsertColumns(), exception caught!");
+ OSL_FAIL("SdrTableObj::InsertColumns(), exception caught!");
}
}
@@ -1199,7 +1199,7 @@ void SdrTableObj::DeleteRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
}
catch( Exception& )
{
- DBG_ERROR("SdrTableObj::DeleteRows(), exception caught!");
+ OSL_FAIL("SdrTableObj::DeleteRows(), exception caught!");
}
}
@@ -1214,7 +1214,7 @@ void SdrTableObj::DeleteColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
}
catch( Exception& )
{
- DBG_ERROR("SdrTableObj::DeleteColumns(), exception caught!");
+ OSL_FAIL("SdrTableObj::DeleteColumns(), exception caught!");
}
}
@@ -1618,7 +1618,7 @@ void SdrTableObj::setActiveCell( const CellPos& rPos )
}
catch( Exception& )
{
- DBG_ERROR("SdrTableObj::setActiveCell(), exception caught!");
+ OSL_FAIL("SdrTableObj::setActiveCell(), exception caught!");
}
}
@@ -2736,7 +2736,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd
}
catch( Exception& )
{
- DBG_ERROR( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" );
+ OSL_FAIL( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" );
}
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 6639763139fe..b7dded67897b 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -613,7 +613,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("svx::SvxTableController::onInsert(), exception caught!");
+ OSL_FAIL("svx::SvxTableController::onInsert(), exception caught!");
}
}
@@ -904,7 +904,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "svx::SvxTableController::SetTableStyle(), exception caught!" );
+ OSL_FAIL( "svx::SvxTableController::SetTableStyle(), exception caught!" );
}
}
@@ -915,7 +915,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "svx::SvxTableController::SetTableStyle(), exception caught!" );
+ OSL_FAIL( "svx::SvxTableController::SetTableStyle(), exception caught!" );
}
}
@@ -1641,7 +1641,7 @@ void SvxTableController::checkCell( CellPos& rPos )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sdr::table::SvxTableController::checkCell(), exception caught!" );
+ OSL_FAIL("sdr::table::SvxTableController::checkCell(), exception caught!" );
}
}
@@ -1660,7 +1660,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sdr::table::SvxTableController::findMergeOrigin(), exception caught!" );
+ OSL_FAIL("sdr::table::SvxTableController::findMergeOrigin(), exception caught!" );
}
}
@@ -2430,7 +2430,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage )
}
catch( Exception& )
{
- DBG_ERROR( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" );
+ OSL_FAIL( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" );
}
return false;
}
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 8f892e80605c..3d40963107db 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -121,7 +121,7 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos ) const
}
catch( Exception& )
{
- DBG_ERROR( "TableLayouter::getCellSize(), exception caught!" );
+ OSL_FAIL( "TableLayouter::getCellSize(), exception caught!" );
}
return basegfx::B2ITuple( width, height );
@@ -150,7 +150,7 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr
}
catch( Exception& )
{
- DBG_ERROR( "TableLayouter::getCellSize(), exception caught!" );
+ OSL_FAIL( "TableLayouter::getCellSize(), exception caught!" );
}
return false;
}
@@ -174,7 +174,7 @@ void TableLayouter::setRowHeight( sal_Int32 nRow, sal_Int32 nHeight )
}
else
{
- DBG_ERROR( "TableLayouter::setRowHeight(), row out of range!" );
+ OSL_FAIL( "TableLayouter::setRowHeight(), row out of range!" );
}
}
@@ -194,7 +194,7 @@ void TableLayouter::setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth )
if( isValidColumn(nColumn) )
maColumns[nColumn].mnSize = nWidth;
else
- DBG_ERROR( "TableLayouter::setColumnWidth(), column out of range!" );
+ OSL_FAIL( "TableLayouter::setColumnWidth(), column out of range!" );
}
// -----------------------------------------------------------------------------
@@ -441,7 +441,7 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::TableLayouter::findMergeOrigin(), exception caught!");
+ OSL_FAIL("sdr::table::TableLayouter::findMergeOrigin(), exception caught!");
}
return false;
}
@@ -456,7 +456,7 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn )
}
else
{
- DBG_ERROR( "TableLayouter::getMinimumColumnWidth(), column out of range!" );
+ OSL_FAIL( "TableLayouter::getMinimumColumnWidth(), column out of range!" );
return 0;
}
}
@@ -912,7 +912,7 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const
}
catch( Exception& )
{
- DBG_ERROR( "sdr::table::TableLayouter::getCell(), exception caught!" );
+ OSL_FAIL( "sdr::table::TableLayouter::getCell(), exception caught!" );
}
return xCell;
}
@@ -1106,7 +1106,7 @@ void TableLayouter::SetLayoutToModel()
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::TableLayouter::SetLayoutToModel(), exception caught!");
+ OSL_FAIL("sdr::table::TableLayouter::SetLayoutToModel(), exception caught!");
}
}
*/
@@ -1145,7 +1145,7 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol,
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sdr::table::TableLayouter::DistributeColumns(), exception caught!");
+ OSL_FAIL("sdr::table::TableLayouter::DistributeColumns(), exception caught!");
}
}
@@ -1197,7 +1197,7 @@ void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sdr::table::TableLayouter::DistributeRows(), exception caught!");
+ OSL_FAIL("sdr::table::TableLayouter::DistributeRows(), exception caught!");
}
}
@@ -1286,7 +1286,7 @@ sal_Int32 TableLayouter::detectInsertedOrRemovedRows()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("svx::TableLayouter::detectInsertedOrRemovedRows(), exception caught!");
+ OSL_FAIL("svx::TableLayouter::detectInsertedOrRemovedRows(), exception caught!");
}
return nHeightChange;
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 76a6ea5a3d48..701032c288f3 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -728,7 +728,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount )
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::TableModel::insertColumns(), exception caught!");
+ OSL_FAIL("sdr::table::TableModel::insertColumns(), exception caught!");
}
updateColumns();
setModified(sal_True);
@@ -837,7 +837,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::TableModel::removeColumns(), exception caught!");
+ OSL_FAIL("sdr::table::TableModel::removeColumns(), exception caught!");
}
updateColumns();
@@ -895,7 +895,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount )
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::TableModel::insertRows(), exception caught!");
+ OSL_FAIL("sdr::table::TableModel::insertRows(), exception caught!");
}
if( bUndo )
pModel->EndUndo();
@@ -996,7 +996,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount )
}
catch( Exception& )
{
- DBG_ERROR("sdr::table::TableModel::removeRows(), exception caught!");
+ OSL_FAIL("sdr::table::TableModel::removeRows(), exception caught!");
}
updateRows();
@@ -1062,7 +1062,7 @@ void TableModel::optimize()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("svx::TableModel::optimize(), exception caught!");
+ OSL_FAIL("svx::TableModel::optimize(), exception caught!");
}
removeColumns( nCol, 1 );
@@ -1099,7 +1099,7 @@ void TableModel::optimize()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("svx::TableModel::optimize(), exception caught!");
+ OSL_FAIL("svx::TableModel::optimize(), exception caught!");
}
removeRows( nRow, 1 );
@@ -1126,7 +1126,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_
if( (nLastRow > getRowCount()) || (nLastCol > getRowCount() ) )
{
- DBG_ERROR("TableModel::merge(), merge beyound the table!");
+ OSL_FAIL("TableModel::merge(), merge beyound the table!");
}
// merge first cell
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 4f7a87c1eb91..a9ac42af079e 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -119,7 +119,7 @@ ULONG SdrTableRtfExporter::Write()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("SdrTableRtfExporter::Write(), exception caught!");
+ OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!");
}
// export rows
@@ -134,7 +134,7 @@ ULONG SdrTableRtfExporter::Write()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("SdrTableRtfExporter::Write(), exception caught!");
+ OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!");
}
mrStrm << '}' << RTFOutFuncs::sNewLine;
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 6b6dd430db38..8dc0a876e52b 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -309,7 +309,7 @@ void SdrTableRTFParser::FillTable()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sdr::table::SdrTableRTFParser::InsertCell(), exception caught!" );
+ OSL_FAIL("sdr::table::SdrTableRTFParser::InsertCell(), exception caught!" );
}
}