summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/querydesign
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 11:27:59 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:05:06 +0100
commit7a7f390db3656b976a5c9fc8d081d5e3c60582e8 (patch)
tree3db070da58fcf207c7fea9647de2dd9ef9400970 /dbaccess/source/ui/querydesign
parent4882ec6c95c249cd181e71714ffe1f2cb6b85608 (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'dbaccess/source/ui/querydesign')
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx10
4 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 7d67b18ea317..65399065dbce 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1705,7 +1705,7 @@ bool OJoinTableView::allowQueries() const
// -----------------------------------------------------------------------------
void OJoinTableView::onNoColumns_throw()
{
- OSL_ENSURE( false, "OTableWindow::onNoColumns_throw: cannot really handle this!" );
+ OSL_FAIL( "OTableWindow::onNoColumns_throw: cannot really handle this!" );
throw SQLException();
}
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 0dc3caa9dbc5..ece9f28458f9 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -198,7 +198,7 @@ namespace
Reference<XPropertySet> xColumn;
if ( !( _rxSourceForeignKeyColumns->getByName(*pIter) >>= xColumn ) )
{
- OSL_ENSURE( false, "addConnections: invalid foreign key column!" );
+ OSL_FAIL( "addConnections: invalid foreign key column!" );
continue;
}
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 3f3134254322..c40cd4e519a5 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -278,7 +278,7 @@ void OTableWindow::impl_updateImage()
if ( !aImage )
{
- OSL_ENSURE( false, "OTableWindow::impl_updateImage: no images!" );
+ OSL_FAIL( "OTableWindow::impl_updateImage: no images!" );
return;
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index ea2610498581..5e6ad7f9ab9a 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -863,7 +863,7 @@ void OQueryController::impl_initialize()
::rtl::OUString sIndependentSQLCommand;
if ( rArguments.get_ensureType( "IndependentSQLCommand", sIndependentSQLCommand ) )
{
- OSL_ENSURE( false, "OQueryController::impl_initialize: IndependentSQLCommand is regognized for compatibility only!" );
+ OSL_FAIL( "OQueryController::impl_initialize: IndependentSQLCommand is regognized for compatibility only!" );
sCommand = sIndependentSQLCommand;
m_nCommandType = CommandType::COMMAND;
}
@@ -871,7 +871,7 @@ void OQueryController::impl_initialize()
::rtl::OUString sCurrentQuery;
if ( rArguments.get_ensureType( "CurrentQuery", sCurrentQuery ) )
{
- OSL_ENSURE( false, "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" );
+ OSL_FAIL( "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" );
sCommand = sCurrentQuery;
m_nCommandType = CommandType::QUERY;
}
@@ -879,7 +879,7 @@ void OQueryController::impl_initialize()
sal_Bool bCreateView( sal_False );
if ( rArguments.get_ensureType( "CreateView", bCreateView ) && bCreateView )
{
- OSL_ENSURE( false, "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" );
+ OSL_FAIL( "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" );
m_nCommandType = CommandType::TABLE;
}
@@ -903,7 +903,7 @@ void OQueryController::impl_initialize()
m_sName = ::rtl::OUString();
break;
default:
- OSL_ENSURE( false, "OQueryController::impl_initialize: logic error in code!" );
+ OSL_FAIL( "OQueryController::impl_initialize: logic error in code!" );
throw RuntimeException();
}
@@ -911,7 +911,7 @@ void OQueryController::impl_initialize()
sal_Bool bGraphicalDesign( sal_True );
if ( rArguments.get_ensureType( (::rtl::OUString)PROPERTY_QUERYDESIGNVIEW, bGraphicalDesign ) )
{
- OSL_ENSURE( false, "OQueryController::impl_initialize: QueryDesignView is regognized for compatibility only!" );
+ OSL_FAIL( "OQueryController::impl_initialize: QueryDesignView is regognized for compatibility only!" );
m_bGraphicalDesign = bGraphicalDesign;
}