diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 12:04:35 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:05:07 +0100 |
commit | f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (patch) | |
tree | c2c0b2f76362e442e1cbdec027ea4625f8ed3165 /dbaccess/source/ui/misc | |
parent | 7a7f390db3656b976a5c9fc8d081d5e3c60582e8 (diff) |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'dbaccess/source/ui/misc')
-rw-r--r-- | dbaccess/source/ui/misc/DExport.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/RowSetDrop.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index b2cf2a0fb2d6..c31a2da8c9e0 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -560,7 +560,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl } break; default: - OSL_ENSURE(0,"ODatabaseExport: Unbekanntes Format"); + OSL_FAIL("ODatabaseExport: Unbekanntes Format"); } } } diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 70b127cc2ec6..c8a2664f3771 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -242,7 +242,7 @@ sal_Bool ORowSetImportExport::insertNewRow() aValue <<= m_xRow->getClob(*aIter); break; default: - OSL_ENSURE(0,"Unknown type"); + OSL_FAIL("Unknown type"); } if(m_xRow->wasNull()) m_xTargetRowUpdate->updateNull(i); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index a736feb134f0..3f7daabd1674 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -627,7 +627,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou } catch (Exception&) { - OSL_ENSURE(0,"RTF WRITE!"); + OSL_FAIL("RTF WRITE!"); } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 0a949d24703e..7dfb0152bf82 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -178,7 +178,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP SQLExceptionInfo aInfo; if ( !_xDataSource.is() ) { - OSL_ENSURE(0,"createConnection: coult not retrieve the data source!"); + OSL_FAIL("createConnection: coult not retrieve the data source!"); return aInfo; } @@ -192,7 +192,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP } catch(Exception&) { - OSL_ENSURE(0,"createConnection: error while retrieving data source properties!"); + OSL_FAIL("createConnection: error while retrieving data source properties!"); } @@ -203,7 +203,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP Reference<XCompletedConnection> xConnectionCompletion(_xDataSource, UNO_QUERY); if (!xConnectionCompletion.is()) { - OSL_ENSURE(0,"createConnection: missing an interface ... need an error message here!"); + OSL_FAIL("createConnection: missing an interface ... need an error message here!"); } else { // instantiate the default SDB interaction handler @@ -230,7 +230,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP catch(SQLContext& e) { aInfo = SQLExceptionInfo(e); } catch(SQLWarning& e) { aInfo = SQLExceptionInfo(e); } catch(SQLException& e) { aInfo = SQLExceptionInfo(e); } - catch(Exception&) { OSL_ENSURE(0,"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } + catch(Exception&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } return aInfo; } @@ -796,7 +796,7 @@ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment) case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; default: - OSL_ENSURE(0,"Invalid TextAlign!"); + OSL_FAIL("Invalid TextAlign!"); } return nAlignment; } @@ -810,7 +810,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; default: - OSL_ENSURE(0,"Invalid TextAlign!"); + OSL_FAIL("Invalid TextAlign!"); } return eJustify; } @@ -838,7 +838,7 @@ float ConvertFontWeight( ::FontWeight eWeight ) else if( eWeight == WEIGHT_BLACK ) return ::com::sun::star::awt::FontWeight::BLACK; - OSL_ENSURE(0, "Unknown FontWeigth" ); + OSL_FAIL("Unknown FontWeigth" ); return ::com::sun::star::awt::FontWeight::DONTKNOW; } // ----------------------------------------------------------------------------- @@ -865,7 +865,7 @@ float ConvertFontWidth( ::FontWidth eWidth ) else if( eWidth == WIDTH_ULTRA_EXPANDED ) return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED; - OSL_ENSURE(0, "Unknown FontWidth" ); + OSL_FAIL("Unknown FontWidth" ); return ::com::sun::star::awt::FontWidth::DONTKNOW; } // ----------------------------------------------------------------------------- |