Avoid reserved identifiers

Change-Id: I2217920ced336189a94c0a5d1e3ac0ccd3912881

43 files changed, 314 insertions, 314 deletions

diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index c6fe22e49a8b..5d7ca6a1d724 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -41,13 +41,13 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex
 }
 
 OIndexHelper::OIndexHelper( OTableHelper* _pTable,
-                const OUString& _Name,
-                const OUString& _Catalog,
+                const OUString& Name,
+                const OUString& Catalog,
                 bool _isUnique,
                 bool _isPrimaryKeyIndex,
                 bool _isClustered
-                ) : connectivity::sdbcx::OIndex(_Name,
-                                  _Catalog,
+                ) : connectivity::sdbcx::OIndex(Name,
+                                  Catalog,
                                   _isUnique,
                                   _isPrimaryKeyIndex,
                                   _isClustered,true)
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index bc99cd55f1c0..6f2c6b7d5378 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -38,9 +38,9 @@ OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::O
 }
 
 OTableKeyHelper::OTableKeyHelper(   OTableHelper* _pTable
-            ,const OUString& _Name
+            ,const OUString& Name
             ,const sdbcx::TKeyProperties& _rProps
-            ) : connectivity::sdbcx::OKey(_Name,_rProps,true)
+            ) : connectivity::sdbcx::OKey(Name,_rProps,true)
                 ,m_pTable(_pTable)
 {
     construct();
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 9d75883ca6bd..875af2157037 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -149,18 +149,18 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
 OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
                             const Reference< XConnection >& _xConnection,
                             bool _bCase,
-                            const OUString& _Name,
-                            const OUString& _Type,
-                            const OUString& _Description ,
-                            const OUString& _SchemaName,
-                            const OUString& _CatalogName
+                            const OUString& Name,
+                            const OUString& Type,
+                            const OUString& Description ,
+                            const OUString& SchemaName,
+                            const OUString& CatalogName
                         ) : OTable_TYPEDEF(_pTables,
                                             _bCase,
-                                            _Name,
-                                          _Type,
-                                          _Description,
-                                          _SchemaName,
-                                          _CatalogName)
+                                            Name,
+                                          Type,
+                                          Description,
+                                          SchemaName,
+                                          CatalogName)
                         ,m_pImpl(new OTableHelperImpl(_xConnection))
 {
 }
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 15816a279ade..67d2cf2ffa2f 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -343,28 +343,28 @@ void SQLExceptionIteratorHelper::next( SQLExceptionInfo& _out_rInfo )
 }
 
 
-void throwFunctionSequenceException(const Reference< XInterface >& _Context, const Any& _Next)  throw ( ::com::sun::star::sdbc::SQLException )
+void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next)  throw ( ::com::sun::star::sdbc::SQLException )
 {
     ::connectivity::SharedResources aResources;
     throw SQLException(
         aResources.getResourceString(STR_ERRORMSG_SEQUENCE),
-        _Context,
+        Context,
         getStandardSQLState( StandardSQLState::FUNCTION_SEQUENCE_ERROR ),
         0,
-        _Next
+        Next
     );
 }
 
-void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context,
-        const ::com::sun::star::uno::Any& _Next)  throw ( ::com::sun::star::sdbc::SQLException )
+void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context,
+        const ::com::sun::star::uno::Any& Next)  throw ( ::com::sun::star::sdbc::SQLException )
 {
     ::connectivity::SharedResources aResources;
     throw SQLException(
         aResources.getResourceString(STR_INVALID_INDEX),
-        _Context,
+        Context,
         getStandardSQLState( StandardSQLState::INVALID_DESCRIPTOR_INDEX ),
         0,
-        _Next
+        Next
     );
 }
 
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index b9eb99f55166..b859e6f26ed5 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2007,33 +2007,33 @@ void checkDisposed(bool _bThrow) throw ( DisposedException )
 
 }
 
-OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator __first,
-                                        OSQLColumns::Vector::const_iterator __last,
+OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator first,
+                                        OSQLColumns::Vector::const_iterator last,
                                         const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase)
 {
     OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
-    return find(__first,__last,sName,_rVal,_rCase);
+    return find(first,last,sName,_rVal,_rCase);
 }
 
