diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-27 09:22:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-28 09:31:16 +0000 |
| commit | 43b4903db3e925c652e25c34362490f8adc9c5ec (patch) | |
| tree | af12777b72d42280467e8cc19b914b2c7f4f3816 /dbaccess/source | |
| parent | 7d6308dad9f4a079d57719a6e3a9c4cebb47d051 (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 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/dlg/adminpages.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 91404f5330d0..c8de4cac85fc 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -240,10 +240,10 @@ namespace dbaui bool bShowMessage = true; try { - ::std::pair< Reference<XConnection>,sal_Bool> xConnection = m_pAdminDialog->createConnection(); - bShowMessage = xConnection.second; - bSuccess = xConnection.first.is(); - ::comphelper::disposeComponent(xConnection.first); + ::std::pair< Reference<XConnection>,sal_Bool> aConnectionPair = m_pAdminDialog->createConnection(); + bShowMessage = aConnectionPair.second; + bSuccess = aConnectionPair.first.is(); + ::comphelper::disposeComponent(aConnectionPair.first); } catch(Exception&) { diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 42a62c6093b5..4f543c4b693f 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -627,8 +627,8 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& } else { - const OSQLTables& xTabs = m_pSqlIterator->getTables(); - if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || xTabs.begin() == xTabs.end() ) + const OSQLTables& rTabs = m_pSqlIterator->getTables(); + if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || rTabs.begin() == rTabs.end() ) { aError = SQLException( OUString( ModuleRes( STR_QRY_NOSELECT ) ), |