Avoid reserved identifiers

Change-Id: I2b0fe700057fea790e8b5d651770b27f0a553fbf

16 files changed, 202 insertions, 202 deletions

diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 7fcd857d4472..9b170bdf0627 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -790,13 +790,13 @@ void OConnection::impl_checkTableQueryNames_nothrow()
     }
 }
 
-Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException, std::exception)
+Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (RuntimeException, std::exception)
 {
     Reference< XGraphic > xReturn;
 
     // ask our aggregate
     if ( m_xTableUIProvider.is() )
-        xReturn = m_xTableUIProvider->getTableIcon( _TableName, _ColorMode );
+        xReturn = m_xTableUIProvider->getTableIcon( TableName, ColorMode );
 
     // ask ourself
     // well, we don't have own functionality here ...
@@ -806,13 +806,13 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _Table
     return xReturn;
 }
 
-Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     Reference< XInterface > xReturn;
 
     // ask our aggregate
     if ( m_xTableUIProvider.is() )
-        xReturn = m_xTableUIProvider->getTableEditor( _DocumentUI, _TableName );
+        xReturn = m_xTableUIProvider->getTableEditor( DocumentUI, TableName );
 
     // ask ourself
     // well, we don't have own functionality here ...
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 9c28241fba3d..f624600cc88f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -540,9 +540,9 @@ void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, Ru
     m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
 }
 
-sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
 {
-    return m_xDatabaseRegistrations->hasRegisteredDatabase( _Name );
+    return m_xDatabaseRegistrations->hasRegisteredDatabase( Name );
 }
 
 Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException, std::exception)
@@ -550,39 +550,39 @@ Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (Ru
     return m_xDatabaseRegistrations->getRegistrationNames();
 }
 
-OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
-    return m_xDatabaseRegistrations->getDatabaseLocation( _Name );
+    return m_xDatabaseRegistrations->getDatabaseLocation( Name );
 }
 
-void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
 {
-    m_xDatabaseRegistrations->registerDatabaseLocation( _Name, _Location );
+    m_xDatabaseRegistrations->registerDatabaseLocation( Name, Location );
 }
 
-void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
 {
-    m_xDatabaseRegistrations->revokeDatabaseLocation( _Name );
+    m_xDatabaseRegistrations->revokeDatabaseLocation( Name );
 }
 
-void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& _Name, const OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
 {
-    m_xDatabaseRegistrations->changeDatabaseLocation( _Name, _NewLocation );
+    m_xDatabaseRegistrations->changeDatabaseLocation( Name, NewLocation );
 }
 
-sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
-    return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( _Name );
+    return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( Name );
 }
 
-void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    m_xDatabaseRegistrations->addDatabaseRegistrationsListener( _Listener );
+    m_xDatabaseRegistrations->addDatabaseRegistrationsListener( Listener );
 }
 
-void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( _Listener );
+    m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( Listener );
 }
 
 // css::container::XElementAccess
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 2922e8e5924f..ad56a86342fb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -542,14 +542,14 @@ void SAL_CALL ODatabaseDocument::initNew(  ) throw (DoubleInitializationExceptio
     impl_notifyStorageChange_nolck_nothrow( xTempStor );
 }
 
-void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& _Arguments ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& Arguments ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard( *this, DocumentGuard::InitMethod );
 
     impl_reset_nothrow();
 
-    ::comphelper::NamedValueCollection aResource( _Arguments );
+    ::comphelper::NamedValueCollection aResource( Arguments );
     if ( aResource.has( "FileName" ) && !aResource.has( "URL" ) )
         // FileName is the compatibility name for URL, so we might have clients passing
         // a FileName only. However, some of our code works with the URL only, so ensure
@@ -1345,43 +1345,43 @@ void ODatabaseDocument::impl_setModified_nothrow( bool _bModified, DocumentGuard
 }
 
 // css::document::XEventBroadcaster
