[ooo-build-commit] patches/dev300

[Radek Doulík]

 patches/dev300/apply                               |    3 ++-
 patches/dev300/svx-ppt-import-fix-bullet-size.diff |   12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 9bc2ef58a51efaeacfe8c572d50a6aed92a1316e
Author: Radek Doulik <rodo at rychlik.lounovice>
Date:   Wed Sep 23 11:41:08 2009 +0200

    fix bullet size import in ppt, fixes n#515972
    
    * patches/dev300/apply:
    * patches/dev300/svx-ppt-import-fix-bullet-size.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 47e8c16..de8ecdf 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3414,4 +3414,5 @@ build-fix-win32.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 0000000..e87148c
--- /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