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

INTEGRATION: CWS warnings01 (1.22.58); FILE MERGED

Browse Source 
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.
This commit is contained in:
Jens-Heiner Rechtien
2006-06-19 09:33:27 +00:00
parent 0764015741
commit 6fd9117191
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cppuhelper/source/factory.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: factory.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -107,9 +107,9 @@ public:
const Sequence< OUString > * pServiceNames_ ) const Sequence< OUString > * pServiceNames_ )
SAL_THROW( () ) SAL_THROW( () )
: xSMgr( rServiceManager ) : xSMgr( rServiceManager )
, aImplementationName( rImplementationName_ )
, pCreateFunction( pCreateFunction_ ) , pCreateFunction( pCreateFunction_ )
, m_fptr( fptr ) , m_fptr( fptr )
, aImplementationName( rImplementationName_ )
{ {
if( pServiceNames_ ) if( pServiceNames_ )
aServiceNames = *pServiceNames_; aServiceNames = *pServiceNames_;
@@ -121,9 +121,9 @@ public:
const OUString & rImplementationName_ ) const OUString & rImplementationName_ )
SAL_THROW( () ) SAL_THROW( () )
: xSMgr( rServiceManager ) : xSMgr( rServiceManager )
, aImplementationName( rImplementationName_ )
, pCreateFunction( NULL ) , pCreateFunction( NULL )
, m_fptr( 0 ) , m_fptr( 0 )
, aImplementationName( rImplementationName_ )
{} {}
virtual ~OSingleFactoryHelper(); virtual ~OSingleFactoryHelper();
@@ -608,6 +608,7 @@ public:
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, Any const & rValue ) sal_Int32 nHandle, Any const & rValue )
throw (Exception); throw (Exception);
using OPropertySetHelper::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue( virtual void SAL_CALL getFastPropertyValue(
Any & rValue, sal_Int32 nHandle ) const; Any & rValue, sal_Int32 nHandle ) const;
@@ -719,8 +720,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
//______________________________________________________________________________ //______________________________________________________________________________
sal_Bool ORegistryFactoryHelper::convertFastPropertyValue( sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
Any & rConvertedValue, Any & rOldValue, Any &, Any &, sal_Int32, Any const & )
sal_Int32 nHandle, Any const & rValue )
throw (lang::IllegalArgumentException) throw (lang::IllegalArgumentException)
{ {
OSL_ENSURE( 0, "unexpected!" ); OSL_ENSURE( 0, "unexpected!" );
@@ -729,7 +729,7 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
//______________________________________________________________________________ //______________________________________________________________________________
void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast( void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, Any const & rValue ) sal_Int32, Any const & )
throw (Exception) throw (Exception)
{ {
throw beans::PropertyVetoException( throw beans::PropertyVetoException(