[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/apply                          |    2 +-
 patches/dev300/svx-ppt-bullet-offset-fix.diff |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5b1deca4627d4ce3c664aea80cec557c5c8b7c83
Author: Radek Doulik <rodo at novell.com>
Date:   Wed May 19 18:01:36 2010 +0200

    updated svx-ppt-bullet-offset-fix.diff for m77
    
    * patches/dev300/apply:
    * patches/dev300/svx-ppt-bullet-offset-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 243c9da..66ca715 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3794,7 +3794,7 @@ patchability-scp2.diff, fridrich
 patchability-reportbuilder.diff, fridrich
 
 [ Fixes ]
-# FIXME dev300-m77 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
+svx-ppt-bullet-offset-fix.diff, n#593609, rodo
 
 [ EMFPlus ]
 emf+-canvas-vcl-clear.diff, rodo
diff --git a/patches/dev300/svx-ppt-bullet-offset-fix.diff b/patches/dev300/svx-ppt-bullet-offset-fix.diff
index 6614c6a..195e65f 100644
--- a/patches/dev300/svx-ppt-bullet-offset-fix.diff
+++ b/patches/dev300/svx-ppt-bullet-offset-fix.diff
@@ -1,6 +1,6 @@
 diff -rup svx-orig/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
---- svx-orig/source/msfilter/msdffimp.cxx	2010-05-11 17:01:43.000000000 +0200
-+++ svx/source/msfilter/msdffimp.cxx	2010-05-11 17:15:52.000000000 +0200
+--- filter/source/msfilter/msdffimp.cxx	2010-05-11 17:01:43.000000000 +0200
++++ filter/source/msfilter/msdffimp.cxx	2010-05-11 17:15:52.000000000 +0200
 @@ -4214,18 +4214,25 @@ FASTBOOL SvxMSDffManager::ReadObjText(Sv
                              UINT16 nLen = (UINT16)aHd.nRecLen;
                              if(nLen)
@@ -40,8 +40,8 @@ diff -rup svx-orig/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
                                      rSt >> nVal1;
                                      nLen -= 2;
 diff -rup svx-orig/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
---- svx-orig/source/svdraw/svdfppt.cxx	2010-05-11 17:01:44.000000000 +0200
-+++ svx/source/svdraw/svdfppt.cxx	2010-05-11 17:45:57.000000000 +0200
+--- filter/source/msfilter/svdfppt.cxx	2010-05-11 17:01:44.000000000 +0200
++++ filter/source/msfilter/svdfppt.cxx	2010-05-11 17:45:57.000000000 +0200
 @@ -4784,6 +4784,10 @@ PPTTextRulerInterpreter::PPTTextRulerInt
              sal_Int16	nTCount;
              sal_Int32	i;