diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:52:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:52:13 +0000 |
| commit | a82608ff9df245486cbaf44d89f1e6c9940b4120 (patch) | |
| tree | 9e29bac69920e85892d5633767e68acce2ea8c08 /comphelper/source/property/propertycontainerhelper.cxx | |
| parent | 206dd6bfaff4a45ccf1346e72b0916e2de7bcbbd (diff) | |
INTEGRATION: CWS warnings01 (1.4.114); FILE MERGED
2006/01/25 20:11:58 sb 1.4.114.3: RESYNC: (1.6-1.7); FILE MERGED
2005/09/23 03:23:17 sb 1.4.114.2: RESYNC: (1.4-1.6); FILE MERGED
2005/09/08 13:16:55 sb 1.4.114.1: #i53898# Made code warning-free.
Diffstat (limited to 'comphelper/source/property/propertycontainerhelper.cxx')
| -rw-r--r-- | comphelper/source/property/propertycontainerhelper.cxx | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 5292d3baf593..82ea5cd9ed0a 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: propertycontainerhelper.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-01-19 15:46:34 $ + * last change: $Author: hr $ $Date: 2006-06-19 22:52:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -277,7 +277,10 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( if ( uno_type_assignData( const_cast< void* >( aProperlyTyped.getValue() ), aProperlyTyped.getValueType().getTypeLibType(), const_cast< void* >( aNewRequestedValue.getValue() ), aNewRequestedValue.getValueType().getTypeLibType(), - cpp_queryInterface, cpp_acquire, cpp_release + reinterpret_cast< uno_QueryInterfaceFunc >( + cpp_queryInterface), + reinterpret_cast< uno_AcquireFunc >(cpp_acquire), + reinterpret_cast< uno_ReleaseFunc >(cpp_release) ) ) { @@ -317,7 +320,9 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( bModified = !uno_type_equalData( const_cast< void* >( pPropContainer->getValue() ), aPos->aType.getTypeLibType(), const_cast< void* >( aNewRequestedValue.getValue() ), aPos->aType.getTypeLibType(), - cpp_queryInterface, cpp_release + reinterpret_cast< uno_QueryInterfaceFunc >( + cpp_queryInterface), + reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); if (bModified) @@ -347,7 +352,10 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( if ( uno_type_assignData( const_cast<void*>(aProperlyTyped.getValue()), aProperlyTyped.getValueType().getTypeLibType(), const_cast<void*>(_rValue.getValue()), _rValue.getValueType().getTypeLibType(), - cpp_queryInterface, cpp_acquire, cpp_release + reinterpret_cast< uno_QueryInterfaceFunc >( + cpp_queryInterface), + reinterpret_cast< uno_AcquireFunc >(cpp_acquire), + reinterpret_cast< uno_ReleaseFunc >(cpp_release) ) ) { @@ -366,7 +374,9 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( bModified = !uno_type_equalData( aPos->aLocation.pDerivedClassMember, aPos->aType.getTypeLibType(), const_cast<void*>(pNewValue->getValue()), aPos->aType.getTypeLibType(), - cpp_queryInterface, cpp_release + reinterpret_cast< uno_QueryInterfaceFunc >( + cpp_queryInterface), + reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); if (bModified) @@ -414,8 +424,9 @@ void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An uno_type_assignData( aPos->aLocation.pDerivedClassMember, aPos->aType.getTypeLibType(), const_cast< void* >( _rValue.getValue() ), _rValue.getValueType().getTypeLibType(), - cpp_queryInterface, - cpp_acquire, cpp_release ); + reinterpret_cast< uno_QueryInterfaceFunc >(cpp_queryInterface), + reinterpret_cast< uno_AcquireFunc >(cpp_acquire), + reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); OSL_ENSURE( bSuccess, "OPropertyContainerHelper::setFastPropertyValue: ooops .... the value could not be assigned!"); |