[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/source

Caolán McNamara caolanm at redhat.com
Wed Oct 9 11:33:31 PDT 2013


 filter/source/msfilter/msvbahelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0660bddc9eeb0d57f5b6ad05c4c695a9fdfc535
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 9 16:39:28 2013 +0100

    CID#736174 yikes, sizeof(char[]) includes 0, so 4 not 3
    
    Change-Id: Ia54ecab9e08485ebffe98dc064f328360c17a120
    (cherry picked from commit 8254648828e4f4d65a0516e160e5732f3d85765a)
    Reviewed-on: https://gerrit.libreoffice.org/6173
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index e143ba4..4a5576f 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -618,7 +618,7 @@ bool getModifier( char c, sal_uInt16& mod )
     static const char modifiers[] = "+^%";
     static const sal_uInt16 KEY_MODS[] = {KEY_SHIFT, KEY_MOD1, KEY_MOD2};
 
-    for ( unsigned int i=0; i<SAL_N_ELEMENTS(modifiers); ++i )
+    for ( unsigned int i=0; i<SAL_N_ELEMENTS(KEY_MODS); ++i )
     {
         if ( c == modifiers[i] )
         {


More information about the Libreoffice-commits mailing list