- up to version 2.0.4.1:

- updated PLD.patch
- removed outdated sfx2.badscipt

Changed files:
    openoffice.org-PLD.patch -> 1.4
    openoffice.org-sfx2.badscript.diff -> 1.2

diff --git a/openoffice.org-PLD.patch b/openoffice.org-PLD.patch
index 7a7ec8c3cbf2643ac46f2880894510b2f9918b69..7d0b2a62222ae319847339a8b676b1da29e14eee 100644 (file)
--- a/openoffice.org-PLD.patch
+++ b/openoffice.org-PLD.patch
@@ -15,15 +15,15 @@ diff -bur ooo-build-2.0.2.7.orig/patches/src680/apply ooo-build-2.0.2.7/patches/
  # Mandriva Linux
  MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown
  Mandriva: MandrivaBase
-@@ -806,11 +806,13 @@
+@@ -806,11 +806,10 @@
  [PLDOnly]
  SectionOwner => arekm
  
 -# fix build of sal project
 -solenv-unxlngi4-link.diff, i#66982
- # fix for macro browser crash
- sfx2-badscript.diff, i#67976
- 
+-# fix for macro browser crash
+-sfx2-badscript.diff, i#67976
+-
 +system-db-4.3-use-lpthread.diff
 +portaudio_v19.diff
 +mozilla-firefox.diff

diff --git a/openoffice.org-sfx2.badscript.diff b/openoffice.org-sfx2.badscript.diff
deleted file mode 100644 (file)
index 9f5d9a2..0000000
--- a/openoffice.org-sfx2.badscript.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-fix for a segfault on:
-format->character->hyperlink->events->oo.org macros->launcher
-
-Index: source/dialog/cfg.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/dialog/cfg.cxx,v
-retrieving revision 1.53
-diff -u -p -u -r1.53 cfg.cxx
---- sfx2/source/dialog/cfg.cxx 7 Sep 2005 18:12:28 -0000       1.53
-+++ sfx2/source/dialog/cfg.cxx 14 Mar 2006 10:50:22 -0000
-@@ -1746,7 +1746,7 @@ void SfxConfigGroupListBox_Impl::Request
-                                                                       bDisplay=FALSE;
-                                                               }
-                                                       }
--                                                      if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT  && bDisplay )
-+                                                      if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
-                                                       {
- 
-                                                               /*