-void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& _Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception)
 {
-    m_aEventNotifier.addLegacyEventListener( _Listener );
+    m_aEventNotifier.addLegacyEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& _Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception)
 {
-    m_aEventNotifier.removeLegacyEventListener( _Listener );
+    m_aEventNotifier.removeLegacyEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    m_aEventNotifier.addDocumentEventListener( _Listener );
+    m_aEventNotifier.addDocumentEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    m_aEventNotifier.removeDocumentEventListener( _Listener );
+    m_aEventNotifier.removeDocumentEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName, const Reference< XController2 >& ViewController, const Any& Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
 {
-    if ( _EventName.isEmpty() )
+    if ( EventName.isEmpty() )
         throw IllegalArgumentException( OUString(), *this, 1 );
 
     // SYNCHRONIZED ->
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
-    if ( !DocumentEvents::needsSynchronousNotification( _EventName ) )
+    if ( !DocumentEvents::needsSynchronousNotification( EventName ) )
     {
-        m_aEventNotifier.notifyDocumentEventAsync( _EventName, _ViewController, _Supplement );
+        m_aEventNotifier.notifyDocumentEventAsync( EventName, ViewController, Supplement );
         return;
     }
     aGuard.clear();
     // <- SYNCHRONIZED
 
-    m_aEventNotifier.notifyDocumentEvent( _EventName, _ViewController, _Supplement );
+    m_aEventNotifier.notifyDocumentEvent( EventName, ViewController, Supplement );
 }
 
 Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getPrinter(  ) throw (RuntimeException, std::exception)
@@ -1967,16 +1967,16 @@ Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentStorage(  ) throw (
     return m_pImpl->getOrCreateRootStorage();
 }
 
-void SAL_CALL ODatabaseDocument::addStorageChangeListener( const Reference< XStorageChangeListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) throw (RuntimeException, std::exception)
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
-    m_aStorageListeners.addInterface( _Listener );
+    m_aStorageListeners.addInterface( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::removeStorageChangeListener( const Reference< XStorageChangeListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) throw (RuntimeException, std::exception)
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
-    m_aStorageListeners.addInterface( _Listener );
+    m_aStorageListeners.addInterface( Listener );
 }
 
 Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getBasicLibraries() throw (RuntimeException, std::exception)
@@ -2058,16 +2058,16 @@ Sequence< OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames
     return aNames;
 }
 
-Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
+Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
 {
-    return createViewController( "Default", Sequence< PropertyValue >(), _Frame);
+    return createViewController( "Default", Sequence< PropertyValue >(), Frame);
 }
 
-Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
+Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const OUString& ViewName, const Sequence< PropertyValue >& Arguments, const Reference< XFrame >& Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
 {
-    if ( _ViewName != "Default" && _ViewName != "Preview" )
+    if ( ViewName != "Default" && ViewName != "Preview" )
         throw IllegalArgumentException( OUString(), *this, 1 );
-    if ( !_Frame.is() )
+    if ( !Frame.is() )
         throw IllegalArgumentException( OUString(), *this, 3 );
 
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
@@ -2077,9 +2077,9 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( cons
          m_pImpl->m_aContext->getServiceManager()->createInstanceWithContext("org.openoffice.comp.dbu.OApplicationController", m_pImpl->m_aContext),
          UNO_QUERY_THROW );
 
-    ::comphelper::NamedValueCollection aInitArgs( _Arguments );
-    aInitArgs.put( "Frame", _Frame );
-    if ( _ViewName == "Preview" )
+    ::comphelper::NamedValueCollection aInitArgs( Arguments );
+    aInitArgs.put( "Frame", Frame );
+    if ( ViewName == "Preview" )
         aInitArgs.put( "Preview", true );
     Reference< XInitialization > xInitController( xController, UNO_QUERY_THROW );
     xInitController->initialize( aInitArgs.getWrappedPropertyValues() );
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 61bdeed83e4f..f9d4107a07ba 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -349,9 +349,9 @@ public:
     virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XDocumentEventBroadcaster
-    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
 
     // XPrintable
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter(  ) throw (css::uno::RuntimeException, std::exception) override ;
@@ -619,25 +619,25 @@ private:
 class DocumentGuard : private ModelMethodGuard
 {
 public:
-    enum __InitMethod
+    enum InitMethod_
     {
         // a method which is to initialize the document
         InitMethod,
     };
 
-    enum __DefaultMethod
+    enum DefaultMethod_
     {
         // a default method
         DefaultMethod
     };
 
-    enum __MethodUsedDuringInit
+    enum MethodUsedDuringInit_
     {
         // a method which is used (externally) during the initialization phase
         MethodUsedDuringInit
     };
 
-    enum __MethodWithoutInit
+    enum MethodWithoutInit_
     {
         // a method which does not need initialization - use with care!
         MethodWithoutInit
@@ -655,7 +655,7 @@ public:
         @throws css::lang::NotInitializedException
             if the given component is not yet initialized
     */
-    DocumentGuard(const ODatabaseDocument& _document, __DefaultMethod)
+    DocumentGuard(const ODatabaseDocument& _document, DefaultMethod_)
         : ModelMethodGuard(_document)
         , m_document(_document )
     {
@@ -673,7 +673,7 @@ public:
         @throws css::frame::DoubleInitializationException
             if the given component is already initialized, or currently being initialized.
     */
-    DocumentGuard(const ODatabaseDocument& _document, __InitMethod)
+    DocumentGuard(const ODatabaseDocument& _document, InitMethod_)
         : ModelMethodGuard(_document)
         , m_document(_document)
     {
@@ -692,7 +692,7 @@ public:
             if the component is still uninitialized, and not in the initialization
             phase currently.
     */
-    DocumentGuard(const ODatabaseDocument& _document, __MethodUsedDuringInit)
+    DocumentGuard(const ODatabaseDocument& _document, MethodUsedDuringInit_)
         : ModelMethodGuard(_document)
         , m_document(_document)
     {
@@ -707,7 +707,7 @@ public:
         @throws css::lang::DisposedException
             If the given component is already disposed
     */
-    DocumentGuard(const ODatabaseDocument& _document, __MethodWithoutInit)
+    DocumentGuard(const ODatabaseDocument& _document, MethodWithoutInit_)
         : ModelMethodGuard( _document )
         , m_document( _document )
     {
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 159dbe21151c..210989749751 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -73,13 +73,13 @@ namespace dbaccess
         virtual ~DatabaseRegistrations();
 
     public:
-        virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception) override;
         virtual Sequence< OUString > SAL_CALL getRegistrationNames() throw (RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) override;
+        virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) override;
         virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
         virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) override;
         virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) override;
 
@@ -236,10 +236,10 @@ namespace dbaccess
             throw IllegalArgumentException( OUString(), *this, 2 );
     }
 
-    sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
-        ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( _Name );
+        ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( Name );
         return aNodeForName.isValid();
     }
 
@@ -265,11 +265,11 @@ namespace dbaccess
         return aDisplayNames;
     }
 
