[Libreoffice-commits] core.git: dbaccess/source
Stephan Bergmann
sbergman at redhat.com
Fri Apr 22 08:15:52 UTC 2016
dbaccess/source/ui/app/AppController.cxx | 16 +++++++-------
dbaccess/source/ui/app/AppControllerGen.cxx | 32 ++++++++++++++--------------
dbaccess/source/ui/browser/brwctrlr.cxx | 12 +++++-----
dbaccess/source/ui/browser/unodatbr.cxx | 26 +++++++++++-----------
dbaccess/source/ui/dlg/dbwizsetup.cxx | 4 +--
dbaccess/source/ui/dlg/dlgsave.cxx | 4 +--
dbaccess/source/ui/dlg/sqlmessage.cxx | 4 +--
dbaccess/source/ui/inc/dbwizsetup.hxx | 2 -
dbaccess/source/ui/misc/WNameMatch.cxx | 4 +--
dbaccess/source/ui/misc/dsmeta.cxx | 4 +--
10 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit eda2f38dd5373d1ef869a5b7ddd649a2e6d7339e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Apr 17 11:12:50 2016 +0200
Avoid reserved identifiers
Change-Id: I56a0bbecf64b6f9a268a8c4b93aeab0acf54931f
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 0edefc6..071cbab 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -199,14 +199,14 @@ public:
SelectionNotifier(const SelectionNotifier&) = delete;
const SelectionNotifier& operator=(const SelectionNotifier&) = delete;
- void addListener( const Reference< XSelectionChangeListener >& _Listener )
+ void addListener( const Reference< XSelectionChangeListener >& Listener )
{
- m_aSelectionListeners.addInterface( _Listener );
+ m_aSelectionListeners.addInterface( Listener );
}
- void removeListener( const Reference< XSelectionChangeListener >& _Listener )
+ void removeListener( const Reference< XSelectionChangeListener >& Listener )
{
- m_aSelectionListeners.removeInterface( _Listener );
+ m_aSelectionListeners.removeInterface( Listener );
}
void disposing()
@@ -2745,14 +2745,14 @@ OUString OApplicationController::getCurrentlySelectedName(sal_Int32& _rnCommandT
return sName;
}
-void SAL_CALL OApplicationController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_pSelectionNotifier->addListener( _Listener );
+ m_pSelectionNotifier->addListener( Listener );
}
-void SAL_CALL OApplicationController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_pSelectionNotifier->removeListener( _Listener );
+ m_pSelectionNotifier->removeListener( Listener );
}
sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 79e307f..48db0be 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -440,26 +440,26 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
throw NoSuchElementException( *i_rObjectName, *this );
}
-Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_Int32 _ObjectType,
- const OUString& _ObjectName, sal_Bool _ForEditing ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
+Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_Int32 ObjectType,
+ const OUString& ObjectName, sal_Bool ForEditing ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
{
- return loadComponentWithArguments( _ObjectType, _ObjectName, _ForEditing, Sequence< PropertyValue >() );
+ return loadComponentWithArguments( ObjectType, ObjectName, ForEditing, Sequence< PropertyValue >() );
}
-Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArguments( ::sal_Int32 _ObjectType,
- const OUString& _ObjectName, sal_Bool _ForEditing, const Sequence< PropertyValue >& _Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
+Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArguments( ::sal_Int32 ObjectType,
+ const OUString& ObjectName, sal_Bool ForEditing, const Sequence< PropertyValue >& Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
- impl_validateObjectTypeAndName_throw( _ObjectType, _ObjectName );
+ impl_validateObjectTypeAndName_throw( ObjectType, ObjectName );
Reference< XComponent > xComponent( openElementWithArguments(
- _ObjectName,
- lcl_objectType2ElementType( _ObjectType ),
- _ForEditing ? E_OPEN_DESIGN : E_OPEN_NORMAL,
- _ForEditing ? SID_DB_APP_EDIT : SID_DB_APP_OPEN,
- ::comphelper::NamedValueCollection( _Arguments )
+ ObjectName,
+ lcl_objectType2ElementType( ObjectType ),
+ ForEditing ? E_OPEN_DESIGN : E_OPEN_NORMAL,
+ ForEditing ? SID_DB_APP_EDIT : SID_DB_APP_OPEN,
+ ::comphelper::NamedValueCollection( Arguments )
) );
return xComponent;
@@ -486,15 +486,15 @@ Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArgu
return xComponent;
}
-void SAL_CALL OApplicationController::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
{
- if ( _Interceptor.is() )
- m_aContextMenuInterceptors.addInterface( _Interceptor );
+ if ( Interceptor.is() )
+ m_aContextMenuInterceptors.addInterface( Interceptor );
}
-void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
{
- m_aContextMenuInterceptors.removeInterface( _Interceptor );
+ m_aContextMenuInterceptors.removeInterface( Interceptor );
}
void OApplicationController::previewChanged( sal_Int32 _nMode )
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index b1367fcf..f7aa3fe 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -165,7 +165,7 @@ public:
virtual css::uno::Reference< css::awt::XControl > SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& _ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+ virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
@@ -224,7 +224,7 @@ public:
// XTabController, base of XFormController
virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel > & Model) throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Reference< css::awt::XTabControllerModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer > & _Container) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer > & Container) throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Reference< css::awt::XControlContainer > SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) override;
@@ -275,7 +275,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeActivateListe
m_aActivateListeners.removeInterface(l);
}
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController( const Reference< runtime::XFormController >& /*_ChildController*/ ) throw( RuntimeException, IllegalArgumentException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController( const Reference< runtime::XFormController >& ) throw( RuntimeException, IllegalArgumentException, std::exception )
{
// not supported
throw IllegalArgumentException( OUString(), *this, 1 );
@@ -449,7 +449,7 @@ Reference< css::awt::XTabControllerModel > SAL_CALL SbaXDataBrowserController::
return Reference< XTabControllerModel >(m_pOwner->getRowSet(), UNO_QUERY);
}
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< css::awt::XControlContainer > & /*_Container*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< css::awt::XControlContainer > &) throw( RuntimeException, std::exception )
{
SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !");
}
@@ -1054,10 +1054,10 @@ void SbaXDataBrowserController::disposing(const EventObject& Source) throw( Runt
SbaXDataBrowserController_Base::OGenericUnoController::disposing( Source );
}
-void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identifier ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& Identifier ) throw (RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( getMutex() );
- m_sModuleIdentifier = _Identifier;
+ m_sModuleIdentifier = Identifier;
}
OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeException, std::exception)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 361ffec..7005c72 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3714,22 +3714,22 @@ Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer(
return xScripts;
}
-void SAL_CALL SbaTableQueryBrowser::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
{
- if ( _Interceptor.is() )
- m_aContextMenuInterceptors.addInterface( _Interceptor );
+ if ( Interceptor.is() )
+ m_aContextMenuInterceptors.addInterface( Interceptor );
}
-void SAL_CALL SbaTableQueryBrowser::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
{
- if ( _Interceptor.is() )
- m_aContextMenuInterceptors.removeInterface( _Interceptor );
+ if ( Interceptor.is() )
+ m_aContextMenuInterceptors.removeInterface( Interceptor );
}
-void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRegistrationEvent& Event ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- implAddDatasource( _Event.Name, SharedConnection() );
+ implAddDatasource( Event.Name, SharedConnection() );
}
void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSourceName )
@@ -3781,24 +3781,24 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo
m_pTreeModel->Remove( pDataSourceEntry );
}
-void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegistrationEvent& Event ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- impl_cleanupDataSourceEntry( _Event.Name );
+ impl_cleanupDataSourceEntry( Event.Name );
// maybe the object which is part of the document data source has been removed
checkDocumentDataSource();
}
-void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegistrationEvent& Event ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
// in case the data source was expanded, and connected, we need to clean it up
// for simplicity, just do as if the data source were completely removed and re-added
- impl_cleanupDataSourceEntry( _Event.Name );
- implAddDatasource( _Event.Name, SharedConnection() );
+ impl_cleanupDataSourceEntry( Event.Name );
+ implAddDatasource( Event.Name, SharedConnection() );
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index aa7e3fd..5c31f87 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -422,9 +422,9 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver()
return m_pImpl->getDriver();
}
-::dbaccess::DATASOURCE_TYPE ODbTypeWizDialogSetup::VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const
+::dbaccess::DATASOURCE_TYPE ODbTypeWizDialogSetup::VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE DatabaseType) const
{
- ::dbaccess::DATASOURCE_TYPE LocDatabaseType = _DatabaseType;
+ ::dbaccess::DATASOURCE_TYPE LocDatabaseType = DatabaseType;
if ((LocDatabaseType == ::dbaccess::DST_MYSQL_JDBC) || (LocDatabaseType == ::dbaccess::DST_MYSQL_ODBC) || (LocDatabaseType == ::dbaccess::DST_MYSQL_NATIVE))
{
if (m_pMySQLIntroPage != nullptr)
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index f4fdd70..7c89d71 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -144,12 +144,12 @@ namespace
typedef Reference< XResultSet > (SAL_CALL XDatabaseMetaData::*FGetMetaStrings)();
void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxConnection,
- FGetMetaStrings _GetAll, const OUString& _rCurrent )
+ FGetMetaStrings GetAll, const OUString& _rCurrent )
{
try {
Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_QUERY_THROW );
- Reference< XResultSet > xRes = (xMetaData.get()->*_GetAll)();
+ Reference< XResultSet > xRes = (xMetaData.get()->*GetAll)();
Reference< XRow > xRow( xRes, UNO_QUERY_THROW );
OUString sValue;
while ( xRes->next() ) {
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index ac8bce1..bda1783 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -402,10 +402,10 @@ struct SQLMessageBox_Impl
namespace
{
- void lcl_positionInAppFont( const vcl::Window& _rParent, vcl::Window& _rChild, long _nX, long _nY, long _Width, long _Height )
+ void lcl_positionInAppFont( const vcl::Window& _rParent, vcl::Window& _rChild, long _nX, long _nY, long Width, long Height )
{
Point aPos = _rParent.LogicToPixel( Point( _nX, _nY ), MAP_APPFONT );
- Size aSize = _rParent.LogicToPixel( Size( _Width, _Height ), MAP_APPFONT );
+ Size aSize = _rParent.LogicToPixel( Size( Width, Height ), MAP_APPFONT );
_rChild.SetPosSizePixel( aPos, aSize );
}
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index cf007ad..a3fa964 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -162,7 +162,7 @@ private:
OUString createUniqueFileName(const INetURLObject& rURL);
void CreateDatabase();
void createUniqueFolderName(INetURLObject* pURL);
- ::dbaccess::DATASOURCE_TYPE VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const;
+ ::dbaccess::DATASOURCE_TYPE VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE DatabaseType) const;
void updateTypeDependentStates();
bool callSaveAsDialog();
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 5d8fe30..68c91aa 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -334,9 +334,9 @@ class OColumnString : public SvLBoxString
{
bool m_bReadOnly;
public:
- OColumnString( const OUString& rStr, bool _RO )
+ OColumnString( const OUString& rStr, bool RO )
:SvLBoxString(rStr)
- ,m_bReadOnly(_RO)
+ ,m_bReadOnly(RO)
{
}
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index bf21780..89c0d55 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -41,8 +41,8 @@ namespace dbaui
{
}
- explicit FeatureSupport(AuthenticationMode _Auth)
- :eAuthentication( _Auth )
+ explicit FeatureSupport(AuthenticationMode Auth)
+ :eAuthentication( Auth )
{
}
};
More information about the Libreoffice-commits
mailing list