summaryrefslogtreecommitdiffstats
path: root/connectivity/source/commontools/parameters.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-05-05 14:04:15 +0000
committerKurt Zenker <kz@openoffice.org>2008-05-05 14:04:15 +0000
commit10c7bc1b2f66fa4b7682be64c52d3b6e7a7804b5 (patch)
treea2100971bd588449c16f5b399d1e9882c2643d39 /connectivity/source/commontools/parameters.cxx
parentINTEGRATION: CWS dba30b (1.71.16); FILE MERGED (diff)
downloadcore-10c7bc1b2f66fa4b7682be64c52d3b6e7a7804b5.tar.gz
core-10c7bc1b2f66fa4b7682be64c52d3b6e7a7804b5.zip
INTEGRATION: CWS dba30b (1.2.2); FILE MERGED
2008/04/15 21:48:51 fs 1.2.2.2: RESYNC: (1.2-1.3); FILE MERGED 2008/03/17 12:33:11 fs 1.2.2.1: #i87125# use correct property name when asking for a detail field's type
Diffstat (limited to 'connectivity/source/commontools/parameters.cxx')
-rw-r--r--connectivity/source/commontools/parameters.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 88b8a6c0791f..e6a6044fa01f 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: parameters.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
@@ -48,6 +48,7 @@
#include "TConnection.hxx"
#include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
#include <comphelper/uno3.hxx>
#include <comphelper/proparrhlp.hxx>
@@ -593,7 +594,7 @@ namespace dbtools
// type and scale of the parameter field
sal_Int32 nParamType = DataType::VARCHAR;
- OSL_VERIFY( xDetailField->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FIELDTYPE) ) >>= nParamType );
+ OSL_VERIFY( xDetailField->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE) ) >>= nParamType );
sal_Int32 nScale = 0;
if ( xDetailField->getPropertySetInfo()->hasPropertyByName( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE) ) )
@@ -621,7 +622,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: caught an exception!" );
+ DBG_UNHANDLED_EXCEPTION();
}
}