added assertions for illegal index

2 files changed, 23 insertions, 8 deletions

diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
index f87e78122e74..099960cbb264 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Sequence.h,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:25:51 $
+ *  last change: $Author: dbo $ $Date: 2000-09-25 14:48:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -207,8 +207,7 @@ public:
         @param nIndex index
         @return non-const C++ reference to element
     */
-    inline E & SAL_CALL operator [] ( sal_Int32 nIndex )
-        { return getArray()[ nIndex ]; }
+    inline E & SAL_CALL operator [] ( sal_Int32 nIndex );
     /** Const index operator:
         Obtains a reference to element indexed at given position.<br>
         The implementation does <b>not</b> check for array bounds!<br>
@@ -216,8 +215,7 @@ public:
         @param nIndex index
         @return const C++ reference to element
     */
-    inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const
-        { return getConstArray()[ nIndex ]; }
+    inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const;
 
     /** Equality operator:
         Compares two sequences.
diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx
index 7b9e3065571e..a940a2f8bb16 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.hxx
+++ b/cppu/inc/com/sun/star/uno/Sequence.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Sequence.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:25:51 $
+ *  last change: $Author: dbo $ $Date: 2000-09-25 14:48:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,9 @@
 #include <cppu/macros.hxx>
 #endif
 
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
+#endif
 #ifndef _OSL_INTERLCK_H_
 #include <osl/interlck.h>
 #endif
@@ -162,6 +165,20 @@ inline E * Sequence< E >::getArray()
 }
 //__________________________________________________________________________________________________
 template< class E >
+inline E & Sequence< E >::operator [] ( sal_Int32 nIndex )
+{
+    OSL_ENSURE( nIndex < getLength(), "### illegal index of sequence!" );
+    return getArray()[ nIndex ];
+}
+//__________________________________________________________________________________________________
+template< class E >
+inline const E & Sequence< E >::operator [] ( sal_Int32 nIndex ) const
+{
+    OSL_ENSURE( nIndex < getLength(), "### illegal index of sequence!" );
+    return getConstArray()[ nIndex ];
+}
+//__________________________________________________________________________________________________
+template< class E >
 inline void Sequence< E >::realloc( sal_Int32 nSize )
 {
     const Type & rType = ::getCppuType( this );