[ooo-build-commit] patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Mon Oct 26 05:02:49 PDT 2009


 patches/dev300/apply |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4ecf27e165069d743a23f3833fdfae9548ddbdd9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 26 14:00:02 2009 +0200

    Bypass win32-activex-disable.diff for now
    
    It is unsure whether ActiveX embedding works anyway even in a purely
    upstream OOo or not, and if it does, whether the original problem
    still is there or not... so no point in using this patch for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index feb130d..6269c5b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1513,8 +1513,12 @@ warning-return-values-lotuswordpro.diff, pmladek
 # Work around G/W mail component crasher bug #FIXME - re-file vs. i#34264
 # Also fix OOo/GW deadlock
 win32-gw-send-mail.diff, i#34264, n#418407, tml
+
 # This is a pretty nasty IE problem i#19510, i#65209
-win32-activex-disable.diff, i#65209, i#19510, n#168534, tml
+# FIXME: 2009-10-26: Let's assume the problem is gone for now.
+# And actually afaics embedding doesn't work anyway, even
+# in upstream!?
+# win32-activex-disable.diff, i#65209, i#19510, n#168534, tml
 
 # fixes for visual studio express 2005 ( ooo-build only )
 2005-express-stl-remove.diff, noelpwer, i#71404


More information about the ooo-build-commit mailing list