-    OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+    OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw_must_exist(_Name);
+        ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw_must_exist(Name);
 
         OUString sLocation;
         OSL_VERIFY( aNodeForName.getNodeValue( getLocationNodeName() ) >>= sLocation );
@@ -278,30 +278,30 @@ namespace dbaccess
         return sLocation;
     }
 
-    void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
         // check
-        impl_checkValidLocation_throw( _Location );
-        ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_not_exist(_Name);
+        impl_checkValidLocation_throw( Location );
+        ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_not_exist(Name);
 
         // register
-        aDataSourceRegistration.setNodeValue( getLocationNodeName(), makeAny( _Location ) );
+        aDataSourceRegistration.setNodeValue( getLocationNodeName(), makeAny( Location ) );
         m_aConfigurationRoot.commit();
 
         // notify
-        DatabaseRegistrationEvent aEvent( *this, _Name, OUString(), _Location );
+        DatabaseRegistrationEvent aEvent( *this, Name, OUString(), Location );
         aGuard.clear();
         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent );
     }
 
-    void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
         // check
-        ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw_must_exist(_Name);
+        ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw_must_exist(Name);
 
         // obtain properties for notification
         OUString sLocation;
@@ -316,18 +316,18 @@ namespace dbaccess
         m_aConfigurationRoot.commit();
 
         // notify
-        DatabaseRegistrationEvent aEvent( *this, _Name, sLocation, OUString() );
+        DatabaseRegistrationEvent aEvent( *this, Name, sLocation, OUString() );
         aGuard.clear();
         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent );
     }
 
-    void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& _Name, const OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
         // check
-        impl_checkValidLocation_throw( _NewLocation );
-        ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_exist(_Name);
+        impl_checkValidLocation_throw( NewLocation );
+        ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_exist(Name);
 
         if  ( aDataSourceRegistration.isReadonly() )
             throw IllegalAccessException( OUString(), *this );
@@ -337,32 +337,32 @@ namespace dbaccess
         OSL_VERIFY( aDataSourceRegistration.getNodeValue( getLocationNodeName() ) >>= sOldLocation );
 
         // change
-        aDataSourceRegistration.setNodeValue( getLocationNodeName(), makeAny( _NewLocation ) );
+        aDataSourceRegistration.setNodeValue( getLocationNodeName(), makeAny( NewLocation ) );
         m_aConfigurationRoot.commit();
 
         // notify
-        DatabaseRegistrationEvent aEvent( *this, _Name, sOldLocation, _NewLocation );
+        DatabaseRegistrationEvent aEvent( *this, Name, sOldLocation, NewLocation );
         aGuard.clear();
         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::changedDatabaseLocation, aEvent );
     }
 
-    sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
-        ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_exist(_Name);
+        ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_exist(Name);
         return aDataSourceRegistration.isReadonly();
     }
 
-    void SAL_CALL DatabaseRegistrations::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
     {
-        if ( _Listener.is() )
-            m_aRegistrationListeners.addInterface( _Listener );
+        if ( Listener.is() )
+            m_aRegistrationListeners.addInterface( Listener );
     }
 
-    void SAL_CALL DatabaseRegistrations::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
     {
-        if ( _Listener.is() )
-            m_aRegistrationListeners.removeInterface( _Listener );
+        if ( Listener.is() )
+            m_aRegistrationListeners.removeInterface( Listener );
     }
 
     // DatabaseRegistrations - factory
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index a8b2d4fe265e..6ad51b775129 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -262,9 +262,9 @@ namespace
         {
         }
 
