[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    1 -
 patches/dev300/svx-ppt-import-fix-bullet-size.diff |   20 --------------------
 2 files changed, 21 deletions(-)

New commits:
commit 7b25c740a9778d5bb6b771d04276dacb9b99c43a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 16:41:29 2011 +0200

    pushed svx-ppt-import-fix-bullet-size.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3f92355..f43c439 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1255,7 +1255,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 
 [ Fixes ]
 # FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
-svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
 
 filter-fix-build-FCFGMerge.cfg.diff, rodo
 store-crash-fix.diff, thorsten
diff --git a/patches/dev300/svx-ppt-import-fix-bullet-size.diff b/patches/dev300/svx-ppt-import-fix-bullet-size.diff
deleted file mode 100644
index 12f87dc..0000000
--- a/patches/dev300/svx-ppt-import-fix-bullet-size.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- filter/source/msfilter/svdfppt.cxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git filter/source/msfilter/svdfppt.cxx filter/source/msfilter/svdfppt.cxx
-index 993ca9a..0224cdc 100644
---- filter/source/msfilter/svdfppt.cxx
-+++ filter/source/msfilter/svdfppt.cxx
-@@ -5110,7 +5110,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
-             {
-                 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
--- 
-1.7.0.1
-