connectivity/source/drivers/ado/Awrapado.cxx | 10 ++++------
connectivity/source/drivers/kab/KStatement.cxx | 6 ++----
connectivity/source/drivers/macab/MacabStatement.cxx | 6 ++----
3 files changed, 8 insertions(+), 14 deletions(-)
New commits:
commit bd9eaa10d31aac7a5a04e092a4cf744d36470d0a
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Thu Dec 20 23:56:19 2012 +0100
Some cppcheck cleaning in connectivity
Change-Id: I72cf68b193a4d6b16255f8b92e4c0262cd6cac78
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx
b/connectivity/source/drivers/ado/Awrapado.cxx
index b0cb037..7d75406 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -278,9 +278,7 @@ void WpADOCommand::put_ActiveConnection(/* [in] */ const
OLEVariant& vConn)
void WpADOCommand::Create()
{
IClassFactory2* pInterface2 = NULL;
- IUnknown *pOuter = NULL;
- HRESULT hr;
- hr = CoGetClassObject( ADOS::CLSID_ADOCOMMAND_21,
+ HRESULT hr = CoGetClassObject( ADOS::CLSID_ADOCOMMAND_21,
CLSCTX_INPROC_SERVER,
NULL,
IID_IClassFactory2,
@@ -289,6 +287,7 @@ void WpADOCommand::Create()
if( !FAILED( hr ) )
{
ADOCommand* pCommand=NULL;
+ IUnknown* pOuter=NULL;
hr = pInterface2->CreateInstanceLic( pOuter,
NULL,
@@ -688,9 +687,7 @@ sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar)
void WpADORecordset::Create()
{
IClassFactory2* pInterface2 = NULL;
- IUnknown *pOuter = NULL;
- HRESULT hr;
- hr = CoGetClassObject( ADOS::CLSID_ADORECORDSET_21,
+ HRESULT hr = CoGetClassObject( ADOS::CLSID_ADORECORDSET_21,
CLSCTX_INPROC_SERVER,
NULL,
IID_IClassFactory2,
@@ -699,6 +696,7 @@ sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar)
if( !FAILED( hr ) )
{
ADORecordset *pRec = NULL;
+ IUnknown *pOuter = NULL;
hr = pInterface2->CreateInstanceLic( pOuter,
NULL,
ADOS::IID_ADORECORDSET_21,
diff --git a/connectivity/source/drivers/kab/KStatement.cxx
b/connectivity/source/drivers/kab/KStatement.cxx
index a5babf0..b493342 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -313,7 +313,6 @@ void KabCommonStatement::setKabFields(KabResultSet
*pResult) const throw(SQLExce
void KabCommonStatement::selectAddressees(KabResultSet *pResult) const
throw(SQLException)
{
const OSQLParseNode *pParseNode;
- KabCondition *pCondition;
pParseNode = m_aSQLIterator.getWhereTree();
if (pParseNode != NULL)
@@ -322,7 +321,7 @@ void KabCommonStatement::selectAddressees(KabResultSet
*pResult) const throw(SQL
{
resetParameters();
pParseNode = pParseNode->getChild(1);
- pCondition = analyseWhereClause(pParseNode);
+ KabCondition *pCondition = analyseWhereClause(pParseNode);
if (pCondition->isAlwaysTrue())
pResult->allKabAddressees();
else if (!pCondition->isAlwaysFalse())
@@ -339,7 +338,6 @@ void KabCommonStatement::selectAddressees(KabResultSet
*pResult) const throw(SQL
void KabCommonStatement::sortAddressees(KabResultSet *pResult) const
throw(SQLException)
{
const OSQLParseNode *pParseNode;
- KabOrder *pOrder;
pParseNode = m_aSQLIterator.getOrderTree();
if (pParseNode != NULL)
@@ -347,7 +345,7 @@ void KabCommonStatement::sortAddressees(KabResultSet
*pResult) const throw(SQLEx
if (SQL_ISRULE(pParseNode, opt_order_by_clause))
{
pParseNode = pParseNode->getChild(2);
- pOrder = analyseOrderByClause(pParseNode);
+ KabOrder *pOrder = analyseOrderByClause(pParseNode);
pResult->sortKabAddressees(pOrder);
delete pOrder;
}
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx
b/connectivity/source/drivers/macab/MacabStatement.cxx
index 12cf3f4..170608c 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -321,7 +321,6 @@ void MacabCommonStatement::setMacabFields(MacabResultSet
*pResult) const throw(S
void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const
throw(SQLException)
{
const OSQLParseNode *pParseNode;
- MacabCondition *pCondition;
pParseNode = m_aSQLIterator.getWhereTree();
if (pParseNode != NULL)
@@ -332,7 +331,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet
*pResult) const throw(SQ
// support them, uncomment this line and fix resetParameters.
//resetParameters();
pParseNode = pParseNode->getChild(1);
- pCondition = analyseWhereClause(pParseNode);
+ MacabCondition *pCondition = analyseWhereClause(pParseNode);
if (pCondition->isAlwaysTrue())
pResult->allMacabRecords();
else if (!pCondition->isAlwaysFalse())
@@ -349,7 +348,6 @@ void MacabCommonStatement::selectRecords(MacabResultSet
*pResult) const throw(SQ
void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const
throw(SQLException)
{
const OSQLParseNode *pParseNode;
- MacabOrder *pOrder;
pParseNode = m_aSQLIterator.getOrderTree();
if (pParseNode != NULL)
@@ -357,7 +355,7 @@ void MacabCommonStatement::sortRecords(MacabResultSet
*pResult) const throw(SQLE
if (SQL_ISRULE(pParseNode, opt_order_by_clause))
{
pParseNode = pParseNode->getChild(2);
- pOrder = analyseOrderByClause(pParseNode);
+ MacabOrder *pOrder = analyseOrderByClause(pParseNode);
pResult->sortMacabRecords(pOrder);
delete pOrder;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
