Tag: cws_src680_qiq User: fs Date: 2006/06/27 06:58:12 Modified: dba/connectivity/source/commontools/dbtools.cxx
Log: RESYNC: (1.59-1.60); FILE MERGED File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.59.34.3&r2=1.59.34.4 Delta lines: +13 -5 -------------------- --- dbtools.cxx 24 May 2006 11:42:55 -0000 1.59.34.3 +++ dbtools.cxx 27 Jun 2006 13:58:09 -0000 1.59.34.4 @@ -42,6 +42,9 @@ #ifndef _DBHELPER_DBCONVERSION_HXX_ #include <connectivity/dbconversion.hxx> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> @@ -176,6 +179,9 @@ #ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include <com/sun/star/sdbc/XParameters.hpp> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif #include <algorithm> using namespace ::comphelper; @@ -952,6 +958,8 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule) { OSL_ENSURE(_rxConnMetaData.is(), "QualifiedNameComponents : invalid meta data!"); + OSL_ENSURE( _eComposeRule == eInDataManipulation, "qualifiedNameComponents: un-implemented case!" ); + OSL_UNUSED( _eComposeRule ); ::rtl::OUString sSeparator = _rxConnMetaData->getCatalogSeparator(); ::rtl::OUString sName(_rQualifiedName); @@ -1079,7 +1087,7 @@ } catch(IllegalArgumentException& e) { - e; + OSL_UNUSED( e ); #ifdef DBG_UTIL ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("TransferFormComponentProperties : could not transfer the value for property \""); sMessage += pResult->Name; @@ -1938,7 +1946,7 @@ sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, - sal_Int32 scale) throw(SQLException, RuntimeException) + sal_Int32 /*scale*/) throw(SQLException, RuntimeException) { if(!x.hasValue()) _xParams->setNull(parameterIndex,sqlType); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
