User: hr Date: 06/06/19 18:16:42 Modified: /dba/connectivity/source/drivers/ado/ Aolevariant.cxx
Log: INTEGRATION: CWS warnings01 (1.11.20); FILE MERGED 2006/03/29 13:50:52 fs 1.11.20.2: #57457# warning-free code 2005/12/22 11:44:38 fs 1.11.20.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: Aolevariant.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/Aolevariant.cxx?r1=1.11&r2=1.12 Delta lines: +119 -94 ---------------------- --- Aolevariant.cxx 23 Sep 2005 11:37:59 -0000 1.11 +++ Aolevariant.cxx 20 Jun 2006 01:16:40 -0000 1.12 @@ -51,7 +51,9 @@ #include <com/sun/star/util/DateTime.hpp> #endif - +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif using namespace connectivity::ado; OLEString::OLEString() @@ -121,19 +123,21 @@ ::VariantInit(this); HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(&varSrc)); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); + OSL_UNUSED(eRet); } OLEVariant::OLEVariant(const OLEVariant& varSrc) { ::VariantInit(this); HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(static_cast<const VARIANT*>(&varSrc))); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); + OSL_UNUSED(eRet); } OLEVariant::OLEVariant(sal_Bool x) { VariantInit(this); vt = VT_BOOL; boolVal = (x ? VARIANT_TRUE : VARIANT_FALSE);} OLEVariant::OLEVariant(sal_Int8 n) { VariantInit(this); vt = VT_I1; bVal = n;} OLEVariant::OLEVariant(sal_Int16 n) { VariantInit(this); vt = VT_I2; intVal = n;} OLEVariant::OLEVariant(sal_Int32 n) { VariantInit(this); vt = VT_I4; lVal = n;} -OLEVariant::OLEVariant(sal_Int64 x) { VariantInit(this); vt = VT_I4; lVal = x;} +OLEVariant::OLEVariant(sal_Int64 x) { VariantInit(this); vt = VT_I4; lVal = (LONG)x;} OLEVariant::OLEVariant(const rtl::OUString& us) { @@ -145,6 +149,7 @@ { HRESULT eRet = ::VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); } // clears all the memory that was allocated before OLEVariant::OLEVariant(const ::com::sun::star::util::Date& x ) @@ -204,6 +209,7 @@ sal_Int32 nData = *pBegin; HRESULT rs = SafeArrayPutElement(parray,&i,&nData); OSL_ENSURE(S_OK == rs,"Error while copy byte data"); + OSL_UNUSED(rs); } } // @@ -211,6 +217,7 @@ { HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(static_cast<const VARIANT*>(&varSrc))); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); + OSL_UNUSED(eRet); return *this; } // Assign a const VARIANT& (::VariantCopy handles everything) @@ -219,6 +226,7 @@ { HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(&varSrc)); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); + OSL_UNUSED(eRet); return *this; } @@ -229,6 +237,7 @@ { HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(pSrc)); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); + OSL_UNUSED(eRet); return *this; } @@ -237,6 +246,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_UI1; bVal = n; } @@ -244,6 +254,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_I2; iVal = n; } @@ -251,12 +262,14 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_I4; lVal = n; } void OLEVariant::setFloat(float f) { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_R4; fltVal = f; } @@ -264,12 +277,14 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_R8; dblVal = d; } void OLEVariant::setDate(DATE d) { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_DATE; date = d; } @@ -277,6 +292,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_UI1; bVal = a; } @@ -284,6 +300,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_CY; set(aCur*10000); } @@ -291,6 +308,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_BOOL; boolVal = b ? VARIANT_TRUE : VARIANT_FALSE; } @@ -298,6 +316,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_BSTR; bstrVal = ::SysAllocString(us); } @@ -305,6 +324,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_ERROR; scode = DISP_E_PARAMNOTFOUND; } @@ -313,12 +333,14 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_NULL; } void OLEVariant::setEmpty() { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_EMPTY; } @@ -326,6 +348,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_ARRAY|VT_UI1; parray = pSafeAr; } @@ -333,7 +356,8 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); - vt = VT_ARRAY|vtType; + OSL_UNUSED(eRet); + vt = (VARTYPE)(VT_ARRAY|vtType); parray = pSafeArray; } @@ -341,6 +365,7 @@ { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); + OSL_UNUSED(eRet); vt = VT_DISPATCH; pdispVal = pDispInterface; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
