mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid reserved identifiers

Browse Source 
Change-Id: I56a0bbecf64b6f9a268a8c4b93aeab0acf54931f
This commit is contained in:
Stephan Bergmann
2016-04-17 11:12:50 +02:00
parent a57049915d
commit eda2f38dd5
10 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbaccess/source/ui/app/AppController.cxx
View File

@@ -199,14 +199,14 @@ public:
SelectionNotifier(const SelectionNotifier&) = delete; SelectionNotifier(const SelectionNotifier&) = delete;
const SelectionNotifier& operator=(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() void disposing()
@@ -2745,14 +2745,14 @@ OUString OApplicationController::getCurrentlySelectedName(sal_Int32& _rnCommandT
return sName; 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) sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)

32
dbaccess/source/ui/app/AppControllerGen.cxx
View File

@@ -440,26 +440,26 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
throw NoSuchElementException( *i_rObjectName, *this ); throw NoSuchElementException( *i_rObjectName, *this );
} }
Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_Int32 _ObjectType, Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_Int32 ObjectType,
const OUString& _ObjectName, sal_Bool _ForEditing ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception) 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, 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) const OUString& ObjectName, sal_Bool ForEditing, const Sequence< PropertyValue >& Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
{ {
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() ); ::osl::MutexGuard aGuard( getMutex() );
impl_validateObjectTypeAndName_throw( _ObjectType, _ObjectName ); impl_validateObjectTypeAndName_throw( ObjectType, ObjectName );
Reference< XComponent > xComponent( openElementWithArguments( Reference< XComponent > xComponent( openElementWithArguments(
_ObjectName, ObjectName,
lcl_objectType2ElementType( _ObjectType ), lcl_objectType2ElementType( ObjectType ),
_ForEditing ? E_OPEN_DESIGN : E_OPEN_NORMAL, ForEditing ? E_OPEN_DESIGN : E_OPEN_NORMAL,
_ForEditing ? SID_DB_APP_EDIT : SID_DB_APP_OPEN, ForEditing ? SID_DB_APP_EDIT : SID_DB_APP_OPEN,
::comphelper::NamedValueCollection( _Arguments ) ::comphelper::NamedValueCollection( Arguments )
) ); ) );
return xComponent; return xComponent;
@@ -486,15 +486,15 @@ Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArgu
return xComponent; 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() ) if ( Interceptor.is() )
m_aContextMenuInterceptors.addInterface( _Interceptor ); 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 ) void OApplicationController::previewChanged( sal_Int32 _nMode )

12
dbaccess/source/ui/browser/brwctrlr.cxx
View File

@@ -165,7 +165,7 @@ public:
virtual css::uno::Reference< css::awt::XControl > SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override; 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 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 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 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 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; 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 // 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 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 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::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 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; 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); 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 // not supported
throw IllegalArgumentException( OUString(), *this, 1 ); throw IllegalArgumentException( OUString(), *this, 1 );
@@ -449,7 +449,7 @@ Reference< css::awt::XTabControllerModel > SAL_CALL SbaXDataBrowserController::
return Reference< XTabControllerModel >(m_pOwner->getRowSet(), UNO_QUERY); 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 !"); 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 ); 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() ); ::osl::MutexGuard aGuard( getMutex() );
m_sModuleIdentifier = _Identifier; m_sModuleIdentifier = Identifier;
} }
OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeException, std::exception) OUString SAL_CALL SbaXDataBrowserController::getIdentifier( ) throw (RuntimeException, std::exception)

26
dbaccess/source/ui/browser/unodatbr.cxx
View File

