[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 91552c96b381f4bcdf5b47cc80790ec028a10bc2
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Aug 25 15:25:27 2009 +0200

    fix patch applying
    
    * patches/dev300/apply: move ww8-image-position.diff after OOXMLExport...

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 10769f2..5c513e0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2804,8 +2804,6 @@ sal-xdg-config-dir.diff, i#91247, thorsten
 # to waste for time with this fix but to focus on the refactoring
 sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
 
-ww8-image-position.diff, n#532920, cbosdo
-
 # fix crash when exporting notes with hyperlinks
 sw-export-commentfields.diff, i#101159, cmc
 
@@ -3192,6 +3190,10 @@ oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
 # apply this patch to enable docx export once ooxml03 is integrated
 cws-ooxml03-enable-docx.diff
 
+# here because it patches a file added by cws-ooxml03-docx-sw.diff
+[ Fixes ]
+ww8-image-position.diff, n#532920, cbosdo
+
 
 [ CalcFixes ]