summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/file
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-27 09:22:13 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-28 09:31:16 +0000
commit43b4903db3e925c652e25c34362490f8adc9c5ec (patch)
treeaf12777b72d42280467e8cc19b914b2c7f4f3816 /connectivity/source/drivers/file
parent7d6308dad9f4a079d57719a6e3a9c4cebb47d051 (diff)
teach stylepolice plugin about ref-counted-pointer naming
Change-Id: I6e91d22fc1826038c05ddb6fc065563c6a250752 Reviewed-on: https://gerrit.libreoffice.org/24459 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity/source/drivers/file')
-rw-r--r--connectivity/source/drivers/file/FPreparedStatement.cxx6
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx8
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx8
3 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index b5d8d51d7470..65806cdb5d02 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -487,10 +487,10 @@ void OPreparedStatement::describeParameter()
if ( !aParseNodes.empty() )
{
// m_xParamColumns = new OSQLColumns();
- const OSQLTables& xTabs = m_aSQLIterator.getTables();
- if( !xTabs.empty() )
+ const OSQLTables& rTabs = m_aSQLIterator.getTables();
+ if( !rTabs.empty() )
{
- OSQLTable xTable = xTabs.begin()->second;
+ OSQLTable xTable = rTabs.begin()->second;
::std::vector< OSQLParseNode*>::const_iterator aIter = aParseNodes.begin();
for (;aIter != aParseNodes.end();++aIter )
{
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 257f83961bbd..1903d5895c11 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1182,14 +1182,14 @@ bool OResultSet::OpenImpl()
OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
if(!m_pTable)
{
- const OSQLTables& xTabs = m_aSQLIterator.getTables();
- if (xTabs.empty() || !xTabs.begin()->second.is())
+ const OSQLTables& rTabs = m_aSQLIterator.getTables();
+ if (rTabs.empty() || !rTabs.begin()->second.is())
lcl_throwError(STR_QUERY_TOO_COMPLEX,*this);
- if ( xTabs.size() > 1 || m_aSQLIterator.hasErrors() )
+ if ( rTabs.size() > 1 || m_aSQLIterator.hasErrors() )
lcl_throwError(STR_QUERY_MORE_TABLES,*this);
- OSQLTable xTable = xTabs.begin()->second;
+ OSQLTable xTable = rTabs.begin()->second;
m_xColumns = m_aSQLIterator.getSelectColumns();
m_xColNames = xTable->getColumns();
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 1a5003972186..f374b827a179 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -394,14 +394,14 @@ void OStatement_Base::construct(const OUString& sql) throw(SQLException, Runtim
{
m_aSQLIterator.setParseTree(m_pParseTree);
m_aSQLIterator.traverseAll();
- const OSQLTables& xTabs = m_aSQLIterator.getTables();
+ const OSQLTables& rTabs = m_aSQLIterator.getTables();
// sanity checks
- if ( xTabs.empty() )
+ if ( rTabs.empty() )
// no tables -> nothing to operate on -> error
m_pConnection->throwGenericSQLException(STR_QUERY_NO_TABLE,*this);
- if ( xTabs.size() > 1 || m_aSQLIterator.hasErrors() )
+ if ( rTabs.size() > 1 || m_aSQLIterator.hasErrors() )
// more than one table -> can't operate on them -> error
m_pConnection->throwGenericSQLException(STR_QUERY_MORE_TABLES,*this);
@@ -421,7 +421,7 @@ void OStatement_Base::construct(const OUString& sql) throw(SQLException, Runtim
}
// at this moment we support only one table per select statement
- Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(xTabs.begin()->second,UNO_QUERY);
+ Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(rTabs.begin()->second,UNO_QUERY);
if(xTunnel.is())
{
if(m_pTable)