-OSQLColumns::Vector::const_iterator findRealName(OSQLColumns::Vector::const_iterator __first,
-                                        OSQLColumns::Vector::const_iterator __last,
+OSQLColumns::Vector::const_iterator findRealName(OSQLColumns::Vector::const_iterator first,
+                                        OSQLColumns::Vector::const_iterator last,
                                         const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase)
 {
     OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
-    return find(__first,__last,sRealName,_rVal,_rCase);
+    return find(first,last,sRealName,_rVal,_rCase);
 }
 
-OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator __first,
-                                        OSQLColumns::Vector::const_iterator __last,
+OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator first,
+                                        OSQLColumns::Vector::const_iterator last,
                                         const OUString& _rProp,
                                         const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase)
 {
-    while (__first != __last && !_rCase(getString((*__first)->getPropertyValue(_rProp)),_rVal))
-        ++__first;
-    return __first;
+    while (first != last && !_rCase(getString((*first)->getPropertyValue(_rProp)),_rVal))
+        ++first;
+    return first;
 }
 } //namespace connectivity
 
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index dd45582bf760..06a400d8c314 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -47,8 +47,8 @@ namespace connectivity
     {
         OConnectionPool* m_pPool;
     public:
-        OPoolTimer(OConnectionPool* _pPool,const ::salhelper::TTimeValue& _Time)
-            : ::salhelper::Timer(_Time)
+        OPoolTimer(OConnectionPool* _pPool,const ::salhelper::TTimeValue& Time)
+            : ::salhelper::Timer(Time)
             ,m_pPool(_pPool)
         {}
     protected:
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 5fa70b311001..8550add9329b 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -510,16 +510,16 @@ void OCalcTable::fillColumns()
 
 
 OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description ,
-                    const OUString& _SchemaName,
-                    const OUString& _CatalogName
-                ) : OCalcTable_BASE(_pTables,_pConnection,_Name,
-                                  _Type,
-                                  _Description,
-                                  _SchemaName,
-                                  _CatalogName)
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description ,
+                    const OUString& SchemaName,
+                    const OUString& CatalogName
+                ) : OCalcTable_BASE(_pTables,_pConnection,Name,
+                                  Type,
+                                  Description,
+                                  SchemaName,
+                                  CatalogName)
                 ,m_pConnection(_pConnection)
                 ,m_nStartCol(0)
                 ,m_nStartRow(0)
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index c27dd7b8969c..88acc9729fdc 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -457,16 +457,16 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
 }
 
 ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConnection,
-                         const OUString& _Name,
-                         const OUString& _Type,
-                         const OUString& _Description ,
-                         const OUString& _SchemaName,
-                         const OUString& _CatalogName )
-    : ODbaseTable_BASE(_pTables,_pConnection,_Name,
-                       _Type,
-                       _Description,
-                       _SchemaName,
-                       _CatalogName)
+                         const OUString& Name,
+                         const OUString& Type,
+                         const OUString& Description ,
+                         const OUString& SchemaName,
+                         const OUString& CatalogName )
+    : ODbaseTable_BASE(_pTables,_pConnection,Name,
+                       Type,
+                       Description,
+                       SchemaName,
+                       CatalogName)
     , m_pMemoStream(nullptr)
     , m_bWriteableMemo(false)
 {
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 6f5ce7d22e4d..3cc579f3ab02 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -49,17 +49,17 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
 }
 
 OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
-                        const OUString& _Name,
-                        const OUString& _Type,
-                        const OUString& _Description ,
-                        const OUString& _SchemaName,
-                        const OUString& _CatalogName )
+                        const OUString& Name,
+                        const OUString& Type,
+                        const OUString& Description ,
+                        const OUString& SchemaName,
+                        const OUString& CatalogName )
     : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(),
-                     _Name,
-                     _Type,
-                     _Description,
-                     _SchemaName,
-                     _CatalogName)
+                     Name,
+                     Type,
+                     Description,
+                     SchemaName,
+                     CatalogName)
     , m_pConnection(_pConnection)
     , m_pFileStream(nullptr)
     , m_nFilePos(0)
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 469efb226b78..309486dc84f4 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -668,7 +668,7 @@ void SAL_CALL Connection::clearWarnings(  ) throw(SQLException, RuntimeException
 }
 
 // XDocumentEventListener
-void SAL_CALL Connection::documentEventOccured( const DocumentEvent& _Event )
+void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event )
                                                         throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
@@ -676,7 +676,7 @@ void SAL_CALL Connection::documentEventOccured( const DocumentEvent& _Event )
     if (!m_bIsEmbedded)
         return;
 
-    if (_Event.EventName == "OnSave" || _Event.EventName == "OnSaveAs")
+    if (Event.EventName == "OnSave" || Event.EventName == "OnSaveAs")
     {
         commit(); // Commit and close transaction
         if ( m_bIsEmbedded && m_xEmbeddedStorage.is() )
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 2db10071fe29..3cd005bd3fe2 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -390,16 +390,16 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,
 }
 
 OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description ,
-                    const OUString& _SchemaName,
-                    const OUString& _CatalogName
-                ) : OFlatTable_BASE(_pTables,_pConnection,_Name,
-                                  _Type,
-                                  _Description,
-                                  _SchemaName,
-                                  _CatalogName)
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description ,
+                    const OUString& SchemaName,
+                    const OUString& CatalogName
+                ) : OFlatTable_BASE(_pTables,_pConnection,Name,
+                                  Type,
+                                  Description,
+                                  SchemaName,
+                                  CatalogName)
     ,m_nRowPos(0)
     ,m_nMaxRowCount(0)
     ,m_cStringDelimiter(_pConnection->getStringDelimiter())
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 22debf341b1e..fa45bcb2359d 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -188,27 +188,27 @@ namespace connectivity { namespace hsqldb
     }
 
 
