[Libreoffice-commits] core.git: sc/source

Eike Rathke erack at redhat.com
Wed Oct 30 14:38:06 CET 2013


 sc/source/core/data/global.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d326986605def918ec846458441d4a49550a141
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Oct 30 14:34:08 2013 +0100

    real assert() to bail out on invalid index
    
    ... instead of displaying a message and then silently poking memory that
    we don't own. Now that globstr.hrc is renumbered it makes sense to
    prevent future inconsistencies.
    
    Change-Id: I7458fbca4928b33fc7471820aeea7882a0f71e50

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index f6a376b..09b2c50 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -346,7 +346,7 @@ void ScGlobal::SetUserList( const ScUserList* pNewList )
 
 const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex )
 {
-    OSL_ENSURE( nIndex < SC_GLOBSTR_STR_COUNT, "ScGlobal::GetRscString - invalid string index");
+    assert( nIndex < SC_GLOBSTR_STR_COUNT);
     if( !ppRscString[ nIndex ] )
     {
         OpCode eOp = ocNone;


More information about the Libreoffice-commits mailing list