diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:43:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:43:15 +0000 |
| commit | 5d127115686f36e25bb622f5ac5203075193834b (patch) | |
| tree | 304d6c853235a71b34d704cd7e14b32576e286e4 /framework | |
| parent | INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED (diff) | |
| download | core-5d127115686f36e25bb622f5ac5203075193834b.tar.gz core-5d127115686f36e25bb622f5ac5203075193834b.zip | |
INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED
2005/11/16 15:20:47 pl 1.4.32.2: #i55991# removed warnings
2005/10/28 14:48:47 cd 1.4.32.1: #i55991# Warning free code changes for gcc
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uifactory/popupmenucontrollerfactory.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx index b62b65a340cf..2e50d3dfbe46 100644 --- a/framework/source/uifactory/popupmenucontrollerfactory.cxx +++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx @@ -4,9 +4,9 @@ * * $RCSfile: popupmenucontrollerfactory.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 02:00:37 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:43:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,8 +127,8 @@ class ConfigurationAccess_PopupMenuControllerFactory : // interfaces public ::cppu::OWeakObject { public: - DECLARE_XINTERFACE - DECLARE_XTYPEPROVIDER + FWK_DECLARE_XINTERFACE + FWK_DECLARE_XTYPEPROVIDER ConfigurationAccess_PopupMenuControllerFactory( Reference< XMultiServiceFactory >& rServiceManager ); virtual ~ConfigurationAccess_PopupMenuControllerFactory(); @@ -189,10 +189,10 @@ DEFINE_XTYPEPROVIDER_3 ( ConfigurationAccess_PopupMenuControllerFactory , ConfigurationAccess_PopupMenuControllerFactory::ConfigurationAccess_PopupMenuControllerFactory( Reference< XMultiServiceFactory >& rServiceManager ) : ThreadHelpBase(), - m_xServiceManager( rServiceManager ), m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )), m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )), m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )), + m_xServiceManager( rServiceManager ), m_bConfigAccessInitialized( sal_False ) { m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( @@ -313,7 +313,7 @@ void SAL_CALL ConfigurationAccess_PopupMenuControllerFactory::elementReplaced( c } // lang.XEventListener -void SAL_CALL ConfigurationAccess_PopupMenuControllerFactory::disposing( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_PopupMenuControllerFactory::disposing( const EventObject& ) throw(RuntimeException) { // SAFE // remove our reference to the config access @@ -434,8 +434,8 @@ DEFINE_INIT_SERVICE ( PopupMenuControllerFactory, {} ) PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) : ThreadHelpBase(), - m_xServiceManager( xServiceManager ), - m_bConfigRead( sal_False ) + m_bConfigRead( sal_False ), + m_xServiceManager( xServiceManager ) { m_pConfigAccess = new ConfigurationAccess_PopupMenuControllerFactory( m_xServiceManager ); m_pConfigAccess->acquire(); @@ -452,7 +452,7 @@ PopupMenuControllerFactory::~PopupMenuControllerFactory() // XMultiComponentFactory Reference< XInterface > SAL_CALL PopupMenuControllerFactory::createInstanceWithContext( const ::rtl::OUString& aServiceSpecifier, - const Reference< XComponentContext >& Context ) + const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { // SAFE @@ -475,7 +475,7 @@ throw (Exception, RuntimeException) Reference< XInterface > SAL_CALL PopupMenuControllerFactory::createInstanceWithArgumentsAndContext( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& Arguments, - const Reference< XComponentContext >& Context ) + const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); |