-        void operator()( const Reference< XContainerApproveListener >& _Listener ) const
+        void operator()( const Reference< XContainerApproveListener >& Listener ) const
         {
-            Reference< XVeto > xVeto = (_Listener.get()->*m_pMethod)( m_rEvent );
+            Reference< XVeto > xVeto = (Listener.get()->*m_pMethod)( m_rEvent );
             if ( !xVeto.is() )
                 return;
 
@@ -278,7 +278,7 @@ namespace
             if ( eVetoDetails >>= aWrappedError )
                 throw aWrappedError;
 
-            throw WrappedTargetException( xVeto->getReason(), _Listener.get(), eVetoDetails );
+            throw WrappedTargetException( xVeto->getReason(), Listener.get(), eVetoDetails );
         }
     };
 }
@@ -337,16 +337,16 @@ void SAL_CALL ODefinitionContainer::removeContainerListener( const Reference< XC
         m_aContainerListeners.removeInterface(_rxListener);
 }
 
-void SAL_CALL ODefinitionContainer::addContainerApproveListener( const Reference< XContainerApproveListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::addContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    if ( _Listener.is() )
-        m_aApproveListeners.addInterface( _Listener );
+    if ( Listener.is() )
+        m_aApproveListeners.addInterface( Listener );
 }
 
-void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Reference< XContainerApproveListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    if ( _Listener.is() )
-        m_aApproveListeners.removeInterface( _Listener );
+    if ( Listener.is() )
+        m_aApproveListeners.removeInterface( Listener );
 }
 
 // XElementAccess
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index fc69be4a2313..f9de2d7d4bca 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -138,7 +138,7 @@ namespace dbaccess
     {
     }
 
-    void SAL_CALL DocumentEventExecutor::documentEventOccured( const DocumentEvent& _Event ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentEventExecutor::documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception)
     {
         Reference< XEventsSupplier > xEventsSupplier( m_pData->xDocument.get(), UNO_QUERY );
         if ( !xEventsSupplier.is() )
@@ -152,7 +152,7 @@ namespace dbaccess
         try
         {
             Reference< XNameAccess > xDocEvents( xEventsSupplier->getEvents().get(), UNO_SET_THROW );
-            if ( !xDocEvents->hasByName( _Event.EventName ) )
+            if ( !xDocEvents->hasByName( Event.EventName ) )
             {
                 // this is worth an assertion: We are listener at the very same document which we just asked
                 // for its events. So when EventName is fired, why isn't it supported by xDocEvents?
@@ -160,7 +160,7 @@ namespace dbaccess
                 return;
             }
 
-            const ::comphelper::NamedValueCollection aScriptDescriptor( xDocEvents->getByName( _Event.EventName ) );
+            const ::comphelper::NamedValueCollection aScriptDescriptor( xDocEvents->getByName( Event.EventName ) );
 
             OUString sEventType;
             bool bScriptAssigned = aScriptDescriptor.get_ensureType( "EventType", sEventType );
@@ -180,7 +180,7 @@ namespace dbaccess
 
             if ( bDispatchScriptURL && bNonEmptyScript )
             {
-                lcl_dispatchScriptURL_throw( *m_pData, sScript, _Event );
+                lcl_dispatchScriptURL_throw( *m_pData, sScript, Event );
             }
         }
         catch( const RuntimeException& ) { throw; }
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 7490a041d8a2..0f4d3f21130c 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -70,42 +70,42 @@ namespace dbaccess
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
-        void addLegacyEventListener( const Reference< document::XEventListener >& _Listener )
+        void addLegacyEventListener( const Reference< document::XEventListener >& Listener )
         {
-            m_aLegacyEventListeners.addInterface( _Listener );
+            m_aLegacyEventListeners.addInterface( Listener );
         }
 
-        void removeLegacyEventListener( const Reference< document::XEventListener >& _Listener )
+        void removeLegacyEventListener( const Reference< document::XEventListener >& Listener )
         {
-            m_aLegacyEventListeners.removeInterface( _Listener );
+            m_aLegacyEventListeners.removeInterface( Listener );
         }
 
-        void addDocumentEventListener( const Reference< XDocumentEventListener >& _Listener )
+        void addDocumentEventListener( const Reference< XDocumentEventListener >& Listener )
         {
-            m_aDocumentEventListeners.addInterface( _Listener );
+            m_aDocumentEventListeners.addInterface( Listener );
         }
 
-        void removeDocumentEventListener( const Reference< XDocumentEventListener >& _Listener )
+        void removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener )
         {
-            m_aDocumentEventListeners.removeInterface( _Listener );
+            m_aDocumentEventListeners.removeInterface( Listener );
         }
 
         void disposing();
 
         void onDocumentInitialized();
 
-        void    notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController,
-                    const Any& _Supplement )
+        void    notifyDocumentEvent( const OUString& EventName, const Reference< XController2 >& ViewController,
+                    const Any& Supplement )
         {
             impl_notifyEvent_nothrow( DocumentEvent(
-                m_rDocument, _EventName, _ViewController, _Supplement ) );
+                m_rDocument, EventName, ViewController, Supplement ) );
         }
 
