3 files changed, 19 insertions, 19 deletions
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index d1863990e9b7..61c508da0df4 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -498,9 +498,9 @@ void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin
         ,XML_MAX_ROW_COUNT
         ,XML_SUPPRESS_VERSION_COLUMNS
     };
-    for (::xmloff::token::XMLTokenEnum pSetting : pSettings)
+    for (::xmloff::token::XMLTokenEnum i : pSettings)
     {
-        TSettingsMap::const_iterator aFind = _aSettings.find(pSetting);
+        TSettingsMap::const_iterator aFind = _aSettings.find(i);
         if ( aFind != _aSettings.end() )
             AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second);
     }
@@ -531,9 +531,9 @@ void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings)
         ,XML_IS_FIRST_ROW_HEADER_LINE
         ,XML_PARAMETER_NAME_SUBSTITUTION
     };
-    for (::xmloff::token::XMLTokenEnum pSetting : pSettings)
+    for (::xmloff::token::XMLTokenEnum nSetting : pSettings)
     {
-        TSettingsMap::const_iterator aFind = _aSettings.find(pSetting);
+        TSettingsMap::const_iterator aFind = _aSettings.find(nSetting);
         if ( aFind != _aSettings.end() )
             AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second);
     }
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index aaabfb2bb024..bc019394e32e 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -212,8 +212,8 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo
     m_xWindow = VCLUnoHelper::GetInterface( m_pTablePreview );
 
     SetUniqueId(UID_APP_DETAILPAGE_HELPER);
-    for (VclPtr<DBTreeListBox> & m_pList : m_pLists)
-        m_pList = nullptr;
+    for (VclPtr<DBTreeListBox> & rpBox : m_pLists)
+        rpBox = nullptr;
     ImplInitSettings();
 }
 
@@ -235,14 +235,14 @@ void OAppDetailPageHelper::dispose()
         OSL_FAIL("Exception thrown while disposing preview frame!");
     }
 
-    for (VclPtr<DBTreeListBox> & m_pList : m_pLists)
+    for (VclPtr<DBTreeListBox> & rpBox : m_pLists)
     {
-        if ( m_pList )
+        if ( rpBox )
         {
-            m_pList->clearCurrentSelection();
-            m_pList->Hide();
-            m_pList->clearCurrentSelection();   // why a second time?
-            m_pList.disposeAndClear();
+            rpBox->clearCurrentSelection();
+            rpBox->Hide();
+            rpBox->clearCurrentSelection();   // why a second time?
+            rpBox.disposeAndClear();
         }
     }
     m_aMenu.reset();
@@ -764,10 +764,10 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
 void OAppDetailPageHelper::clearPages()
 {
     showPreview(nullptr);
-    for (VclPtr<DBTreeListBox> & m_pList : m_pLists)
+    for (VclPtr<DBTreeListBox> & rpBox : m_pLists)
     {
-        if ( m_pList )
-            m_pList->Clear();
+        if ( rpBox )
+            rpBox->Clear();
     }
 }
 
@@ -1156,9 +1156,9 @@ IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void)
                             , SID_DB_APP_VIEW_DOCINFO_PREVIEW
     };
 
-    for(unsigned short pAction : pActions)
+    for(unsigned short nAction : pActions)
     {
-        aMenu->CheckItem(pAction,m_aMenu->IsItemChecked(pAction));
+        aMenu->CheckItem(nAction,m_aMenu->IsItemChecked(nAction));
     }
     aMenu->EnableItem( SID_DB_APP_VIEW_DOCINFO_PREVIEW, getBorderWin().getView()->getAppController().isCommandEnabled(SID_DB_APP_VIEW_DOCINFO_PREVIEW) );
 
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 69b70bb72665..e6d7160e8b8c 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -194,9 +194,9 @@ namespace dbaui
             { std::addressof(m_pRespectDriverResultSetType),   "resulttype",      DSID_RESPECTRESULTSETTYPE,  false }
         };
 
-        for ( const BooleanSettingDesc& pCopy : aSettings )
+        for ( const BooleanSettingDesc& rDesc : aSettings )
         {
-            m_aBooleanSettings.push_back( pCopy );
+            m_aBooleanSettings.push_back( rDesc );
         }
     }