~openoffice-pkgs/openoffice/3.2.0-lucid

« back to all changes in this revision

Viewing changes to patches/nsplugin-long.diff

  • Committer: Chris Cheney
  • Date: 2010-04-14 17:25:28 UTC
  • mfrom: (1022.17.301 debian)
  • Revision ID: ccheney@ubuntu.com-20100414172528-dcbj8kh8x7ynwa3g
Debian merge:

openoffice.org (1:3.2.0-7) unstable; urgency=low

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply-old    2010-04-12 01:24:01.000000000 +0200
 
2
+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply        2010-04-12 01:24:40.000000000 +0200
 
3
@@ -424,6 +424,8 @@
 
4
 
 
5
 # more intelligent nsplugin seeking
 
6
 nsplugin-path.diff, i#49590, michael
 
7
+# .. and fix 64bit archs
 
8
+plugin.long.diff, i#110747, cmc
 
9
 
 
10
 # sd printing fixes
 
11
 printing-bugfix-254573.diff, n#254573, rodo
 
12
--- /dev/null   2010-04-09 01:40:42.816645442 +0200
 
13
+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/plugin.long.diff     2010-04-12 01:23:02.000000000 +0200
 
14
@@ -0,0 +1,12 @@
 
15
+diff -r 4495864f1d5b extensions/source/nsplugin/source/so_main.cxx
 
16
+--- extensions/source/nsplugin/source/so_main.cxx      Fri Apr 09 10:22:18 2010 +0100
 
17
++++ extensions/source/nsplugin/source/so_main.cxx      Sat Apr 10 14:42:04 2010 +0100
 
18
+@@ -126,7 +126,7 @@
 
19
+     return -1;
 
20
+ }
 
21
 
22
+-int find_cur_node(sal_Int32 cur_id)
 
23
++int find_cur_node(long cur_id)
 
24
+ {
 
25
+     for(int i=0; i<MAX_NODE_NUM; i++)
 
26
+     {