@@ -3714,22 +3714,22 @@ Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer(
return xScripts; 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() ) if ( Interceptor.is() )
m_aContextMenuInterceptors.addInterface( _Interceptor ); 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() ) if ( Interceptor.is() )
m_aContextMenuInterceptors.removeInterface( _Interceptor ); 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; SolarMutexGuard aGuard;
implAddDatasource( _Event.Name, SharedConnection() ); implAddDatasource( Event.Name, SharedConnection() );
} }
void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSourceName ) void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSourceName )
@@ -3781,24 +3781,24 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo
m_pTreeModel->Remove( pDataSourceEntry ); 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; SolarMutexGuard aGuard;
impl_cleanupDataSourceEntry( _Event.Name ); impl_cleanupDataSourceEntry( Event.Name );
// maybe the object which is part of the document data source has been removed // maybe the object which is part of the document data source has been removed
checkDocumentDataSource(); 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; SolarMutexGuard aGuard;
// in case the data source was expanded, and connected, we need to clean it up // 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 // for simplicity, just do as if the data source were completely removed and re-added
impl_cleanupDataSourceEntry( _Event.Name ); impl_cleanupDataSourceEntry( Event.Name );
implAddDatasource( _Event.Name, SharedConnection() ); implAddDatasource( Event.Name, SharedConnection() );
} }
} // namespace dbaui } // namespace dbaui

4
dbaccess/source/ui/dlg/dbwizsetup.cxx
View File

@@ -422,9 +422,9 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver()
return m_pImpl->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 ((LocDatabaseType == ::dbaccess::DST_MYSQL_JDBC) || (LocDatabaseType == ::dbaccess::DST_MYSQL_ODBC) || (LocDatabaseType == ::dbaccess::DST_MYSQL_NATIVE))
{ {
if (m_pMySQLIntroPage != nullptr) if (m_pMySQLIntroPage != nullptr)

4
dbaccess/source/ui/dlg/dlgsave.cxx
View File

@@ -144,12 +144,12 @@ namespace
typedef Reference< XResultSet > (SAL_CALL XDatabaseMetaData::*FGetMetaStrings)(); typedef Reference< XResultSet > (SAL_CALL XDatabaseMetaData::*FGetMetaStrings)();
void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxConnection, void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxConnection,
FGetMetaStrings _GetAll, const OUString& _rCurrent ) FGetMetaStrings GetAll, const OUString& _rCurrent )
{ {
try { try {
Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_QUERY_THROW ); 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 ); Reference< XRow > xRow( xRes, UNO_QUERY_THROW );
OUString sValue; OUString sValue;
while ( xRes->next() ) { while ( xRes->next() ) {

4
dbaccess/source/ui/dlg/sqlmessage.cxx
View File

@@ -402,10 +402,10 @@ struct SQLMessageBox_Impl
namespace 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 ); 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 ); _rChild.SetPosSizePixel( aPos, aSize );
} }

2
dbaccess/source/ui/inc/dbwizsetup.hxx
View File

@@ -162,7 +162,7 @@ private:
OUString createUniqueFileName(const INetURLObject& rURL); OUString createUniqueFileName(const INetURLObject& rURL);
void CreateDatabase(); void CreateDatabase();
void createUniqueFolderName(INetURLObject* pURL); 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(); void updateTypeDependentStates();
bool callSaveAsDialog(); bool callSaveAsDialog();

4
dbaccess/source/ui/misc/WNameMatch.cxx
View File

@@ -334,9 +334,9 @@ class OColumnString : public SvLBoxString
{ {
bool m_bReadOnly; bool m_bReadOnly;
public: public:
OColumnString( const OUString& rStr, bool _RO ) OColumnString( const OUString& rStr, bool RO )
:SvLBoxString(rStr) :SvLBoxString(rStr)
,m_bReadOnly(_RO) ,m_bReadOnly(RO)
{ {
} }

4
dbaccess/source/ui/misc/dsmeta.cxx
View File

@@ -41,8 +41,8 @@ namespace dbaui
{ {
} }
explicit FeatureSupport(AuthenticationMode _Auth) explicit FeatureSupport(AuthenticationMode Auth)
:eAuthentication( _Auth ) :eAuthentication( Auth )
{ {
} }
}; };