merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0070-writerperfect-nocondensedparagraphs.diff
blob3e94cd068de758af968cb038678a0f500f982fd3
1 --- writerperfect/source/filter/TextRunStyle.cxx 2006/12/01 12:07:57 1.14
2 +++ writerperfect/source/filter/TextRunStyle.cxx 2007/03/08 23:09:09 1.15
3 @@ -75,7 +75,12 @@
4 if (strcmp(k.key(), "fo:margin-top") == 0)
5 propList.insert("fo:margin-top", k()->getStr());
6 if (strcmp(k.key(), "fo:margin-bottom") == 0)
7 - propList.insert("fo:margin-bottom", k()->getStr());
8 + {
9 + if (k()->getFloat() > 0.0f)
10 + propList.insert("fo:margin-bottom", k()->getStr());
11 + else
12 + propList.insert("fo:margin-bottom", 0.0f);
13 + }
14 if (strcmp(k.key(), "fo:line-height") == 0)
15 propList.insert("fo:line-height", k()->getStr());
16 if (strcmp(k.key(), "fo:break-before") == 0)