[calligra] libs/kotext/styles: A line-height of "normal" disables the line spacing.

[Cyrille Berger Skott]

Hi,

It appears that this commit has broken two unit tests, libs-kotext-styles-
TestStyles and libs-kotext-TestBlockLayout:

http://my.cdash.org/viewTest.php?onlydelta&buildid=211338


On Thursday 21 July 2011, Sebastian Sauer wrote:
> Git commit 401c92029009b7a02203d28d6025f5afe5a1529e by Sebastian Sauer.
> Committed on 21/07/2011 at 21:24.
> Pushed by sebsauer into branch 'master'.
> 
> A line-height of "normal" disables the line spacing.
> See in the specs 19.308 style:line-spacing which says;
> The effect of this attribute is disabled when fo:line-height has the value
> of normal.
> 
> M  +1    -0    libs/kotext/styles/KoParagraphStyle.cpp
> 
> http://commits.kde.org/calligra/401c92029009b7a02203d28d6025f5afe5a1529e
> 
> diff --git a/libs/kotext/styles/KoParagraphStyle.cpp
> b/libs/kotext/styles/KoParagraphStyle.cpp index 53008b7..cc150d4 100644
> --- a/libs/kotext/styles/KoParagraphStyle.cpp
> +++ b/libs/kotext/styles/KoParagraphStyle.cpp
> @@ -1260,6 +1260,7 @@ void
> KoParagraphStyle::loadOdfProperties(KoShapeLoadingContext &scontext)
> setProperty(PercentLineHeight, 0);
>              setProperty(FixedLineHeight, 0.0);
>              setProperty(MinimumLineHeight, 0.0);
> +            setProperty(LineSpacing, 0.0);
>          }
>      }
>      else {


-- 
Cyrille Berger Skott