User: kz Date: 2008-05-05 15:04:17+0000 Modified: dba/connectivity/source/commontools/parameters.cxx
Log: 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 File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: parameters.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/parameters.cxx?r1=1.3&r2=1.4 Delta lines: +3 -2 ------------------- --- parameters.cxx 2008-04-10 08:02:30+0000 1.3 +++ parameters.cxx 2008-05-05 15:04:15+0000 1.4 @@ -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 @@ // 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 @@ } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ParameterManager::fillLinkedParameters: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
