diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:12:58 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:12:58 +0000 |
| commit | 519ec4f236cf9a0b1264ddcb29d91b0c0bcfcb13 (patch) | |
| tree | 6a5dd96ceff94ba4a4feae34dac38b4abe926353 /connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx | |
| parent | 973daa8b2e27b457303658a82a0e7cb45e1debba (diff) | |
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
Diffstat (limited to 'connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx')
| -rw-r--r-- | connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index f0e1f00df50f..16b181e11709 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ADatabaseMetaDataImpl.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2005-12-21 13:15:01 $ + * last change: $Author: hr $ $Date: 2006-06-20 01:12:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,7 +105,6 @@ void ODatabaseMetaData::fillLiterals() aRecordset.MoveFirst(); OLEVariant aValue; - sal_Int32 nRet = 0; LiteralInfo aInfo; while(!aRecordset.IsAtEOF()) { @@ -439,8 +438,6 @@ RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum) // ------------------------------------------------------------------------- void WpADOIndex::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOIndex* pIndex = NULL; @@ -471,8 +468,6 @@ void OAdoIndex::fillPropertyValues() // ----------------------------------------------------------------------------- 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 @@ sal_Int32 OAdoKey::MapKeyRule(const KeyTypeEnum& _eNum) // ------------------------------------------------------------------------- KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) { - KeyTypeEnum eNum; + KeyTypeEnum eNum( adKeyPrimary ); switch(_eNum) { case KeyType::PRIMARY: @@ -575,14 +570,14 @@ KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) 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 OAdoTable::fillPropertyValues() // ----------------------------------------------------------------------------- void WpADOUser::Create() { - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; HRESULT hr = -1; _ADOUser* pUser = NULL; hr = CoCreateInstance(ADOS::CLSID_ADOUSER_25, |