summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-09-20 13:25:51 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-09-20 13:25:51 +0000
commitf953850b122fb4c5b96b3ef7074d4ce16c5c1298 (patch)
treed77373628cb5e4c6b518db17cf1a3a20e2169091 /cppuhelper
parent49380d29c5cc3cbf137b1b951bcd363443c96b39 (diff)
INTEGRATION: CWS os2port01 (1.14.16); FILE MERGED
2007/07/13 14:14:51 obr 1.14.16.2: RESYNC: (1.14-1.17); FILE MERGED 2006/12/28 14:53:53 ydario 1.14.16.1: OS/2 initial import.
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/propshlp.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 295d957d7..ee142b212 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: propshlp.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: kz $ $Date: 2007-05-15 12:18:23 $
+ * last change: $Author: vg $ $Date: 2007-09-20 14:25:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -983,9 +983,11 @@ void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () )
{
if( pProperties[i-1].Name >= pProperties[i].Name )
{
+#ifndef OS2 // YD disabled, too many troubles with debug builds!
if (bSorted) {
OSL_ENSURE( false, "Property array is not sorted" );
}
+#endif
// not sorted
qsort( aInfos.getArray(), nElements, sizeof( Property ),
compare_Property_Impl );