summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-06-12 22:52:44 +0200
committerJulien Nabet <serval2412@yahoo.fr>2013-06-12 22:53:09 +0200
commit4e5b78d6a54fa7fac1c6e09401b2e05fa5c06579 (patch)
treec5ccd59735ec2a24bd14d03ae9546efce6deb0d7 /connectivity
parent11fcd99263cf5f3bd447cc570313fc3b19547105 (diff)
cppcheck: fix Variable "hr" reassignment
Change-Id: Iafaac91fe3783118817d40f3831e5ca039be64e0
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 8b91a62fbb34..1fa5f97f92be 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -391,10 +391,8 @@ RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum)
// -------------------------------------------------------------------------
void WpADOIndex::Create()
{
- HRESULT hr = -1;
-
_ADOIndex* pIndex = NULL;
- hr = CoCreateInstance(ADOS::CLSID_ADOINDEX_25,
+ HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOINDEX_25,
NULL,
CLSCTX_INPROC_SERVER,
ADOS::IID_ADOINDEX_25,
@@ -421,9 +419,8 @@ void OAdoIndex::fillPropertyValues()
// -----------------------------------------------------------------------------
void WpADOKey::Create()
{
- HRESULT hr = -1;
_ADOKey* pKey = NULL;
- hr = CoCreateInstance(ADOS::CLSID_ADOKEY_25,
+ HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOKEY_25,
NULL,
CLSCTX_INPROC_SERVER,
ADOS::IID_ADOKEY_25,
@@ -531,9 +528,8 @@ KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum)
// -----------------------------------------------------------------------------
void WpADOTable::Create()
{
- HRESULT hr = -1;
_ADOTable* pTable = NULL;
- hr = CoCreateInstance(ADOS::CLSID_ADOTABLE_25,
+ HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOTABLE_25,
NULL,
CLSCTX_INPROC_SERVER,
ADOS::IID_ADOTABLE_25,
@@ -578,9 +574,8 @@ void OAdoTable::fillPropertyValues()
// -----------------------------------------------------------------------------
void WpADOUser::Create()
{
- HRESULT hr = -1;
_ADOUser* pUser = NULL;
- hr = CoCreateInstance(ADOS::CLSID_ADOUSER_25,
+ HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOUSER_25,
NULL,
CLSCTX_INPROC_SERVER,
ADOS::IID_ADOUSER_25,