-    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException, std::exception)
+    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException, std::exception)
     {
         MethodGuard aGuard( *this );
 
-        impl_checkExistingTable_throw( _TableName );
-        if ( !impl_isTextTable_nothrow( _TableName ) )
+        impl_checkExistingTable_throw( TableName );
+        if ( !impl_isTextTable_nothrow( TableName ) )
             return nullptr;
 
         return impl_getTextTableIcon_nothrow();
     }
 
 
-    Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
     {
         MethodGuard aGuard( *this );
 
-        impl_checkExistingTable_throw( _TableName );
-        if ( !impl_isTextTable_nothrow( _TableName ) )
+        impl_checkExistingTable_throw( TableName );
+        if ( !impl_isTextTable_nothrow( TableName ) )
             return nullptr;
 
-        if ( !_DocumentUI.is() )
+        if ( !DocumentUI.is() )
         {
             ::connectivity::SharedResources aResources;
             const OUString sError( aResources.getResourceString(STR_NO_DOCUMENTUI));
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index ef8d6748d024..757f7b9d2cca 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -73,20 +73,20 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
 
 OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
                            const Reference< XConnection >& _xConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description ,
-                    const OUString& _SchemaName,
-                    const OUString& _CatalogName,
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description ,
+                    const OUString& SchemaName,
+                    const OUString& CatalogName,
                     sal_Int32 _nPrivileges
                 ) : OTableHelper(   _pTables,
                                     _xConnection,
                                     true,
-                                    _Name,
-                                    _Type,
-                                    _Description,
-                                    _SchemaName,
-                                    _CatalogName)
+                                    Name,
+                                    Type,
+                                    Description,
+                                    SchemaName,
+                                    CatalogName)
  , m_nPrivileges(_nPrivileges)
 {
     construct();
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index fdf5f236174b..59a3b8777447 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -43,8 +43,8 @@ OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star
 }
 
 OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
-                const OUString& _Name
-            ) : connectivity::sdbcx::OUser(_Name, true)
+                const OUString& Name
+            ) : connectivity::sdbcx::OUser(Name, true)
                 ,m_xConnection(_xConnection)
 {
     construct();
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index 9d679dd5cbc7..59cf6a138f75 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -156,19 +156,19 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr
     return pProps;
 }
 
-OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str)
+OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring Str)
 {
     OUString aStr;
-    if(_Str)
+    if(Str)
     {
         jboolean bCopy(sal_True);
-        const jchar* pChar = pEnv->GetStringChars(_Str,&bCopy);
-        jsize len = pEnv->GetStringLength(_Str);
+        const jchar* pChar = pEnv->GetStringChars(Str,&bCopy);
+        jsize len = pEnv->GetStringLength(Str);
         aStr = OUString(reinterpret_cast<sal_Unicode const *>(pChar), len);
 
         if(bCopy)
-            pEnv->ReleaseStringChars(_Str,pChar);
-        pEnv->DeleteLocalRef(_Str);
+            pEnv->ReleaseStringChars(Str,pChar);
+        pEnv->DeleteLocalRef(Str);
     }
     return aStr;
 }
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index 24f7a4cff932..7d855b40cfa3 100644
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
@@ -43,17 +43,17 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnect
 
 MacabTable::MacabTable( sdbcx::OCollection* _pTables,
                 MacabConnection* _pConnection,
-                const OUString& _Name,
-                const OUString& _Type,
-                const OUString& _Description ,
-                const OUString& _SchemaName,
-                const OUString& _CatalogName
+                const OUString& Name,
+                const OUString& Type,
+                const OUString& Description ,
+                const OUString& SchemaName,
+                const OUString& CatalogName
                 ) : MacabTable_TYPEDEF(_pTables,true,
-                                  _Name,
-                                  _Type,
-                                  _Description,
-                                  _SchemaName,
-                                  _CatalogName),
+                                  Name,
+                                  Type,
+                                  Description,
+                                  SchemaName,
+                                  CatalogName),
                     m_pConnection(_pConnection)
 {
     construct();
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
index d38d978e136a..6c90d78c61e3 100644
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
@@ -38,11 +38,11 @@ namespace connectivity
             MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection);
             MacabTable( sdbcx::OCollection* _pTables,
                     MacabConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description = OUString(),
-                    const OUString& _SchemaName = OUString(),
-                    const OUString& _CatalogName = OUString()
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description = OUString(),
+                    const OUString& SchemaName = OUString(),
+                    const OUString& CatalogName = OUString()
                 );
 
             MacabConnection* getConnection() { return m_pConnection;}
diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx
index 38ec30627626..1a546f133ebb 100644
--- a/connectivity/source/drivers/mork/MTable.cxx
+++ b/connectivity/source/drivers/mork/MTable.cxx
@@ -28,8 +28,8 @@ using namespace connectivity;
 
 
 OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
-                const OUString& _Name, const OUString& _Type, const OUString& _Description )
-    :OTable_Base(_pTables, _pConnection, true, _Name, _Type, _Description )
+                const OUString& Name, const OUString& Type, const OUString& Description )
+    :OTable_Base(_pTables, _pConnection, true, Name, Type, Description )
     ,m_pConnection( _pConnection )
 {
     construct();
diff --git a/connectivity/source/drivers/mork/MTable.hxx b/connectivity/source/drivers/mork/MTable.hxx
index 4f021027d116..7e50743192be 100644
--- a/connectivity/source/drivers/mork/MTable.hxx
+++ b/connectivity/source/drivers/mork/MTable.hxx
@@ -36,9 +36,9 @@ namespace connectivity
         public:
             OTable( sdbcx::OCollection* _pTables,
                     OConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description );
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description );
 
             OConnection* getConnection() { return m_pConnection;}
 
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index bdece3d48431..a34406e7bb67 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -92,20 +92,20 @@ OMySQLTable::OMySQLTable(   sdbcx::OCollection* _pTables,
 
 OMySQLTable::OMySQLTable(   sdbcx::OCollection* _pTables,
                            const Reference< XConnection >& _xConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description ,
-                    const OUString& _SchemaName,
-                    const OUString& _CatalogName,
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description ,
+                    const OUString& SchemaName,
+                    const OUString& CatalogName,
                     sal_Int32 _nPrivileges
                 ) : OTableHelper(   _pTables,
                                     _xConnection,
                                     true,
-                                    _Name,
-                                    _Type,
-                                    _Description,
-                                    _SchemaName,
-                                    _CatalogName)
+                                    Name,
+                                    Type,
+                                    Description,
+                                    SchemaName,
+                                    CatalogName)
  , m_nPrivileges(_nPrivileges)
 {
     construct();
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 1a0960b71b82..f90b496e6f8a 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -43,8 +43,8 @@ OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star
 }
 
 OMySQLUser::OMySQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
-                const OUString& _Name
-            ) : connectivity::sdbcx::OUser(_Name, true)
+                const OUString& Name
+            ) : connectivity::sdbcx::OUser(Name, true)
                 ,m_xConnection(_xConnection)
 {
     construct();
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index 26683cd95f3c..bb3b143d3f6f 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -65,11 +65,11 @@ namespace connectivity
 
         public:
             OCalcTable( sdbcx::OCollection* _pTables,OCalcConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description = OUString(),
-                    const OUString& _SchemaName = OUString(),
-                    const OUString& _CatalogName = OUString()
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description = OUString(),
+                    const OUString& SchemaName = OUString(),
+                    const OUString& CatalogName = OUString()
                 );
 
             virtual sal_Int32 getCurrentLastPos() const override;
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 8dd3c0a9d646..115b14d84321 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -91,7 +91,7 @@ namespace connectivity
             virtual ~ODbaseIndex();
         public:
             ODbaseIndex(ODbaseTable* _pTable);
-            ODbaseIndex(ODbaseTable* _pTable,const NDXHeader& _aHeader,const OUString& _Name);
+            ODbaseIndex(ODbaseTable* _pTable,const NDXHeader& _aHeader,const OUString& Name);
 
             bool openIndexFile();
             virtual void refreshColumns() override;
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 79a61d877704..ad579e8fe0da 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -129,11 +129,11 @@ namespace connectivity
         public:
             ODbaseTable( sdbcx::OCollection* _pTables,ODbaseConnection* _pConnection);
             ODbaseTable( sdbcx::OCollection* _pTables,ODbaseConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description = OUString(),
-                    const OUString& _SchemaName = OUString(),
-                    const OUString& _CatalogName = OUString()
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description = OUString(),
+                    const OUString& SchemaName = OUString(),
+                    const OUString& CatalogName = OUString()
                 );
 
             void construct() override; // can throw any exception
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 5e3229bd615b..6f8b2ae29130 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -56,11 +56,11 @@ namespace connectivity
         public:
             OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection);
             OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description = OUString(),