-        void    notifyDocumentEventAsync( const OUString& _EventName, const Reference< XController2 >& _ViewController,
-                    const Any& _Supplement )
+        void    notifyDocumentEventAsync( const OUString& EventName, const Reference< XController2 >& ViewController,
+                    const Any& Supplement )
         {
             impl_notifyEventAsync_nothrow( DocumentEvent(
-                m_rDocument, _EventName, _ViewController, _Supplement ) );
+                m_rDocument, EventName, ViewController, Supplement ) );
         }
 
     protected:
@@ -243,36 +243,36 @@ namespace dbaccess
         m_pImpl->onDocumentInitialized();
     }
 
-    void DocumentEventNotifier::addLegacyEventListener( const Reference< document::XEventListener >& _Listener )
+    void DocumentEventNotifier::addLegacyEventListener( const Reference< document::XEventListener >& Listener )
     {
-        m_pImpl->addLegacyEventListener( _Listener );
+        m_pImpl->addLegacyEventListener( Listener );
     }
 
-    void DocumentEventNotifier::removeLegacyEventListener( const Reference< document::XEventListener >& _Listener )
+    void DocumentEventNotifier::removeLegacyEventListener( const Reference< document::XEventListener >& Listener )
     {
-        m_pImpl->removeLegacyEventListener( _Listener );
+        m_pImpl->removeLegacyEventListener( Listener );
     }
 
-    void DocumentEventNotifier::addDocumentEventListener( const Reference< XDocumentEventListener >& _Listener )
+    void DocumentEventNotifier::addDocumentEventListener( const Reference< XDocumentEventListener >& Listener )
     {
-        m_pImpl->addDocumentEventListener( _Listener );
+        m_pImpl->addDocumentEventListener( Listener );
     }
 
-    void DocumentEventNotifier::removeDocumentEventListener( const Reference< XDocumentEventListener >& _Listener )
+    void DocumentEventNotifier::removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener )
     {
-        m_pImpl->removeDocumentEventListener( _Listener );
+        m_pImpl->removeDocumentEventListener( Listener );
     }
 
-    void DocumentEventNotifier::notifyDocumentEvent( const OUString& _EventName,
-        const Reference< XController2 >& _ViewController, const Any& _Supplement )
+    void DocumentEventNotifier::notifyDocumentEvent( const OUString& EventName,
+        const Reference< XController2 >& ViewController, const Any& Supplement )
     {
-        m_pImpl->notifyDocumentEvent( _EventName, _ViewController, _Supplement );
+        m_pImpl->notifyDocumentEvent( EventName, ViewController, Supplement );
     }
 
-    void DocumentEventNotifier::notifyDocumentEventAsync( const OUString& _EventName,
-        const Reference< XController2 >& _ViewController, const Any& _Supplement )
+    void DocumentEventNotifier::notifyDocumentEventAsync( const OUString& EventName,
+        const Reference< XController2 >& ViewController, const Any& Supplement )
     {
-        m_pImpl->notifyDocumentEventAsync( _EventName, _ViewController, _Supplement );
+        m_pImpl->notifyDocumentEventAsync( EventName, ViewController, Supplement );
     }
 
 } // namespace dbaccess
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
index 85dbfddf62ef..e1b5e009d1e2 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
@@ -42,10 +42,10 @@ namespace dbaccess
         DocumentEventNotifier( ::cppu::OWeakObject& _rBroadcasterDocument, ::osl::Mutex& _rMutex );
         ~DocumentEventNotifier();
 
