diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:22:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:22:39 +0000 |
| commit | f1f2a27d3c1839522a9f8188557034cb4c6d3f13 (patch) | |
| tree | 8c5b8cb9ae9a50ed496afb38d852fab983ea0f63 /comphelper/source | |
| parent | 9ef4228d9dc8c585d403113c35d938d19a7cd8f0 (diff) | |
INTEGRATION: CWS oj14 (1.10.30); FILE MERGED
2007/02/16 09:59:48 oj 1.10.30.1: value sequence wasn_t resized and last entry was not set to NULL
Diffstat (limited to 'comphelper/source')
| -rw-r--r-- | comphelper/source/property/propertysethelper.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 6898148d13b5..fa336f0c8080 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: propertysethelper.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-09-17 17:19:04 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:22:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -206,6 +206,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< : if( nCount ) { PropertyMapEntry** pEntries = new PropertyMapEntry*[nCount+1]; + pEntries[nCount] = NULL; const OUString* pNames = aPropertyNames.getConstArray(); sal_Bool bUnknown = sal_False; @@ -217,7 +218,10 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< : } if( !bUnknown ) + { + aValues.realloc(nCount); _getPropertyValues( (const PropertyMapEntry**)pEntries, aValues.getArray() ); + } delete[] pEntries; |