-                    const OUString& _SchemaName = OUString(),
-                    const OUString& _CatalogName = OUString()
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description = OUString(),
+                    const OUString& SchemaName = OUString(),
+                    const OUString& CatalogName = OUString()
                 );
 
             //XInterface
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 4e0e9a283473..07d186748cfb 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -78,11 +78,11 @@ namespace connectivity
         public:
             //  DECLARE_CTY_DEFAULTS( OFlatTable_BASE);
             OFlatTable( sdbcx::OCollection* _pTables,OFlatConnection* _pConnection,
-                    const OUString& _Name,
-                    const OUString& _Type,
-                    const OUString& _Description = OUString(),
-                    const OUString& _SchemaName = OUString(),
-                    const OUString& _CatalogName = OUString()
+                    const OUString& Name,
+                    const OUString& Type,
+                    const OUString& Description = OUString(),
+                    const OUString& SchemaName = OUString(),
+                    const OUString& CatalogName = OUString()
                 );
 
             void construct() override; // can throw any exception
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index e7abfaf73655..fdd11ff9562c 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -78,11 +78,11 @@ namespace connectivity
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
             OHSQLTable( sdbcx::OCollection* _pTables,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
-                            const OUString& _Name,
-                            const OUString& _Type,
-                            const OUString& _Description = OUString(),
-                            const OUString& _SchemaName = OUString(),
-                            const OUString& _CatalogName = OUString(),
+                            const OUString& Name,
+                            const OUString& Type,
+                            const OUString& Description = OUString(),
+                            const OUString& SchemaName = OUString(),
+                            const OUString& CatalogName = OUString(),
                             sal_Int32 _nPrivileges = 0
                 );
 
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index 14019b9df999..3f56b6b55b9c 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -40,7 +40,7 @@ namespace connectivity
             virtual void refreshGroups() override;
         public:
             OHSQLUser(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
-            OHSQLUser(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& _Name);
+            OHSQLUser(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& Name);
 
             // XUser
             virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index aa6e805628b6..db959d2d39ce 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -37,8 +37,8 @@
 namespace connectivity
 {
 
-    jstring convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _Temp);
-    OUString JavaString2String(JNIEnv *pEnv,jstring _Str);
+    jstring convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& Temp);
+    OUString JavaString2String(JNIEnv *pEnv,jstring Str);
     class java_util_Properties;
 
     java_util_Properties* createStringPropertyArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index 8fcf0b17ddd0..eb912b043c0d 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -85,11 +85,11 @@ namespace connectivity
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
             OMySQLTable(    sdbcx::OCollection* _pTables,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
-                            const OUString& _Name,
-                            const OUString& _Type,
-                            const OUString& _Description = OUString(),
-                            const OUString& _SchemaName = OUString(),
-                            const OUString& _CatalogName = OUString(),
+                            const OUString& Name,
+                            const OUString& Type,
+                            const OUString& Description = OUString(),
+                            const OUString& SchemaName = OUString(),
+                            const OUString& CatalogName = OUString(),
                             sal_Int32 _nPrivileges = 0
                 );
 
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index 91f4dd43a59f..b638dcdc48b2 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -40,7 +40,7 @@ namespace connectivity
             virtual void refreshGroups() override;
         public:
             OMySQLUser(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
-            OMySQLUser(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& _Name);
+            OMySQLUser(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& Name);
 
             // XUser
             virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 41845c3086f9..aa9dfcda57d1 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -72,7 +72,7 @@ namespace connectivity
             void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, SQLLEN _nDataAllocLen);
             // Wrappers for special cases
             void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int16 _nScale, const OUString &_sData);
-            void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, const com::sun::star::uno::Sequence< sal_Int8 > &_Data);
+            void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, const com::sun::star::uno::Sequence< sal_Int8 > &Data);
 
             bool isPrepared() const { return m_bPrepared;}
             void prepareStatement();
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 39d7ebfedeea..bb53c96ad9a3 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -61,35 +61,35 @@ OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn, bool _bCase)
 }
 
 
-OParseColumn::OParseColumn( const OUString& _Name,
-                    const OUString& _TypeName,
-                    const OUString& _DefaultValue,
-                    const OUString& _Description,
-                    sal_Int32       _IsNullable,
-                    sal_Int32       _Precision,
-                    sal_Int32       _Scale,
-                    sal_Int32       _Type,
-                    bool            _IsAutoIncrement,
-                    bool            _IsCurrency,
+OParseColumn::OParseColumn( const OUString& Name,
+                    const OUString& TypeName,
+                    const OUString& DefaultValue,
+                    const OUString& Description,
+                    sal_Int32       IsNullable,
+                    sal_Int32       Precision,
+                    sal_Int32       Scale,
+                    sal_Int32       Type,
+                    bool            IsAutoIncrement,
+                    bool            IsCurrency,
                     bool            _bCase,
-                    const OUString& _CatalogName,
-                    const OUString& _SchemaName,
-                    const OUString& _TableName
-                ) : connectivity::sdbcx::OColumn(_Name,
-                                  _TypeName,
-                                  _DefaultValue,
-                                  _Description,
-                                  _IsNullable,
-                                  _Precision,
-                                  _Scale,
-                                  _Type,
-                                  _IsAutoIncrement,
+                    const OUString& CatalogName,
+                    const OUString& SchemaName,
+                    const OUString& TableName
+                ) : connectivity::sdbcx::OColumn(Name,
+                                  TypeName,
+                                  DefaultValue,
+                                  Description,
+                                  IsNullable,
+                                  Precision,
+                                  Scale,
+                                  Type,
+                                  IsAutoIncrement,
                                   false,
-                                  _IsCurrency,
+                                  IsCurrency,
                                   _bCase,
-                                  _CatalogName,
-                                  _SchemaName,
-                                  _TableName)
+                                  CatalogName,
+                                  SchemaName,
+                                  TableName)
     , m_bFunction(false)
     , m_bDbasePrecisionChanged(false)
     , m_bAggregateFunction(false)
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index 860d5cabce6d..ef8d9aae789d 100644
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
@@ -35,20 +35,20 @@ OSQLInternalNode::OSQLInternalNode(const sal_Char* pNewValue,
 }
 
 
