User: hr Date: 06/06/19 18:13:00 Modified: /dba/connectivity/source/drivers/ado/ ADatabaseMetaDataImpl.cxx
Log: INTEGRATION: CWS warnings01 (1.5.30); FILE MERGED 2006/01/25 20:48:11 sb 1.5.30.2: RESYNC: (1.5-1.6); FILE MERGED 2005/12/22 11:44:33 fs 1.5.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: ADatabaseMetaDataImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx?r1=1.6&r2=1.7 Delta lines: +7 -14 -------------------- --- ADatabaseMetaDataImpl.cxx 21 Dec 2005 13:15:01 -0000 1.6 +++ ADatabaseMetaDataImpl.cxx 20 Jun 2006 01:12:58 -0000 1.7 @@ -105,7 +105,6 @@ aRecordset.MoveFirst(); OLEVariant aValue; - sal_Int32 nRet = 0; LiteralInfo aInfo; while(!aRecordset.IsAtEOF()) { @@ -439,8 +438,6 @@ // ------------------------------------------------------------------------- void WpADOIndex::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOIndex* pIndex = NULL; @@ -471,8 +468,6 @@ // ----------------------------------------------------------------------------- void WpADOKey::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOKey* pKey = NULL; hr = CoCreateInstance(ADOS::CLSID_ADOKEY_25, @@ -563,7 +558,7 @@ // ------------------------------------------------------------------------- KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) { - KeyTypeEnum eNum; + KeyTypeEnum eNum( adKeyPrimary ); switch(_eNum) { case KeyType::PRIMARY: @@ -575,14 +570,14 @@ case KeyType::UNIQUE: eNum = adKeyUnique; break; + default: + OSL_ENSURE( false, "OAdoKey::Map2KeyRule: invalid key type!" ); } return eNum; } // ----------------------------------------------------------------------------- void WpADOTable::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOTable* pTable = NULL; hr = CoCreateInstance(ADOS::CLSID_ADOTABLE_25, @@ -630,8 +625,6 @@ // ----------------------------------------------------------------------------- void WpADOUser::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOUser* pUser = NULL; hr = CoCreateInstance(ADOS::CLSID_ADOUSER_25, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
