~openoffice-pkgs/openoffice/3.2.0-lucid
» Revision
1287
: patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff
« back to all changes in this revision
Viewing changes to patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff
- browse files at revision 1287
- compare with another revision
- download diff
- download tarball
- view history from revision 1287
- 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
openoffice.org (1:3.2.0-7) unstable; urgency=low
- files added:
- control.lenny_squeeze_transitional.in
- files renamed:
- shlibs.local.in => shlibs.override.kde
- files modified:
- changelog
added
removed
patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff
1
diff --git a/NEWS b/NEWS
2
index 7a103f7..fa4308f 100644
3
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/NEWS
4
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/NEWS
5
@@ -1,7 +1,7 @@
6
ooo-build-3.2.0.9 (3.2 bugfix release)
7
8
+ common bits:
9
- + bridge fix for ARM (i#105359) [Doko]
10
+ + bridge fix for ARM (i#105359) [Calc, Rene]
11
+ Calc bits:
12
+ XLS import with drawing objects (bnc#588927) [Kohei]
13
+ cut&paste problem in opcode list for "last used" functions [Kohei]
14
diff --git a/bin/package-ooo b/bin/package-ooo
15
index 50ceaf1..7c4b082 100755
16
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/package-ooo
17
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/package-ooo
18
@@ -83,7 +83,7 @@ mkdir -p $MANDIR/man1
19
for app in calc draw impress math web writer base; do
20
create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" || exit 1;
21
done
22
-create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "slot:5500" || exit 1;
23
+create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" ".uno:NewDoc" || exit 1;
24
create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" || exit 1;
25
create_unopkg_wrapper "$PREFIX/bin/unopkg${BINSUFFIX}" "" || exit 1;
26
if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
27
diff --git a/bin/setup.in b/bin/setup.in
28
index 04d3652..bf3a22d 100755
29
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/setup.in
30
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/setup.in
31
@@ -54,7 +54,6 @@ ENABLE_MONO='@ENABLE_MONO@'
32
ENABLE_EXTENSIONS='@ENABLE_EXTENSIONS@'
33
ENABLE_SCSOLVER='@ENABLE_SCSOLVER@'
34
ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
35
-GRAPHITE_SRC='@GRAPHITE_SRC@'
36
PROPAGATED_ARGS="@PROPAGATED_ARGS@"
37
CAIRO_VER=@CAIRO_VER@
38
CAIRO_ENABLED=@CAIRO_ENABLED@
39
diff --git a/configure.in b/configure.in
40
index 4485c45..81207bb 100644
41
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/configure.in
42
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/configure.in
43
@@ -1232,14 +1232,12 @@ AC_MSG_CHECKING([whether to enable graphite support])
44
if test -n "$enable_graphite" -a "$enable_graphite" != "no"; then
45
ENABLE_GRAPHITE=TRUE
46
graphite_enabled=yes
47
- GRAPHITE_SRC=silgraphite-2.3.1.tar.gz
48
else
49
ENABLE_GRAPHITE=FALSE
50
graphite_enabled=no
51
fi
52
AC_MSG_RESULT([$graphite_enabled])
53
AC_SUBST(ENABLE_GRAPHITE)
54
-AC_SUBST(GRAPHITE_SRC)
55
56
AC_MSG_CHECKING([whether to enable Access import])
57
if test "$enable_access" = "no"; then
58
diff --git a/download.in b/download.in
59
index 73115af..8223637 100755
60
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/download.in
61
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/download.in
62
@@ -89,8 +89,6 @@ sub trim($)
63
'libpixman-.*' => '@MIRROR@/SRC680',
64
'glitz-.*' => '@MIRROR@/SRC680',
65
'biblio.*' => '@MIRROR@/SRC680',
66
-# Graphite rendering bits
67
- 'silgraphite-.*' => '@MIRROR@/SRC680',
68
# Prebuilt dictionaries for Novell Windows builds
69
'writingaids.*\.zip' => '@MIRROR@/SRC680',
70
71
@@ -442,10 +440,6 @@ if ('@PIECE@' eq 'bootstrap') {
72
source_file( 'setup_native_packinfo-ooo320-m9.tar.bz2' );
73
}
74
75
-if ('@GRAPHITE_SRC@' ne '') {
76
- source_file( '@GRAPHITE_SRC@' );
77
-}
78
-
79
if ('@SYSTEM_LIBWPD@' eq 'NO') {
80
source_file( '@LIBWPD_TARBALL@' );
81
}
82
diff --git a/patches/dev300/apply b/patches/dev300/apply
83
index dc2c6c5..c607359 100644
84
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
85
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
86
@@ -2303,6 +2303,7 @@ ubuntu-no-stack-protector.diff, doko
87
system-lpsolve-rpath.diff, rengelha
88
#gccXXXXX.solenv.javaregistration.diff
89
ubuntu-mstopdf.diff, ccheney
90
+f11-fullscreen.diff, ccheney
91
92
[ UbuntuOnly ]
93
unxlngi6-notune.diff, doko
94
@@ -3574,6 +3575,7 @@ connectivity-build-fix.diff, i#107957, fridrich
95
oowintool-java6.diff, fridrich
96
connectivity-build-fix-mac.diff, thorsten
97
vcl-xinerama-clone-fix.diff, n#578730, thorsten
98
+vcl-stl-fix.diff, n#588957, thorsten
99
100
[ HyphenFix ]
101
# László Németh's patch for hyphen module
102
diff --git a/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff b/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
103
index a6dbf23..0793c9d 100644
104
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
105
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
106
@@ -1,32 +1,32 @@
107
---- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2007-12-12 15:35:44.000000000 +0000
108
-+++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2010-03-15 11:57:20.000000000 +0000
109
-@@ -8,15 +8,22 @@
110
- .global privateSnippetExecutor
111
- .type privateSnippetExecutor, %function
112
- privateSnippetExecutor:
113
-+ .fnstart @ start of unwinder entry
114
-+
115
- stmfd sp!, {r0-r3} @ follow other parameters on stack
116
-+ .pad #16 @ throw this data away on exception
117
- mov r0, ip @ r0 points to functionoffset/vtable
118
-- sub fp, ip, #4 @ set frame pointer
119
-+ mov r1, sp @ r1 points to this and params
120
-+ @ (see cppuno.cxx:codeSnippet())
121
-+ stmfd sp!, {r4,lr} @ save return address
122
-+ @ (r4 pushed to preserve stack alignment)
123
-+ .save {r4,lr} @ restore these regs on exception
124
-
125
- bl cpp_vtable_call(PLT)
126
-
127
-+ add sp, sp, #4 @ no need to restore r4 (we didn't touch it)
128
-+ ldr pc, [sp], #20 @ return, discarding function arguments
129
-+
130
-+ .fnend @ end of unwinder entry
131
-+
132
-+ .size privateSnippetExecutor, . - privateSnippetExecutor
133
+--- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s.old 2010-02-02 12:49:41.000000000 +0100
134
++++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2010-03-29 16:45:43.000000000 +0200
135
+@@ -8,15 +8,22 @@
136
+ .global privateSnippetExecutor
137
+ .type privateSnippetExecutor, %function
138
+ privateSnippetExecutor:
139
++ .fnstart @ start of unwinder entry
140
++
141
+ stmfd sp!, {r0-r3} @ follow other parameters on stack
142
++ .pad #16 @ throw this data away on exception
143
+ mov r0, ip @ r0 points to functionoffset/vtable
144
+- mov ip, sp @ fix up the ip
145
+- stmfd sp!, {fp,ip,lr,pc} @ 8 x 4 => stack remains 8 aligned
146
+- sub fp, ip, #4 @ set frame pointer
147
++ mov r1, sp @ r1 points to this and params
148
++ @ (see cppuno.cxx:codeSnippet())
149
++ stmfd sp!, {r4,lr} @ save return address
150
++ @ (r4 pushed to preserve stack alignment)
151
++ .save {r4,lr} @ restore these regs on exception
152
+
153
+- add r1, sp, #16 @ r1 points to this and params
154
+ bl cpp_vtable_call(PLT)
155
+
156
+- add sp, sp, #32 @ restore stack
157
+- ldr fp, [sp, #-32] @ restore frame pointer
158
+- ldr pc, [sp, #-24] @ return
159
++ add sp, sp, #4 @ no need to restore r4 (we didn't touch it)
160
++ ldr pc, [sp], #20 @ return, discarding function arguments
161
++
162
++ .fnend @ end of unwinder entry
163
++
164
++ .size privateSnippetExecutor, . - privateSnippetExecutor
165
diff --git a/patches/dev300/f11-fullscreen.diff b/patches/dev300/f11-fullscreen.diff
166
new file mode 100644
167
index 0000000..3da57bf
168
--- /dev/null
169
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/f11-fullscreen.diff
170
@@ -0,0 +1,467 @@
171
+--- officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 2010-03-25 20:30:12 +0000
172
++++ officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 2010-03-26 05:06:54 +0000
173
+@@ -469,7 +469,7 @@
174
+ </node>
175
+ <node oor:name="F11" oor:op="replace">
176
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
177
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
178
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
179
+ </prop>
180
+ </node>
181
+ <node oor:name="F11_MOD1" oor:op="replace">
182
+@@ -1036,7 +1036,7 @@
183
+ </node>
184
+ <node oor:name="F11" oor:op="replace">
185
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
186
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
187
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
188
+ </prop>
189
+ </node>
190
+ <node oor:name="F11_MOD1" oor:op="replace">
191
+@@ -1442,7 +1442,7 @@
192
+ </node>
193
+ <node oor:name="F11" oor:op="replace">
194
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
195
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
196
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
197
+ </prop>
198
+ </node>
199
+ <node oor:name="F11_MOD1" oor:op="replace">
200
+@@ -1984,7 +1984,7 @@
201
+ </node>
202
+ <node oor:name="F11" oor:op="replace">
203
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
204
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
205
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
206
+ </prop>
207
+ </node>
208
+ <node oor:name="F11_MOD1" oor:op="replace">
209
+@@ -2473,7 +2473,7 @@
210
+ </node>
211
+ <node oor:name="F11" oor:op="replace">
212
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
213
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
214
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
215
+ </prop>
216
+ </node>
217
+ <node oor:name="F11_MOD1" oor:op="replace">
218
+@@ -3093,7 +3093,7 @@
219
+ </node>
220
+ <node oor:name="F11" oor:op="replace">
221
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
222
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
223
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
224
+ </prop>
225
+ </node>
226
+ <node oor:name="F11_MOD1" oor:op="replace">
227
+@@ -3713,7 +3713,7 @@
228
+ </node>
229
+ <node oor:name="F11" oor:op="replace">
230
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
231
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
232
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
233
+ </prop>
234
+ </node>
235
+ <node oor:name="F11_MOD1" oor:op="replace">
236
+@@ -4318,7 +4318,7 @@
237
+ </node>
238
+ <node oor:name="F11" oor:op="replace">
239
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
240
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
241
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
242
+ </prop>
243
+ </node>
244
+ <node oor:name="F11_MOD1" oor:op="replace">
245
+@@ -4928,7 +4928,7 @@
246
+ </node>
247
+ <node oor:name="F11" oor:op="replace">
248
+ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
249
+- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
250
++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
251
+ </prop>
252
+ </node>
253
+ <node oor:name="F11_MOD1" oor:op="replace">
254
+
255
+--- sc/uiconfig/scalc/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
256
++++ sc/uiconfig/scalc/accelerator/de/default.xml 2010-03-26 04:05:22 +0000
257
+@@ -4,7 +4,7 @@
258
+ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
259
+ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
260
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
261
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
262
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
263
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
264
+ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
265
+ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
266
+
267
+--- sc/uiconfig/scalc/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
268
++++ sc/uiconfig/scalc/accelerator/en-GB/default.xml 2010-03-26 04:05:22 +0000
269
+@@ -4,7 +4,7 @@
270
+ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
271
+ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
272
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
273
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
274
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
275
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
276
+ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
277
+ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
278
+
279
+--- sc/uiconfig/scalc/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
280
++++ sc/uiconfig/scalc/accelerator/en-US/default.xml 2010-03-26 04:05:22 +0000
281
+@@ -4,7 +4,7 @@
282
+ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
283
+ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
284
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
285
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
286
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
287
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
288
+ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
289
+ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
290
+
291
+--- sc/uiconfig/scalc/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
292
++++ sc/uiconfig/scalc/accelerator/es/default.xml 2010-03-26 04:05:22 +0000
293
+@@ -4,7 +4,7 @@
294
+ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
295
+ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
296
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
297
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
298
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
299
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
300
+ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
301
+ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
302
+
303
+--- sc/uiconfig/scalc/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
304
++++ sc/uiconfig/scalc/accelerator/fr/default.xml 2010-03-26 04:05:22 +0000
305
+@@ -4,7 +4,7 @@
306
+ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
307
+ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
308
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
309
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
310
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
311
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
312
+ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
313
+ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
314
+
315
+--- sw/uiconfig/sglobal/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
316
++++ sw/uiconfig/sglobal/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
317
+@@ -1,6 +1,6 @@
318
+ <?xml version="1.0" encoding="UTF-8"?>
319
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
320
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
321
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
322
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
323
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
324
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
325
+
326
+--- sw/uiconfig/sglobal/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
327
++++ sw/uiconfig/sglobal/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
328
+@@ -1,6 +1,6 @@
329
+ <?xml version="1.0" encoding="UTF-8"?>
330
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
331
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
332
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
333
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
334
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
335
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
336
+
337
+--- sw/uiconfig/sglobal/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
338
++++ sw/uiconfig/sglobal/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
339
+@@ -1,6 +1,6 @@
340
+ <?xml version="1.0" encoding="UTF-8"?>
341
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
342
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
343
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
344
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
345
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
346
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
347
+
348
+--- sw/uiconfig/sglobal/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
349
++++ sw/uiconfig/sglobal/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
350
+@@ -1,6 +1,6 @@
351
+ <?xml version="1.0" encoding="UTF-8"?>
352
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
353
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
354
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
355
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
356
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
357
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
358
+
359
+--- sw/uiconfig/sglobal/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
360
++++ sw/uiconfig/sglobal/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
361
+@@ -1,6 +1,6 @@
362
+ <?xml version="1.0" encoding="UTF-8"?>
363
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
364
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
365
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
366
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
367
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
368
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
369
+
370
+--- sw/uiconfig/sweb/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
371
++++ sw/uiconfig/sweb/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
372
+@@ -1,6 +1,6 @@
373
+ <?xml version="1.0" encoding="UTF-8"?>
374
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
375
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
376
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
377
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
378
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
379
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
380
+
381
+--- sw/uiconfig/sweb/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
382
++++ sw/uiconfig/sweb/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
383
+@@ -1,6 +1,6 @@
384
+ <?xml version="1.0" encoding="UTF-8"?>
385
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
386
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
387
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
388
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
389
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
390
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
391
+
392
+--- sw/uiconfig/sweb/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
393
++++ sw/uiconfig/sweb/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
394
+@@ -1,6 +1,6 @@
395
+ <?xml version="1.0" encoding="UTF-8"?>
396
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
397
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
398
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
399
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
400
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
401
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
402
+
403
+--- sw/uiconfig/sweb/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
404
++++ sw/uiconfig/sweb/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
405
+@@ -1,6 +1,6 @@
406
+ <?xml version="1.0" encoding="UTF-8"?>
407
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
408
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
409
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
410
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
411
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
412
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
413
+
414
+--- sw/uiconfig/sweb/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
415
++++ sw/uiconfig/sweb/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
416
+@@ -1,6 +1,6 @@
417
+ <?xml version="1.0" encoding="UTF-8"?>
418
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
419
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
420
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
421
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
422
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
423
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
424
+
425
+--- sw/uiconfig/swform/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
426
++++ sw/uiconfig/swform/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
427
+@@ -37,7 +37,7 @@
428
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
429
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
430
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
431
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
432
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
433
+ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
434
+ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
435
+ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
436
+
437
+--- sw/uiconfig/swform/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
438
++++ sw/uiconfig/swform/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
439
+@@ -38,7 +38,7 @@
440
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
441
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
442
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
443
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
444
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
445
+ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
446
+ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
447
+ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
448
+
449
+--- sw/uiconfig/swform/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
450
++++ sw/uiconfig/swform/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
451
+@@ -36,7 +36,7 @@
452
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
453
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
454
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
455
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
456
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
457
+ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
458
+ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
459
+ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
460
+
461
+--- sw/uiconfig/swform/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
462
++++ sw/uiconfig/swform/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
463
+@@ -37,7 +37,7 @@
464
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
465
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
466
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
467
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
468
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
469
+ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
470
+ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
471
+ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
472
+
473
+--- sw/uiconfig/swreport/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
474
++++ sw/uiconfig/swreport/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
475
+@@ -1,6 +1,6 @@
476
+ <?xml version="1.0" encoding="UTF-8"?>
477
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
478
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
479
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
480
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
481
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
482
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
483
+
484
+--- sw/uiconfig/swreport/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
485
++++ sw/uiconfig/swreport/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
486
+@@ -1,6 +1,6 @@
487
+ <?xml version="1.0" encoding="UTF-8"?>
488
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
489
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
490
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
491
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
492
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
493
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
494
+
495
+--- sw/uiconfig/swreport/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
496
++++ sw/uiconfig/swreport/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
497
+@@ -1,6 +1,6 @@
498
+ <?xml version="1.0" encoding="UTF-8"?>
499
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
500
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
501
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
502
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
503
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
504
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
505
+
506
+--- sw/uiconfig/swreport/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
507
++++ sw/uiconfig/swreport/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
508
+@@ -1,6 +1,6 @@
509
+ <?xml version="1.0" encoding="UTF-8"?>
510
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
511
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
512
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
513
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
514
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
515
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
516
+
517
+--- sw/uiconfig/swreport/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
518
++++ sw/uiconfig/swreport/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
519
+@@ -1,6 +1,6 @@
520
+ <?xml version="1.0" encoding="UTF-8"?>
521
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
522
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
523
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
524
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
525
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
526
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
527
+
528
+--- sw/uiconfig/swriter/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
529
++++ sw/uiconfig/swriter/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
530
+@@ -1,6 +1,6 @@
531
+ <?xml version="1.0" encoding="UTF-8"?>
532
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
533
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
534
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
535
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
536
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
537
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
538
+
539
+--- sw/uiconfig/swriter/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
540
++++ sw/uiconfig/swriter/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
541
+@@ -1,6 +1,6 @@
542
+ <?xml version="1.0" encoding="UTF-8"?>
543
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
544
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
545
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
546
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
547
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
548
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
549
+
550
+--- sw/uiconfig/swriter/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
551
++++ sw/uiconfig/swriter/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
552
+@@ -1,6 +1,6 @@
553
+ <?xml version="1.0" encoding="UTF-8"?>
554
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
555
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
556
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
557
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
558
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
559
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
560
+
561
+--- sw/uiconfig/swriter/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
562
++++ sw/uiconfig/swriter/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
563
+@@ -1,6 +1,6 @@
564
+ <?xml version="1.0" encoding="UTF-8"?>
565
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
566
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
567
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
568
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
569
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
570
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
571
+
572
+--- sw/uiconfig/swriter/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
573
++++ sw/uiconfig/swriter/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
574
+@@ -1,6 +1,6 @@
575
+ <?xml version="1.0" encoding="UTF-8"?>
576
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
577
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
578
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
579
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
580
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
581
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
582
+
583
+--- sw/uiconfig/swxform/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
584
++++ sw/uiconfig/swxform/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
585
+@@ -1,6 +1,6 @@
586
+ <?xml version="1.0" encoding="UTF-8"?>
587
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
588
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
589
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
590
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
591
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
592
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
593
+
594
+--- sw/uiconfig/swxform/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
595
++++ sw/uiconfig/swxform/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
596
+@@ -1,6 +1,6 @@
597
+ <?xml version="1.0" encoding="UTF-8"?>
598
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
599
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
600
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
601
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
602
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
603
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
604
+
605
+--- sw/uiconfig/swxform/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
606
++++ sw/uiconfig/swxform/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
607
+@@ -1,6 +1,6 @@
608
+ <?xml version="1.0" encoding="UTF-8"?>
609
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
610
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
611
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
612
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
613
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
614
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
615
+
616
+--- sw/uiconfig/swxform/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
617
++++ sw/uiconfig/swxform/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
618
+@@ -1,6 +1,6 @@
619
+ <?xml version="1.0" encoding="UTF-8"?>
620
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
621
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
622
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
623
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
624
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
625
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
626
+
627
+--- sw/uiconfig/swxform/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
628
++++ sw/uiconfig/swxform/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
629
+@@ -1,6 +1,6 @@
630
+ <?xml version="1.0" encoding="UTF-8"?>
631
+ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
632
+- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
633
++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
634
+ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
635
+ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
636
+ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
637
+
638
diff --git a/patches/dev300/human-icons-add.diff b/patches/dev300/human-icons-add.diff
639
index 295c375..1f6673f 100644
640
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/human-icons-add.diff
641
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/human-icons-add.diff
642
@@ -1,9 +1,41 @@
643
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-09-26 21:13:11 +0000
644
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-09-26 21:21:30 +0000
645
-@@ -5588,6 +5588,11 @@
646
- <desc>Oxygen - the KDE4 default theme</desc>
647
- </info>
648
- </enumeration>
649
+--- binfilter/bf_svtools/source/config/svt_miscopt.cxx 2010-03-25 20:30:12 +0000
650
++++ binfilter/bf_svtools/source/config/svt_miscopt.cxx 2010-03-25 21:02:18 +0000
651
+@@ -268,6 +268,7 @@
652
+ case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
653
+ case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL;
654
+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
655
++ case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
656
+ }
657
+
658
+ return SFX_SYMBOLS_STYLE_AUTO;
659
+@@ -283,6 +284,7 @@
660
+ case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
661
+ case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL;
662
+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
663
++ case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
664
+ }
665
+
666
+ return STYLE_SYMBOLS_AUTO;
667
+
668
+--- binfilter/inc/bf_svtools/imgdef.hxx 2010-03-25 20:30:12 +0000
669
++++ binfilter/inc/bf_svtools/imgdef.hxx 2010-03-25 21:03:12 +0000
670
+@@ -48,7 +48,8 @@
671
+ SFX_SYMBOLS_STYLE_HICONTRAST,
672
+ SFX_SYMBOLS_STYLE_INDUSTRIAL,
673
+ SFX_SYMBOLS_STYLE_CRYSTAL,
674
+- SFX_SYMBOLS_STYLE_TANGO
675
++ SFX_SYMBOLS_STYLE_TANGO,
676
++ SFX_SYMBOLS_STYLE_HUMAN
677
+ };
678
+
679
+ #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
680
+
681
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-25 20:30:12 +0000
682
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-25 20:58:36 +0000
683
+@@ -5839,6 +5839,11 @@
684
+ <desc>Oxygen - the KDE4 default theme</desc>
685
+ </info>
686
+ </enumeration>
687
+ <enumeration oor:value="human">
688
+ <info>
689
+ <desc>Human - the Gnome default theme for Ubuntu</desc>
690
@@ -13,25 +45,24 @@
691
<value>auto</value>
692
</prop>
693
694
---- solenv/inc/settings.mk 2008-09-26 21:13:11 +0000
695
-+++ solenv/inc/settings.mk 2008-09-26 21:24:30 +0000
696
-@@ -989,6 +989,9 @@
697
- RSCDEFS+= -DDEBUG
698
- .ENDIF
699
-
700
-+# additional image sets
701
+--- packimages/pack/makefile.mk 2010-03-25 20:30:12 +0000
702
++++ packimages/pack/makefile.mk 2010-03-25 21:09:53 +0000
703
+@@ -41,7 +41,7 @@
704
+ IMAGES := $(COMMONBIN)$/images.zip
705
+ SORTED_LIST=$(RES)$/img$/sorted.lst
706
+ # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
707
+-CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen
708
+CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen human
709
-+
710
- # settings for mozilla idl compiler
711
- XPIDL=xpidl
712
- XPIDL_LINK=xpt_link
713
+ CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
714
+ CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
715
+ CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
716
717
---- svtools/inc/imgdef.hxx 2008-09-26 21:13:11 +0000
718
-+++ svtools/inc/imgdef.hxx 2008-09-26 21:25:01 +0000
719
-@@ -46,7 +46,8 @@
720
+--- svtools/inc/imgdef.hxx 2010-03-25 20:30:12 +0000
721
++++ svtools/inc/imgdef.hxx 2010-03-25 20:59:24 +0000
722
+@@ -47,7 +47,8 @@
723
SFX_SYMBOLS_STYLE_CRYSTAL,
724
SFX_SYMBOLS_STYLE_TANGO,
725
- SFX_SYMBOLS_STYLE_CLASSIC,
726
+ SFX_SYMBOLS_STYLE_CLASSIC,
727
- SFX_SYMBOLS_STYLE_OXYGEN
728
+ SFX_SYMBOLS_STYLE_OXYGEN,
729
+ SFX_SYMBOLS_STYLE_HUMAN
730
@@ -39,130 +70,69 @@
731
732
#define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
733
734
---- svtools/source/config/miscopt.cxx 2008-09-26 21:13:11 +0000
735
-+++ svtools/source/config/miscopt.cxx 2008-09-26 21:26:12 +0000
736
-@@ -275,6 +275,7 @@
737
+--- svtools/source/config/miscopt.cxx 2010-03-25 20:30:12 +0000
738
++++ svtools/source/config/miscopt.cxx 2010-03-25 21:00:18 +0000
739
+@@ -317,6 +317,7 @@
740
case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
741
case STYLE_SYMBOLS_CLASSIC: return SFX_SYMBOLS_STYLE_CLASSIC;
742
- case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
743
+ case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
744
+ case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
745
}
746
747
return SFX_SYMBOLS_STYLE_AUTO;
748
-@@ -291,6 +292,7 @@
749
+@@ -334,6 +335,7 @@
750
case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
751
case SFX_SYMBOLS_STYLE_CLASSIC: return STYLE_SYMBOLS_CLASSIC;
752
- case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
753
+ case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
754
+ case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
755
}
756
757
return STYLE_SYMBOLS_AUTO;
758
759
---- vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
760
-+++ vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
761
+--- svx/source/cui/optgdlg.src 2010-03-25 20:30:12 +0000
762
++++ svx/source/cui/optgdlg.src 2010-03-25 21:14:27 +0000
763
+@@ -265,6 +265,7 @@
764
+ < "Tango" ; > ;
765
+ < "Classic" ; > ;
766
+ < "Oxygen" ; > ;
767
++ < "Human" ; > ;
768
+ };
769
+ };
770
+ CheckBox CB_SYSTEM_FONT
771
+
772
+--- vcl/inc/vcl/settings.hxx 2010-03-25 20:30:12 +0000
773
++++ vcl/inc/vcl/settings.hxx 2010-03-25 21:00:57 +0000
774
@@ -525,7 +525,8 @@
775
- #define STYLE_SYMBOLS_TANGO ((ULONG)5)
776
- #define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
777
- #define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
778
--#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
779
-+#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
780
-+#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9)
781
+ #define STYLE_SYMBOLS_TANGO ((ULONG)5)
782
+ #define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
783
+ #define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
784
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
785
++#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
786
++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9)
787
788
#define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
789
790
---- vcl/source/app/settings.cxx 2008-09-26 21:13:11 +0000
791
-+++ vcl/source/app/settings.cxx 2008-09-26 21:39:55 +0000
792
-@@ -52,6 +52,11 @@
793
- #include "tools/postwin.h"
794
- #endif
795
-
796
-+extern "C" {
797
-+#include <unistd.h>
798
-+#include <string.h>
799
-+}
800
-+
801
- using namespace rtl;
802
-
803
- // =======================================================================
804
-@@ -701,6 +706,7 @@
805
+
806
+--- vcl/source/app/settings.cxx 2010-03-25 20:30:12 +0000
807
++++ vcl/source/app/settings.cxx 2010-03-25 21:25:20 +0000
808
+@@ -712,6 +712,7 @@
809
case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
810
case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" );
811
- case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
812
+ case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
813
+ case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString::createFromAscii( "human" );
814
}
815
816
return ::rtl::OUString::createFromAscii( "auto" );
817
-@@ -734,6 +735,8 @@
818
- return STYLE_SYMBOLS_CLASSIC;
819
- else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
820
- return STYLE_SYMBOLS_OXYGEN;
821
+@@ -735,6 +736,8 @@
822
+ return STYLE_SYMBOLS_CLASSIC;
823
+ else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
824
+ return STYLE_SYMBOLS_OXYGEN;
825
+ else if ( rName == ::rtl::OUString::createFromAscii( "human" ) )
826
+ return STYLE_SYMBOLS_HUMAN;
827
-
828
- return STYLE_SYMBOLS_AUTO;
829
- }
830
-@@ -768,22 +764,50 @@
831
832
- // -----------------------------------------------------------------------
833
-
834
-+ULONG SymbolsStyleOrAuto (ULONG nStyle)
835
-+{
836
-+ // if the images*.zip file doesn't exist, fall back to auto
837
-+ if ( nStyle != STYLE_SYMBOLS_AUTO )
838
-+ {
839
-+ char zipfile[100] = "/usr/lib/openoffice/basis-link/share/config/images";
840
-+ switch ( nStyle )
841
-+ {
842
-+ case STYLE_SYMBOLS_DEFAULT: strcat (zipfile, ""); break;
843
-+ case STYLE_SYMBOLS_HICONTRAST: strcat (zipfile, "_hicontrast"); break;
844
-+ case STYLE_SYMBOLS_INDUSTRIAL: strcat (zipfile, "_industrial"); break;
845
-+ case STYLE_SYMBOLS_CRYSTAL: strcat (zipfile, "_crystal"); break;
846
-+ case STYLE_SYMBOLS_TANGO: strcat (zipfile, "_tango"); break;
847
-+ case STYLE_SYMBOLS_CLASSIC: strcat (zipfile, "_classic"); break;
848
-+ case STYLE_SYMBOLS_OXYGEN: strcat (zipfile, "_oxygen"); break;
849
-+ case STYLE_SYMBOLS_HUMAN: strcat (zipfile, "_human"); break;
850
-+ }
851
-+ strcat (zipfile, ".zip");
852
-+ if ( access( zipfile, R_OK ) )
853
-+ nStyle = STYLE_SYMBOLS_AUTO;
854
-+ }
855
-+ return nStyle;
856
-+}
857
-+
858
-+// -----------------------------------------------------------------------
859
-+
860
- ULONG StyleSettings::GetCurrentSymbolsStyle() const
861
- {
862
- // style selected in Tools -> Options... -> OpenOffice.org -> View
863
- ULONG nStyle = GetSymbolsStyle();
864
-+ nStyle = SymbolsStyleOrAuto(nStyle);
865
-
866
- if ( nStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nStyle) ) )
867
- {
868
- // the preferred style can be read from the desktop setting by the desktop native widgets modules
869
- ULONG nPreferredStyle = GetPreferredSymbolsStyle();
870
-+ nPreferredStyle = SymbolsStyleOrAuto(nPreferredStyle);
871
-
872
- if ( nPreferredStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nPreferredStyle) ) )
873
- {
874
-
875
- // use a hardcoded desktop-specific fallback if no preferred style has been detected
876
- static bool sbFallbackDesktopChecked = false;
877
-- static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
878
-+ static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_HUMAN;
879
-
880
- if ( !sbFallbackDesktopChecked )
881
- {
882
-@@ -793,7 +828,7 @@
883
- ULONG StyleSettings::GetAutoSymbolsStyle() const
884
- {
885
- const ::rtl::OUString& rDesktopEnvironment = Application::GetDesktopEnvironment();
886
-+ ULONG nRet = STYLE_SYMBOLS_HUMAN;
887
- bool bCont = true;
888
-
889
- try
890
-@@ -814,7 +849,7 @@
891
+ return STYLE_SYMBOLS_AUTO;
892
+ }
893
+@@ -830,7 +833,7 @@
894
{
895
if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
896
rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
897
@@ -170,5 +140,5 @@
898
+ nRet = STYLE_SYMBOLS_HUMAN;
899
else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
900
nRet = STYLE_SYMBOLS_CRYSTAL;
901
- }
902
+ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
903
904
diff --git a/patches/dev300/vcl-stl-fix.diff b/patches/dev300/vcl-stl-fix.diff
905
new file mode 100644
906
index 0000000..0452d9f
907
--- /dev/null
908
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/vcl-stl-fix.diff
909
@@ -0,0 +1,62 @@
910
+Fix iterator handliŋ for drawPolygon
911
+
912
+From: Thorsten Behrens <tbehrens@novell.com>
913
+
914
+
915
+---
916
+
917
+ vcl/unx/source/gdi/salgdi.cxx | 21 +++++++++++++++++++--
918
+ 1 files changed, 19 insertions(+), 2 deletions(-)
919
+
920
+
921
+diff --git vcl/unx/source/gdi/salgdi.cxx vcl/unx/source/gdi/salgdi.cxx
922
+index ae281ab..0b02ad0 100644
923
+--- vcl/unx/source/gdi/salgdi.cxx
924
++++ vcl/unx/source/gdi/salgdi.cxx
925
+@@ -1427,14 +1427,17 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
926
+ // unless it splits another trapezoid that is still active
927
+ bool bSplit = false;
928
+ ActiveTrapSet::iterator aActiveTrapsIt = aActiveTraps.begin();
929
+- for(; aActiveTrapsIt != aActiveTraps.end(); ++aActiveTrapsIt )
930
++ while(aActiveTrapsIt != aActiveTraps.end())
931
+ {
932
+ XTrapezoid& rLeftTrap = aTrapVector[ *aActiveTrapsIt ];
933
+
934
+ // skip until first overlap candidate
935
+ // TODO: use stl::*er_bound() instead
936
+ if( IsLeftOf( aTrapezoid.left, rLeftTrap.left) )
937
++ {
938
++ ++aActiveTrapsIt;
939
+ continue;
940
++ }
941
+
942
+ // in the ActiveTrapSet there are still trapezoids where
943
+ // a vertical overlap with new trapezoids is no longer possible
944
+@@ -1445,15 +1448,26 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
945
+ {
946
+ ActiveTrapSet::iterator it = aActiveTrapsIt;
947
+ if( aActiveTrapsIt != aActiveTraps.begin() )
948
++ {
949
+ --aActiveTrapsIt;
950
+- aActiveTraps.erase( it );
951
++ aActiveTraps.erase( it );
952
++ ++aActiveTrapsIt;
953
++ }
954
++ else
955
++ {
956
++ aActiveTraps.erase( it );
957
++ aActiveTrapsIt = aActiveTraps.begin();
958
++ }
959
+ continue;
960
+ }
961
+
962
+ // check if there is horizontal overlap
963
+ // aTrapezoid.left==rLeftTrap.right is allowed though
964
+ if( !IsLeftOf( aTrapezoid.left, rLeftTrap.right ) )
965
++ {
966
++ ++aActiveTrapsIt;
967
+ continue;
968
++ }
969
+
970
+ // prepare to split the old trapezoid and keep its upper part
971
+ // find the old trapezoids entry in the VerticalTrapSet and remove it
Loggerhead is a web-based interface for Breezy
Version: 2.0.1