User: hr Date: 06/06/19 18:17:06 Modified: /dba/connectivity/source/drivers/ado/ Awrapado.cxx
Log: INTEGRATION: CWS warnings01 (1.16.20); FILE MERGED 2006/03/29 13:50:52 fs 1.16.20.3: #57457# warning-free code 2006/01/25 20:47:55 sb 1.16.20.2: RESYNC: (1.16-1.17); FILE MERGED 2005/12/22 11:44:39 fs 1.16.20.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: Awrapado.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/Awrapado.cxx?r1=1.17&r2=1.18 Delta lines: +184 -177 ----------------------- --- Awrapado.cxx 21 Dec 2005 13:15:49 -0000 1.17 +++ Awrapado.cxx 20 Jun 2006 01:17:04 -0000 1.18 @@ -45,6 +45,9 @@ #include <rtl/ustrbuf.hxx> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif namespace connectivity { @@ -58,8 +61,6 @@ void WpADOCatalog::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOCatalog* pCommand; hr = CoCreateInstance(ADOS::CLSID_ADOCATALOG_25, @@ -549,6 +550,7 @@ OSL_ENSURE(pInterface,"Interface is null!"); aValVar.setEmpty(); sal_Bool bOk = SUCCEEDED(pInterface->get_Value(&aValVar)); + (void)bOk; } OLEVariant WpADOField::get_Value() const @@ -1075,12 +1077,14 @@ OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); + (void)bErg; } void WpADOColumn::put_RelatedColumn(const ::rtl::OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_RelatedColumn(bstr)); + (void)bErg; } DataTypeEnum WpADOColumn::get_Type() const @@ -1184,7 +1188,7 @@ OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); - + (void)bErg; } KeyTypeEnum WpADOKey::get_Type() const @@ -1214,7 +1218,7 @@ OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_RelatedTable(bstr)); - + (void)bErg; } RuleEnum WpADOKey::get_DeleteRule() const @@ -1268,7 +1272,7 @@ OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); - + (void)bErg; } sal_Bool WpADOIndex::get_Clustered() const @@ -1390,7 +1394,7 @@ OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); - + (void)bErg; } ::rtl::OUString WpADOTable::get_Type() const @@ -1481,7 +1485,7 @@ { OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); - + (void)bErg; } RightsEnum WpADOGroup::GetPermissions( @@ -1526,7 +1530,7 @@ { OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); - + (void)bErg; } sal_Bool WpADOUser::ChangePassword(const ::rtl::OUString& _rPwd,const ::rtl::OUString& _rNewPwd) @@ -1577,6 +1581,7 @@ if (pIUnknown) { ULONG nCount = pIUnknown->AddRef(); + (void)nCount; // OSL_ENSURE(nCount == 1,"Count is greater than 1"); } } @@ -1766,7 +1771,7 @@ // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, - sal_Bool unique, sal_Bool approximate ) + sal_Bool /*unique*/, sal_Bool /*approximate*/ ) { // Create elements used in the array HRESULT hr = S_OK; @@ -2144,9 +2149,8 @@ return pRecordset; } // ----------------------------------------------------------------------------- -ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum _eType) +ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/) { - HRESULT hr = S_OK; // Create elements used in the array OLEVariant varCriteria[2]; const int nCrit = sizeof varCriteria / sizeof varCriteria[0]; @@ -2178,6 +2182,7 @@ OSL_ENSURE(pInterface,"Interface is null!"); sal_Bool bRet = SUCCEEDED(pInterface->put_ParentCatalog(ppvObject)); OSL_ENSURE(bRet,"Could not set ParentCatalog!"); + OSL_UNUSED(bRet); } // ----------------------------------------------------------------------------- void WpADOTable::putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject) @@ -2185,6 +2190,7 @@ OSL_ENSURE(pInterface,"Interface is null!"); sal_Bool bRet = SUCCEEDED(pInterface->putref_ParentCatalog(ppvObject)); OSL_ENSURE(bRet,"Could not set ParentCatalog!"); + OSL_UNUSED(bRet); } // ----------------------------------------------------------------------------- void WpBase::setIDispatch(IDispatch* _pIUnknown) @@ -2200,6 +2206,7 @@ { sal_Bool bRet = aProp.PutValue(_aValVar); OSL_ENSURE(bRet,"Could not put value!"); + OSL_UNUSED(bRet); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
