diff options
| author | Radek Doulik <rodo@rychlik.lounovice> | 2009-09-23 11:41:08 +0200 |
|---|---|---|
| committer | Radek Doulik <rodo@rychlik.lounovice> | 2009-09-23 11:43:52 +0200 |
| commit | 7dfa3d4569e9bee36bfac4c4fc7c573bdc3a52d0 (patch) | |
| tree | bf96049ca6189f118dc25eed3f8a1a2a71db2a69 | |
| parent | bb133509dc8a234268a678ad20762a5940d0b160 (diff) | |
fix bullet size import in ppt, fixes n#515972
* patches/dev300/apply:
* patches/dev300/svx-ppt-import-fix-bullet-size.diff:
| -rw-r--r-- | patches/dev300/apply | 3 | ||||
| -rw-r--r-- | patches/dev300/svx-ppt-import-fix-bullet-size.diff | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 5e920170b..a56fd2439 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -3441,4 +3441,5 @@ debian-mysqlc-build-against-stlport-hack.diff emf+-driver-string.diff, n#519715, rodo [ Fixes ] -sd-print-fix-pageoffset.diff +sd-print-fix-pageoffset.diff, n#537931, rodo +svx-ppt-import-fix-bullet-size.diff, n#515972, rodo diff --git a/patches/dev300/svx-ppt-import-fix-bullet-size.diff b/patches/dev300/svx-ppt-import-fix-bullet-size.diff new file mode 100644 index 000000000..e87148c78 --- /dev/null +++ b/patches/dev300/svx-ppt-import-fix-bullet-size.diff @@ -0,0 +1,12 @@ +diff -rup svx-orig/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx +--- svx-orig/source/svdraw/svdfppt.cxx 2009-09-23 11:36:41.000000000 +0200 ++++ svx/source/svdraw/svdfppt.cxx 2009-09-23 11:36:51.000000000 +0200 +@@ -5021,7 +5021,7 @@ void PPTStyleTextPropReader::ReadParaPro + { + rIn >> aSet.mpArry[ PPT_ParaAttr_BulletHeight ]; + if ( ! ( ( nMask & ( 1 << PPT_ParaAttr_BuHardHeight ) ) +- && ( nBulFlg && ( 1 << PPT_ParaAttr_BuHardHeight ) ) ) ) ++ && ( nBulFlg & ( 1 << PPT_ParaAttr_BuHardHeight ) ) ) ) + aSet.mnAttrSet ^= 0x40; + } + if ( nMask & 0x0020 ) // buColor |