[ooo-build-commit] 3 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                              |   11 +++++++++--
 patches/dev300/edit-links-decode-unicode-uri.diff |    6 ++----
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 4db05ad8136d1546edb440f2d58d12b5d4d07afa
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 13:59:58 2009 +0300

    Bypass oox-pptx-import-fix-text-body-properties-priority.diff
    
    * patches/dev300/apply: Bypass
      oox-pptx-import-fix-text-body-properties-priority.diff for now. Does
      not apply, not immediately obvious how to adapt.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 57adb14..32f9060 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3236,7 +3236,10 @@ fontconfig-cache-pre-substitution.diff, n#529532, kohei
 
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
-oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
+
+# FIXME: 2009-08-21: Does not apply, not immediately obvious how to
+# adapt. --tml
+# oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
 
 [ OOXMLExport ]
 oox-pptx-export-hyperlinks.diff, n#499124, rodo
commit c16c840edb89e3fbbc3492507dfad84637d49b91
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 13:57:07 2009 +0300

    Adapt edit-links-decode-unicode-uri.diff for dev300-m54
    
    * patches/dev300/edit-links-decode-unicode-uri.diff: Adapt for
      dev300-m54. The file being patches has moved to another directory.

diff --git a/patches/dev300/edit-links-decode-unicode-uri.diff b/patches/dev300/edit-links-decode-unicode-uri.diff
index 5af6e56..e34f6ab 100644
--- a/patches/dev300/edit-links-decode-unicode-uri.diff
+++ b/patches/dev300/edit-links-decode-unicode-uri.diff
@@ -1,7 +1,5 @@
-diff --git svx/source/dialog/linkdlg.cxx svx/source/dialog/linkdlg.cxx
-index cb4fe62..fe67a8d 100644
---- svx/source/dialog/linkdlg.cxx
-+++ svx/source/dialog/linkdlg.cxx
+--- svx/source/cui/linkdlg.cxx
++++ svx/source/cui/linkdlg.cxx
 @@ -224,7 +224,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
  
          String aFileName;
commit 0c133d24abab6411e746d362f0df8594f26789a5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 13:56:03 2009 +0300

    Bypass ppt-customshape-shading-fix.diff for now
    
    * patches/dev300/apply: Bypass ppt-customshape-shading-fix for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d21a55c..57adb14 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3215,7 +3215,11 @@ svx-fix-fit-to-frame-crash.diff, n#508621, rodo
 basegfx-color-tools.diff, thorsten
 
 # much improved surface shades, gradient color for customshapes
-ppt-customshape-shading-fix.diff, n#485637, thorsten
+
+# FIXME: 2009-08-21: Does not apply, not immediately obvious how to
+# adapt. --tml
+# ppt-customshape-shading-fix.diff, n#485637, thorsten
+
 svx-fontwork-crash-fix.diff, n#526342, thorsten
 
 # purge autoshape geometry on model change