Re: slaroche - r31392 - abiword/trunk/src/text/ptbl/xp

On Sat, Jun 16, 2012 at 5:57 PM, <cvs@abisource.com> wrote:
>
> Author: slaroche
> Date: 2012-06-16 14:27:44 +0200 (Sat, 16 Jun 2012)
> New Revision: 31392
>
> Modified:
>   abiword/trunk/src/text/ptbl/xp/pt_PT_ChangeStrux.cpp
>   abiword/trunk/src/text/ptbl/xp/pt_PieceTable.cpp
>   abiword/trunk/src/text/ptbl/xp/pt_PieceTable.h
> Log:
> Fix bug 12496: when applying style to a block, do not remove char styles. Also do not touch embedded structures and only remove span properties that were unnecessary with the old style.
>
> Modified: abiword/trunk/src/text/ptbl/xp/pt_PT_ChangeStrux.cpp
> ===================================================================
> --- abiword/trunk/src/text/ptbl/xp/pt_PT_ChangeStrux.cpp        2012-06-16 12:27:29 UTC (rev 31391)
> +++ abiword/trunk/src/text/ptbl/xp/pt_PT_ChangeStrux.cpp        2012-06-16 12:27:44 UTC (rev 31392)
> @@ -1,3 +1,4 @@
> +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */
>  /* AbiWord
>  * Copyright (C) 1998 AbiSource, Inc.
>  *
> @@ -20,6 +21,8 @@
>

> -// Finally make the const gchar * array of properties
> -//
> -               const gchar ** sProps = NULL;
> -               UT_uint32 countp = vProps.getItemCount() + 1;
> -               sProps = (const gchar **) UT_calloc(countp, sizeof(gchar *));
> -               countp--;
> -               UT_uint32 i;
> -               for(i=0; i<countp; i++)
> +               const gchar * attrNoStyle[2*countAttr+1];

I'm getting an error at the above line in the Windows build :

1>..\..\src\text\ptbl\xp\pt_PT_ChangeStrux.cpp(576) : error C2057:
expected constant expression
1>..\..\src\text\ptbl\xp\pt_PT_ChangeStrux.cpp(576) : error C2466:
cannot allocate an array of constant size 0
1>..\..\src\text\ptbl\xp\pt_PT_ChangeStrux.cpp(576) : error C2133:
'attrNoStyle' : unknown size

Prashant
Received on Mon Jun 25 04:00:17 2012