ooo-build r12875 - in branches/ooo-build-2-4-1: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jun 12 20:33:23 2008
New Revision: 12875
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12875&view=rev

Log:
2008-06-12  Rene Engelhard  <rene debian org>

        * patches/src80/cws-cmcfixes47-{sw,extensions}.diff: backport fixes
          from cmcfixes47 (mozilla plugin for 64bits, word doc opening)


Added:
   branches/ooo-build-2-4-1/patches/src680/cws-cmcfixes47-extensions.diff
   branches/ooo-build-2-4-1/patches/src680/cws-cmcfixes47-sw.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Thu Jun 12 20:33:23 2008
@@ -320,6 +320,11 @@
 
 cws-hsqldb16.diff, i#85087
 
+# fix mozilla plugin on 64bit
+cws-cmcfixes47-extensions.diff, i#82545
+
+cws-cmcfixes47-sw.diff, i#90306
+
 [ CWSBackports < ooh680-m17 ]
 
 cws-dba241e.diff, i#87092, i#90011

Added: branches/ooo-build-2-4-1/patches/src680/cws-cmcfixes47-extensions.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/cws-cmcfixes47-extensions.diff	Thu Jun 12 20:33:23 2008
@@ -0,0 +1,35 @@
+Index: extensions/source/nsplugin/source/npshell.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/nsplugin/source/npshell.cxx,v
+retrieving revision 1.17
+retrieving revision 1.17.32.1
+diff -u -u -p -B -r1.17 -r1.17.32.1
+--- extensions/source/nsplugin/source/npshell.cxx	11 Apr 2008 10:07:27 -0000	1.17
++++ extensions/source/nsplugin/source/npshell.cxx	6 Jun 2008 14:44:47 -0000	1.17.32.1
+@@ -75,6 +75,26 @@
+ #include <string.h>
+ #include <errno.h>
+ 
++//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
++//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
++#ifdef UNIX
++#  ifndef _UINT32
++#    if defined(__alpha) || defined(__LP64__)
++       typedef unsigned int uint32;
++#    else  /* __alpha */
++       typedef unsigned long uint32;
++#    endif
++#    define _UINT32
++#  endif
++#  ifndef _INT32
++#    if defined(__alpha) || defined(__LP64__)
++       typedef int int32;
++#    else  /* __alpha */
++       typedef long int32;
++#    endif
++#    define _INT32
++#  endif
++#endif
+ 
+ #include "npapi.h"
+ #include "npshell.hxx"

Added: branches/ooo-build-2-4-1/patches/src680/cws-cmcfixes47-sw.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/cws-cmcfixes47-sw.diff	Thu Jun 12 20:33:23 2008
@@ -0,0 +1,17 @@
+Index: sw/source/filter/ww8/ww8par6.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/ww8/ww8par6.cxx,v
+retrieving revision 1.184
+retrieving revision 1.184.6.1
+diff -u -u -p -B -r1.184 -r1.184.6.1
+--- sw/source/filter/ww8/ww8par6.cxx	4 Jun 2008 09:53:53 -0000	1.184
++++ sw/source/filter/ww8/ww8par6.cxx	12 Jun 2008 10:17:40 -0000	1.184.6.1
+@@ -910,7 +910,7 @@ void wwSectionManager::CreateSep(const l
+     if (aNewSection.maSep.nfcPgn > 4)
+         aNewSection.maSep.nfcPgn = 0;
+ 
+-    aNewSection.maSep.fUnlocked = eVer <= ww::eWW2 ? ReadBSprm(pSep, (eVer <= ww::eWW7 ? 139 : 0x3006), 0 ) : 0;
++    aNewSection.maSep.fUnlocked = eVer > ww::eWW2 ? ReadBSprm(pSep, (eVer <= ww::eWW7 ? 139 : 0x3006), 0 ) : 0;
+ 
+     // sprmSFBiDi
+     aNewSection.maSep.fBiDi = eVer >= ww::eWW8 ? ReadBSprm(pSep, 0x3228, 0) : 0;