[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cb7c26531bbb135485280c95f724252323d858e0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 10:25:53 2009 +0300

    sc-object-row-position.diff does not apply
    
    * patches/dev300/apply: Comment out sc-object-row-position.diff with a
      FIXME comment. There is no simple way to make it apply. Somebody
      needs to actually understand what the patch does and how to make
      that happen in the upstream code as it now is, if even needed any
      more.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 18d511a..022de64 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -702,7 +702,9 @@ sc-biffdump.diff, i#82184, jonp
 #sc-insert-inmerged-range.diff, i#8302, mloiseleur
 
 # Allow objects to stay within cells as expected when rows are resized.
-sc-object-row-position.diff, i#47088, jonp
+# FIXME: 2009-08-11: doesn't appply, no obvious way to make it apply,
+# actual understanding of code needed
+# sc-object-row-position.diff, i#47088, jonp
 
 # Launch navigator when double-clicking the leftmost status area box.
 sc-status-bar-launch-navigator.diff, i#49491, kohei