-        void addLegacyEventListener( const css::uno::Reference< css::document::XEventListener >& _Listener );
-        void removeLegacyEventListener( const css::uno::Reference< css::document::XEventListener >& _Listener );
-        void addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener );
-        void removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener );
+        void addLegacyEventListener( const css::uno::Reference< css::document::XEventListener >& Listener );
+        void removeLegacyEventListener( const css::uno::Reference< css::document::XEventListener >& Listener );
+        void addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener );
+        void removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener );
 
         /** disposes the instance
             @precond
@@ -70,9 +70,9 @@ namespace dbaccess
                 ->onDocumentInitialized has been called
         */
         void    notifyDocumentEvent(
-                    const OUString& _EventName,
+                    const OUString& EventName,
                     const css::uno::Reference< css::frame::XController2 >& _rxViewController = nullptr,
-                    const css::uno::Any& _Supplement = css::uno::Any()
+                    const css::uno::Any& Supplement = css::uno::Any()
                 );
 
         /** notifies a document event, described by the given parameters, asynchronously
@@ -83,9 +83,9 @@ namespace dbaccess
                 the mutex is locked
         */
         void    notifyDocumentEventAsync(
-                    const OUString& _EventName,
-                    const css::uno::Reference< css::frame::XController2 >& _ViewController = nullptr,
-                    const css::uno::Any& _Supplement = css::uno::Any()
+                    const OUString& EventName,
+                    const css::uno::Reference< css::frame::XController2 >& ViewController = nullptr,
+                    const css::uno::Any& Supplement = css::uno::Any()
                 );
 
         /** notifies a document event to all registered listeners
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 19530a70ccfd..998d75426ec6 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -143,17 +143,17 @@ namespace dbaccess
         return false;
     }
 
-    void SAL_CALL DocumentEvents::replaceByName( const OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL DocumentEvents::replaceByName( const OUString& Name, const Any& Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
 
-        DocumentEventsData::iterator elementPos = m_pData->rEventsData.find( _Name );
+        DocumentEventsData::iterator elementPos = m_pData->rEventsData.find( Name );
         if ( elementPos == m_pData->rEventsData.end() )
-            throw NoSuchElementException( _Name, *this );
+            throw NoSuchElementException( Name, *this );
 
         Sequence< PropertyValue > aEventDescriptor;
-        if ( _Element.hasValue() && !( _Element >>= aEventDescriptor ) )
-            throw IllegalArgumentException( _Element.getValueTypeName(), *this, 2 );
+        if ( Element.hasValue() && !( Element >>= aEventDescriptor ) )
+            throw IllegalArgumentException( Element.getValueTypeName(), *this, 2 );
 
         // Weird enough, the event assignment UI has (well: had) the idea of using an empty "EventType"/"Script"
         // to indicate the event descriptor should be reset, instead of just passing an empty event descriptor.
@@ -176,13 +176,13 @@ namespace dbaccess
         elementPos->second = aEventDescriptor;
     }
 
-    Any SAL_CALL DocumentEvents::getByName( const OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL DocumentEvents::getByName( const OUString& Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
 
-        DocumentEventsData::const_iterator elementPos = m_pData->rEventsData.find( _Name );
+        DocumentEventsData::const_iterator elementPos = m_pData->rEventsData.find( Name );
         if ( elementPos == m_pData->rEventsData.end() )
-            throw NoSuchElementException( _Name, *this );
+            throw NoSuchElementException( Name, *this );
 
         Any aReturn;
         const Sequence< PropertyValue >& rEventDesc( elementPos->second );
@@ -198,11 +198,11 @@ namespace dbaccess
         return comphelper::mapKeysToSequence( m_pData->rEventsData );
     }
 
-    sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& _Name ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& Name ) throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
 
-        return m_pData->rEventsData.find( _Name ) != m_pData->rEventsData.end();
+        return m_pData->rEventsData.find( Name ) != m_pData->rEventsData.end();
     }
 
     Type SAL_CALL DocumentEvents::getElementType(  ) throw (RuntimeException, std::exception)
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index c7d27fa1ec98..50a58f3d116e 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -105,19 +105,19 @@ struct DispatchHelper
 };
 
 //XDispatch
-void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyValue >& Arguments ) throw (RuntimeException, std::exception)
+void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments ) throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_pContentHolder )
         return;
 
-    if ( _URL.Complete == m_aInterceptedURL[ DISPATCH_SAVE ] )
+    if ( URL.Complete == m_aInterceptedURL[ DISPATCH_SAVE ] )
     {
         m_pContentHolder->save( false );
         return;
     }
 
-    if ( _URL.Complete == m_aInterceptedURL[ DISPATCH_RELOAD ] )
+    if ( URL.Complete == m_aInterceptedURL[ DISPATCH_RELOAD ] )
     {
         ODocumentDefinition::fillReportData(
             m_pContentHolder->getContext(),
@@ -127,7 +127,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
         return;
     }
 
-    if( _URL.Complete == m_aInterceptedURL[ DISPATCH_SAVEAS ] )
+    if( URL.Complete == m_aInterceptedURL[ DISPATCH_SAVEAS ] )
     {
         if ( m_pContentHolder->isNewReport() )
         {
@@ -155,21 +155,21 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
                 aNewArgs[nInd].Value <<= sal_True;
             }
 
-            Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(_URL, "_self", 0 );
+            Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(URL, "_self", 0 );
             if ( xDispatch.is() )
-                xDispatch->dispatch( _URL, aNewArgs );
+                xDispatch->dispatch( URL, aNewArgs );
         }
         return;
     }
 
-    if  (   _URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEDOC ]
-        ||  _URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEWIN ]
-        ||  _URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEFRAME ]
+    if  (   URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEDOC ]
+        ||  URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEWIN ]
+        ||  URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEFRAME ]
         )
     {
         DispatchHelper* pHelper = new DispatchHelper;
         pHelper->aArguments = Arguments;
-        pHelper->aURL = _URL;
+        pHelper->aURL = URL;
         Application::PostUserEvent( LINK( this, OInterceptor, OnDispatch ), pHelper );
         return;
     }
@@ -199,7 +199,7 @@ IMPL_LINK_TYPED( OInterceptor, OnDispatch, void*, _pDispatcher, void )
 void SAL_CALL OInterceptor::addStatusListener(
     const Reference<
     XStatusListener >& Control,
-    const URL& _URL )
+    const URL& URL )
     throw (
         RuntimeException, std::exception
     )
@@ -207,7 +207,7 @@ void SAL_CALL OInterceptor::addStatusListener(
     if(!Control.is())
         return;
 
-    if ( m_pContentHolder && _URL.Complete == m_aInterceptedURL[DISPATCH_SAVEAS] )
+    if ( m_pContentHolder && URL.Complete == m_aInterceptedURL[DISPATCH_SAVEAS] )
     {   // SaveAs
 
         if ( !m_pContentHolder->isNewReport() )
@@ -227,9 +227,9 @@ void SAL_CALL OInterceptor::addStatusListener(
                 m_pStatCL = new PropertyChangeListenerContainer(m_aMutex);
         }
 
-        m_pStatCL->addInterface(_URL.Complete,Control);
+        m_pStatCL->addInterface(URL.Complete,Control);
     }
-    else if ( m_pContentHolder && _URL.Complete == m_aInterceptedURL[DISPATCH_SAVE] )
+    else if ( m_pContentHolder && URL.Complete == m_aInterceptedURL[DISPATCH_SAVE] )
     {   // Save
         FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[DISPATCH_SAVE];
@@ -244,15 +244,15 @@ void SAL_CALL OInterceptor::addStatusListener(
                 m_pStatCL = new PropertyChangeListenerContainer(m_aMutex);
         }
 
-        m_pStatCL->addInterface(_URL.Complete,Control);
+        m_pStatCL->addInterface(URL.Complete,Control);
     }
     else
     {
         sal_Int32 i = 2;
-        if(_URL.Complete == m_aInterceptedURL[i] ||
-            _URL.Complete == m_aInterceptedURL[++i] ||
-            _URL.Complete == m_aInterceptedURL[++i] ||
-            _URL.Complete == m_aInterceptedURL[i = DISPATCH_RELOAD] )
+        if(URL.Complete == m_aInterceptedURL[i] ||
+            URL.Complete == m_aInterceptedURL[++i] ||
+            URL.Complete == m_aInterceptedURL[++i] ||
+            URL.Complete == m_aInterceptedURL[i = DISPATCH_RELOAD] )
         {   // Close and return
             FeatureStateEvent aStateEvent;
             aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
@@ -268,7 +268,7 @@ void SAL_CALL OInterceptor::addStatusListener(
                     m_pStatCL = new PropertyChangeListenerContainer(m_aMutex);
             }
 
-            m_pStatCL->addInterface(_URL.Complete,Control);
+            m_pStatCL->addInterface(URL.Complete,Control);
             return;
         }
     }
@@ -278,7 +278,7 @@ void SAL_CALL OInterceptor::addStatusListener(
 void SAL_CALL OInterceptor::removeStatusListener(
     const Reference<
     XStatusListener >& Control,
-    const URL& _URL )
+    const URL& URL )
     throw (
         RuntimeException, std::exception
     )
@@ -287,7 +287,7 @@ void SAL_CALL OInterceptor::removeStatusListener(
         return;
     else
     {
-        m_pStatCL->removeInterface(_URL.Complete,Control);
+        m_pStatCL->removeInterface(URL.Complete,Control);
         return;
     }
 }
@@ -303,7 +303,7 @@ Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs(  )   throw ( Run
 
 // XDispatchProvider
 
-Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,const OUString& TargetFrameName,sal_Int32 SearchFlags )
+Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& URL,const OUString& TargetFrameName,sal_Int32 SearchFlags )
     throw (RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
@@ -311,12 +311,12 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con
     const OUString* pEnd   = pIter + m_aInterceptedURL.getLength();
     for(;pIter != pEnd;++pIter)
     {
-        if ( _URL.Complete == *pIter )
+        if ( URL.Complete == *pIter )
             return static_cast<XDispatch*>(this);
     }
 
     if(m_xSlaveDispatchProvider.is())
-        return m_xSlaveDispatchProvider->queryDispatch(_URL,TargetFrameName,SearchFlags);
+        return m_xSlaveDispatchProvider->queryDispatch(URL,TargetFrameName,SearchFlags);
     else
         return Reference<XDispatch>();
 }
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index acca99345e1f..e208ee9c0257 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -225,16 +225,16 @@ private:
     css::uno::Any impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const;
 
     template <typename T> void set(  const OUString& _sProperty
-                                        ,const T& _Value
+                                        ,const T& Value
                                         ,T& _member)
     {
         BoundListeners l;
         {
             ::osl::MutexGuard aGuard(m_aMutex);
-            if ( _member != _Value )
+            if ( _member != Value )
             {
-                prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l);
-                _member = _Value;
+                prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(Value), &l);
+                _member = Value;
             }
         }
         l.notify();
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index b2c648f41922..8884789149ae 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -102,9 +102,9 @@ namespace sdbtools
         return getImplementationName_static();
     }
 
-    sal_Bool SAL_CALL ConnectionTools::supportsService(const OUString & _ServiceName) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL ConnectionTools::supportsService(const OUString & ServiceName) throw (RuntimeException, std::exception)
     {
-        return cppu::supportsService(this, _ServiceName);
+        return cppu::supportsService(this, ServiceName);
     }
 
     Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException, std::exception)
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 725c5a16a619..1200586bceb7 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -372,21 +372,21 @@ namespace sdbtools
     {
     }
 
-    OUString SAL_CALL ObjectNames::suggestName( ::sal_Int32 _CommandType, const OUString& _BaseName ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
+    OUString SAL_CALL ObjectNames::suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
     {
         EntryGuard aGuard( *this );
 
-        PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), _CommandType, getConnection() ) );
+        PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), CommandType, getConnection() ) );
 
-        OUString sBaseName( _BaseName );
+        OUString sBaseName( BaseName );
         if ( sBaseName.isEmpty() )
         {
-            if ( _CommandType == CommandType::TABLE )
+            if ( CommandType == CommandType::TABLE )
                 sBaseName = OUString( SdbtRes( STR_BASENAME_TABLE ) );
             else
                 sBaseName = OUString( SdbtRes( STR_BASENAME_QUERY ) );
         }
-        else if( _CommandType == CommandType::QUERY )
+        else if( CommandType == CommandType::QUERY )
         {
             sBaseName=sBaseName.replace('/', '_');
         }
@@ -408,31 +408,31 @@ namespace sdbtools
         return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() );
     }
 
-    sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const OUString& _Name ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
     {
         EntryGuard aGuard( *this );
 
-        PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), _CommandType, getConnection()) );
-        return !pNameCheck->validateName( _Name );
+        PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), CommandType, getConnection()) );
+        return !pNameCheck->validateName( Name );
     }
 
-    sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const OUString& _Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 CommandType, const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         EntryGuard aGuard( *this );
 
-        PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( getContext(), _CommandType, getConnection()) );
-        return pNameCheck->validateName( _Name );
+        PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( getContext(), CommandType, getConnection()) );
+        return pNameCheck->validateName( Name );
     }
 
-    void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const OUString& _Name ) throw (SQLException, RuntimeException, std::exception)
+    void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) throw (SQLException, RuntimeException, std::exception)
     {
         EntryGuard aGuard( *this );
 
-        PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), _CommandType, getConnection() ) );
-        pNameCheck->validateName_throw( _Name );
+        PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), CommandType, getConnection() ) );
+        pNameCheck->validateName_throw( Name );
 
-        pNameCheck = NameCheckFactory::createValidityCheck( getContext(), _CommandType, getConnection() );
-        pNameCheck->validateName_throw( _Name );
+        pNameCheck = NameCheckFactory::createValidityCheck( getContext(), CommandType, getConnection() );
+        pNameCheck->validateName_throw( Name );
     }
 
 } // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 3f14d7773f50..04c04f267e4c 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -208,25 +208,25 @@ namespace sdbtools
         }
     }
 
-    OUString SAL_CALL TableName::getComposedName( ::sal_Int32 _Type, sal_Bool _Quote ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    OUString SAL_CALL TableName::getComposedName( ::sal_Int32 Type, sal_Bool Quote ) throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         EntryGuard aGuard( *this );
 
         return composeTableName(
             getConnection()->getMetaData(),
-            m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName, _Quote,
-            lcl_translateCompositionType_throw( _Type ) );
+            m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName, Quote,
+            lcl_translateCompositionType_throw( Type ) );
     }
 
-    void SAL_CALL TableName::setComposedName( const OUString& _ComposedName, ::sal_Int32 _Type ) throw (RuntimeException, std::exception)
+    void SAL_CALL TableName::setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (RuntimeException, std::exception)
     {
         EntryGuard aGuard( *this );
 
         qualifiedNameComponents(
             getConnection()->getMetaData(),
-            _ComposedName,
+            ComposedName,
             m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName,
-            lcl_translateCompositionType_throw( _Type ) );
+            lcl_translateCompositionType_throw( Type ) );
     }
 
 } // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index 600a2d25e2fb..b2480c63e65b 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -69,7 +69,7 @@ namespace sdbtools
         virtual OUString SAL_CALL getNameForSelect() throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getTable() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL setTable( const css::uno::Reference< css::beans::XPropertySet >& _table ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, sal_Bool _Quote ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, sal_Bool Quote ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (css::uno::RuntimeException, std::exception) override;
 
     protected: