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

[Petr Mladek]

 patches/dev300/apply              |    7 ++++---
 patches/dev300/cws-vmiklos01.diff |    4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6735be4796b97ba7ee3063b2bafd6910e9cf7e46
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Wed Aug 4 14:55:37 2010 +0200

    Fix cws-vmiklos01.diff to apply
    
    * patches/dev300/cws-vmiklos01.diff: fix conflicts with the newly
      enabled cws-vbasupportdev300.diff
    * patches/dev300/apply: move cws-vmiklos01.diff to be applied after
      the oox diffs

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6e761ba..d98b894 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -188,9 +188,6 @@ cws-koheichart02-xmloff.diff, kohei
 cws-koheicopyborder-sc.diff,  kohei
 cws-koheicopyborder-svx.diff, kohei
 
-# vmiklos01 cws (gsoc, rewrite rtf filter)
-cws-vmiklos01.diff, vmiklos
-
 [ LinuxOnly ]
 # add accelerator to the OK and Cancel buttons.
 ok-cancel-btn-add-accel.diff, kohei
@@ -3588,6 +3585,10 @@ border-types-dotted-dashed.diff, fate#307731, fate 307730
 #FIXME: Incomplete, not to be included in 3.2.1
 #border-types-more.diff, fate#309127
 
+[ CWSBackports ]
+# vmiklos01 cws (gsoc, rewrite rtf filter)
+cws-vmiklos01.diff, vmiklos
+
 [ FSFhuWin32Only ]
 SectionOwner => timar
 
diff --git a/patches/dev300/cws-vmiklos01.diff b/patches/dev300/cws-vmiklos01.diff
index 91c13d4..453c1b6 100644
--- a/patches/dev300/cws-vmiklos01.diff
+++ b/patches/dev300/cws-vmiklos01.diff
@@ -627,9 +627,9 @@
 --- sw/source/filter/ww8/makefile.mk
 +++ sw/source/filter/ww8/makefile.mk
 @@ -69,7 +69,12 @@ EXCEPTIONSFILES = \
-         $(SLO)$/WW8TableInfo.obj \
          $(SLO)$/WW8FFData.obj \
          $(SLO)$/WW8Sttbf.obj \
+         $(SLO)$/ww8toolbar.obj \
 -        $(SLO)$/WW8FibData.obj
 +        $(SLO)$/WW8FibData.obj \
 +	$(SLO)$/rtfexportfilter.obj \
@@ -641,9 +641,9 @@
  
  SLOFILES =	\
 @@ -101,7 +106,12 @@ SLOFILES =	\
-         $(SLO)$/WW8TableInfo.obj \
          $(SLO)$/WW8FFData.obj \
          $(SLO)$/WW8Sttbf.obj \
+         $(SLO)$/ww8toolbar.obj \
 -        $(SLO)$/WW8FibData.obj
 +        $(SLO)$/WW8FibData.obj \
 +	$(SLO)$/rtfexportfilter.obj \