-OSQLInternalNode::OSQLInternalNode(const OString &_NewValue,
+OSQLInternalNode::OSQLInternalNode(const OString &NewValue,
                                  SQLNodeType eNodeType,
                                  sal_uInt32 nNodeID)
-                :OSQLParseNode(_NewValue,eNodeType,nNodeID)
+                :OSQLParseNode(NewValue,eNodeType,nNodeID)
 {
     OSL_ENSURE(OSQLParser::s_pGarbageCollector, "Collector not initialized");
     (*OSQLParser::s_pGarbageCollector)->push_back(this);
 }
 
 
-OSQLInternalNode::OSQLInternalNode(const OUString &_NewValue,
+OSQLInternalNode::OSQLInternalNode(const OUString &NewValue,
                                  SQLNodeType eNodeType,
                                  sal_uInt32 nNodeID)
-                :OSQLParseNode(_NewValue,eNodeType,nNodeID)
+                :OSQLParseNode(NewValue,eNodeType,nNodeID)
 {
     OSL_ENSURE(OSQLParser::s_pGarbageCollector, "Collector not initialized");
     (*OSQLParser::s_pGarbageCollector)->push_back(this);
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index bc2d2185d359..6be396b643d9 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -70,38 +70,38 @@ OColumn::OColumn(bool _bCase)
     construct();
 }
 
-OColumn::OColumn(   const OUString& _Name,
-                    const OUString& _TypeName,
-                    const OUString& _DefaultValue,
-                    const OUString& _Description,
-                    sal_Int32       _IsNullable,
-                    sal_Int32       _Precision,
-                    sal_Int32       _Scale,
-                    sal_Int32       _Type,
-                    bool            _IsAutoIncrement,
-                    bool            _IsRowVersion,
-                    bool            _IsCurrency,
+OColumn::OColumn(   const OUString& Name,
+                    const OUString& TypeName,
+                    const OUString& DefaultValue,
+                    const OUString& Description,
+                    sal_Int32       IsNullable,
+                    sal_Int32       Precision,
+                    sal_Int32       Scale,
+                    sal_Int32       Type,
+                    bool            IsAutoIncrement,
+                    bool            IsRowVersion,
+                    bool            IsCurrency,
                     bool            _bCase,
-                    const OUString& _CatalogName,
-                    const OUString& _SchemaName,
-                    const OUString& _TableName)
+                    const OUString& CatalogName,
+                    const OUString& SchemaName,
+                    const OUString& TableName)
     :OColumnDescriptor_BASE(m_aMutex)
     ,ODescriptor(OColumnDescriptor_BASE::rBHelper,_bCase)
-    ,m_TypeName(_TypeName)
-    ,m_Description(_Description)
-    ,m_DefaultValue(_DefaultValue)
-    ,m_IsNullable(_IsNullable)
-    ,m_Precision(_Precision)
-    ,m_Scale(_Scale)
-    ,m_Type(_Type)
-    ,m_IsAutoIncrement(_IsAutoIncrement)
-    ,m_IsRowVersion(_IsRowVersion)
-    ,m_IsCurrency(_IsCurrency)
-    ,m_CatalogName(_CatalogName)
-    ,m_SchemaName(_SchemaName)
-    ,m_TableName(_TableName)
-{
-    m_Name = _Name;
+    ,m_TypeName(TypeName)
+    ,m_Description(Description)
+    ,m_DefaultValue(DefaultValue)
+    ,m_IsNullable(IsNullable)
+    ,m_Precision(Precision)
+    ,m_Scale(Scale)
+    ,m_Type(Type)
+    ,m_IsAutoIncrement(IsAutoIncrement)
+    ,m_IsRowVersion(IsRowVersion)
+    ,m_IsCurrency(IsCurrency)
+    ,m_CatalogName(CatalogName)
+    ,m_SchemaName(SchemaName)
+    ,m_TableName(TableName)
+{
+    m_Name = Name;
 
     construct();
 }
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 7e41705efcb0..0e8b5ab2e643 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -43,11 +43,11 @@ OGroup::OGroup(bool _bCase) :   OGroup_BASE(m_aMutex)
 {
 }
 
-OGroup::OGroup(const OUString& _Name, bool _bCase) :  OGroup_BASE(m_aMutex)
+OGroup::OGroup(const OUString& Name, bool _bCase) :  OGroup_BASE(m_aMutex)
                         ,ODescriptor(OGroup_BASE::rBHelper,_bCase)
                         ,m_pUsers(nullptr)
 {
-    m_Name = _Name;
+    m_Name = Name;
 }
 
 OGroup::~OGroup()
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 67e05499f9ed..d044447fa254 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -70,20 +70,20 @@ OIndex::OIndex(bool _bCase) :   ODescriptor_BASE(m_aMutex)
 {
 }
 
-OIndex::OIndex( const OUString& _Name,
-                const OUString& _Catalog,
+OIndex::OIndex( const OUString& Name,
+                const OUString& Catalog,
                 bool _isUnique,
                 bool _isPrimaryKeyIndex,
                 bool _isClustered,
                 bool _bCase) :  ODescriptor_BASE(m_aMutex)
                         ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase)
-                        ,m_Catalog(_Catalog)
+                        ,m_Catalog(Catalog)
                         ,m_IsUnique(_isUnique)
                         ,m_IsPrimaryKeyIndex(_isPrimaryKeyIndex)
                         ,m_IsClustered(_isClustered)
                         ,m_pColumns(nullptr)
 {
-    m_Name = _Name;
+    m_Name = Name;
 }
 
 OIndex::~OIndex( )
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 6357b88c676b..d775aa17deb9 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -55,37 +55,37 @@ OIndexColumn::OIndexColumn(bool _bCase) : OColumn(_bCase),  m_IsAscending(true)
 }
 
 
-OIndexColumn::OIndexColumn( bool             _IsAscending,
-                            const OUString&  _Name,
-                            const OUString&  _TypeName,
-                            const OUString&  _DefaultValue,
-                            sal_Int32        _IsNullable,
-                            sal_Int32        _Precision,
-                            sal_Int32        _Scale,
-                            sal_Int32        _Type,
-                            bool             _IsAutoIncrement,
-                            bool             _IsRowVersion,
-                            bool             _IsCurrency,
+OIndexColumn::OIndexColumn( bool             IsAscending,
+                            const OUString&  Name,
+                            const OUString&  TypeName,
+                            const OUString&  DefaultValue,
+                            sal_Int32        IsNullable,
+                            sal_Int32        Precision,
+                            sal_Int32        Scale,
+                            sal_Int32        Type,
+                            bool             IsAutoIncrement,
+                            bool             IsRowVersion,
+                            bool             IsCurrency,
                             bool             _bCase,
-                            const OUString&  _CatalogName,
-                            const OUString&  _SchemaName,
-                            const OUString&  _TableName
-                        ) : OColumn(_Name,
-                            _TypeName,
-                            _DefaultValue,
+                            const OUString&  CatalogName,
+                            const OUString&  SchemaName,
+                            const OUString&  TableName
+                        ) : OColumn(Name,
+                            TypeName,
+                            DefaultValue,
                             OUString(),
-                            _IsNullable,
-                            _Precision,
-                            _Scale,
-                            _Type,
-                            _IsAutoIncrement,
-                            _IsRowVersion,
-                            _IsCurrency,
+                            IsNullable,
+                            Precision,
+                            Scale,
+                            Type,
+                            IsAutoIncrement,
+                            IsRowVersion,
+                            IsCurrency,
                             _bCase,
-                            _CatalogName,
-                            _SchemaName,
-                            _TableName)
-                        ,   m_IsAscending(_IsAscending)
+                            CatalogName,
+                            SchemaName,
+                            TableName)
+                        ,   m_IsAscending(IsAscending)
 {
     construct();
 }
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index d6cf5a616a17..3df816bf5bf9 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -66,13 +66,13 @@ OKey::OKey(bool _bCase) :   ODescriptor_BASE(m_aMutex)
 {
 }
 
-OKey::OKey(const OUString& _Name,const TKeyProperties& _rProps, bool _bCase)
+OKey::OKey(const OUString& Name,const TKeyProperties& _rProps, bool _bCase)
 : ODescriptor_BASE(m_aMutex)
  ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase)
  ,m_aProps(_rProps)
  ,m_pColumns(nullptr)
 {
-    m_Name = _Name;
+    m_Name = Name;
 }
 //OKey::OKey(   const OUString& _Name,
 //          const OUString& _ReferencedTable,
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index d47b1a6f7fd9..3bfb4d976498 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -55,37 +55,37 @@ OKeyColumn::OKeyColumn(bool _bCase) : OColumn(_bCase)
     construct();
 }
 
