diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:33:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:33:27 +0000 |
| commit | 6fd911719104984bbc973a19cfeadcd91077d88a (patch) | |
| tree | 87b05f54b3090f75af22cfd0763d98cb5a5f579d /cppuhelper/source | |
| parent | 0764015741991302a9a307e5f98971253d7e615f (diff) | |
INTEGRATION: CWS warnings01 (1.22.58); FILE MERGED
2006/05/23 15:30:17 sb 1.22.58.4: RESYNC: (1.23-1.24); FILE MERGED
2005/09/22 15:37:48 sb 1.22.58.3: RESYNC: (1.22-1.23); FILE MERGED
2005/09/07 11:05:29 sb 1.22.58.2: #i53898# Made code warning-free.
2005/08/31 16:24:55 sb 1.22.58.1: #i53898# Made code warning-free.
Diffstat (limited to 'cppuhelper/source')
| -rw-r--r-- | cppuhelper/source/factory.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index bd16b1239109..74e9e4a28a23 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -4,9 +4,9 @@ * * $RCSfile: factory.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: vg $ $Date: 2006-03-31 11:56:18 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:33:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,9 +107,9 @@ public: const Sequence< OUString > * pServiceNames_ ) SAL_THROW( () ) : xSMgr( rServiceManager ) - , aImplementationName( rImplementationName_ ) , pCreateFunction( pCreateFunction_ ) , m_fptr( fptr ) + , aImplementationName( rImplementationName_ ) { if( pServiceNames_ ) aServiceNames = *pServiceNames_; @@ -121,9 +121,9 @@ public: const OUString & rImplementationName_ ) SAL_THROW( () ) : xSMgr( rServiceManager ) - , aImplementationName( rImplementationName_ ) , pCreateFunction( NULL ) , m_fptr( 0 ) + , aImplementationName( rImplementationName_ ) {} virtual ~OSingleFactoryHelper(); @@ -608,6 +608,7 @@ public: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, Any const & rValue ) throw (Exception); + using OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( Any & rValue, sal_Int32 nHandle ) const; @@ -719,8 +720,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper() //______________________________________________________________________________ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue( - Any & rConvertedValue, Any & rOldValue, - sal_Int32 nHandle, Any const & rValue ) + Any &, Any &, sal_Int32, Any const & ) throw (lang::IllegalArgumentException) { OSL_ENSURE( 0, "unexpected!" ); @@ -729,7 +729,7 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue( //______________________________________________________________________________ void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle, Any const & rValue ) + sal_Int32, Any const & ) throw (Exception) { throw beans::PropertyVetoException( |