-OKeyColumn::OKeyColumn( const OUString&  _ReferencedColumn,
-                        const OUString&  _Name,
-                        const OUString&  _TypeName,
-                        const OUString&  _DefaultValue,
-                        sal_Int32        _IsNullable,
-                        sal_Int32        _Precision,
-                        sal_Int32        _Scale,
-                        sal_Int32        _Type,
-                        bool             _IsAutoIncrement,
-                        bool             _IsRowVersion,
-                        bool             _IsCurrency,
+OKeyColumn::OKeyColumn( const OUString&  ReferencedColumn,
+                        const OUString&  Name,
+                        const OUString&  TypeName,
+                        const OUString&  DefaultValue,
+                        sal_Int32        IsNullable,
+                        sal_Int32        Precision,
+                        sal_Int32        Scale,
+                        sal_Int32        Type,
+                        bool             IsAutoIncrement,
+                        bool             IsRowVersion,
+                        bool             IsCurrency,
                         bool             _bCase,
-                        const OUString&  _CatalogName,
-                        const OUString&  _SchemaName,
-                        const OUString&  _TableName
-                        ) : OColumn(_Name,
-                            _TypeName,
-                            _DefaultValue,
+                        const OUString&  CatalogName,
+                        const OUString&  SchemaName,
+                        const OUString&  TableName
+                        ) : OColumn(Name,
+                            TypeName,
+                            DefaultValue,
                             OUString(),
-                            _IsNullable,
-                            _Precision,
-                            _Scale,
-                            _Type,
-                            _IsAutoIncrement,
-                            _IsRowVersion,
-                            _IsCurrency,
+                            IsNullable,
+                            Precision,
+                            Scale,
+                            Type,
+                            IsAutoIncrement,
+                            IsRowVersion,
+                            IsCurrency,
                             _bCase,
-                            _CatalogName,
-                            _SchemaName,
-                            _TableName)
-                        ,   m_ReferencedColumn(_ReferencedColumn)
+                            CatalogName,
+                            SchemaName,
+                            TableName)
+                        ,   m_ReferencedColumn(ReferencedColumn)
 {
     construct();
 }
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index f15de0dff965..809aa77b97d4 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -77,20 +77,20 @@ OTable::OTable(OCollection* _pTables,
 
 OTable::OTable( OCollection*    _pTables,
                 bool            _bCase,
-                const OUString& _Name,       const OUString& _Type,
-                const OUString& _Description,const OUString& _SchemaName,
-                const OUString& _CatalogName) :  OTableDescriptor_BASE(m_aMutex)
+                const OUString& Name,       const OUString& Type,
+                const OUString& Description,const OUString& SchemaName,
+                const OUString& CatalogName) :  OTableDescriptor_BASE(m_aMutex)
                 ,ODescriptor(OTableDescriptor_BASE::rBHelper,_bCase)
-                ,m_CatalogName(_CatalogName)
-                ,m_SchemaName(_SchemaName)
-                ,m_Description(_Description)
-                ,m_Type(_Type)
+                ,m_CatalogName(CatalogName)
+                ,m_SchemaName(SchemaName)
+                ,m_Description(Description)
+                ,m_Type(Type)
                 ,m_pKeys(nullptr)
                 ,m_pColumns(nullptr)
                 ,m_pIndexes(nullptr)
                 ,m_pTables(_pTables)
 {
-    m_Name = _Name;
+    m_Name = Name;
 }
 
 OTable::~OTable()
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index af4385024d4b..ff1ac1e5aa4d 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -44,11 +44,11 @@ OUser::OUser(bool _bCase)  : OUser_BASE(m_aMutex)
 {
 }
 
-OUser::OUser(const OUString& _Name, bool _bCase) :    OUser_BASE(m_aMutex)
+OUser::OUser(const OUString& Name, bool _bCase) :    OUser_BASE(m_aMutex)
                         ,ODescriptor(OUser_BASE::rBHelper,_bCase)
                         ,m_pGroups(nullptr)
 {
-    m_Name = _Name;
+    m_Name = Name;
 }
 
 OUser::~OUser( )
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 5a42836f6cc7..42be94fb2b69 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -35,20 +35,20 @@ using namespace ::com::sun::star::lang;
 IMPLEMENT_SERVICE_INFO(OView,"com.sun.star.sdbcx.VView","com.sun.star.sdbcx.View");
 
 OView::OView(bool _bCase,
-            const OUString& _Name,
+            const OUString& Name,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData,
-            sal_Int32 _CheckOption,
-            const OUString& _Command,
-            const OUString& _SchemaName,
-            const OUString& _CatalogName) : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase)
-            ,m_CatalogName(_CatalogName)
-            ,m_SchemaName(_SchemaName)
-            ,m_Command(_Command)
-            ,m_CheckOption(_CheckOption)
+            sal_Int32 CheckOption,
+            const OUString& Command,
+            const OUString& SchemaName,
+            const OUString& CatalogName) : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase)
+            ,m_CatalogName(CatalogName)
+            ,m_SchemaName(SchemaName)
+            ,m_Command(Command)
+            ,m_CheckOption(CheckOption)
             ,m_xMetaData(_xMetaData)
 
 {
-    m_Name = _Name;
+    m_Name = Name;
     construct();
 }