./packages/openofficeorg/3.2/unstable r1915: update ooo-build to bc571534c9b7435429003010d733e9c3a34df32d
------------------------------------------------------------
revno: 1915
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2010-04-06 23:43:08 +0200
message:
update ooo-build to bc571534c9b7435429003010d733e9c3a34df32d
renamed:
patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff => patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff
modified:
changelog
patches/series
patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff
=== modified file 'changelog'
--- a/changelog 2010-04-06 20:25:16 +0000
+++ b/changelog 2010-04-06 21:43:08 +0000
@@ -1,6 +1,11 @@
openoffice.org (1:3.2.0-6) UNRELEASED; urgency=low
* debian/patches/cws-linuxaxp01.diff: update
+ * patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff: move
+ * patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff: here
+ and update to current git
+ - removes (bogus) last hunk in last interator usage fix (closes: #576665)
+
* debian/rules:
- remove obsolete filter-out for mysqlcppconn--dve builddep so it
actually gets added for i386...
@@ -11,7 +16,7 @@
* debian/rules, debian/control*in: remove %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
again
- -- Rene Engelhard <rene@debian.org> Tue, 06 Apr 2010 22:21:58 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 06 Apr 2010 23:41:04 +0200
openoffice.org (1:3.2.0-5) unstable; urgency=low
=== renamed file 'patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff' => 'patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff'
--- a/patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff 2010-03-29 08:03:27 +0000
+++ b/patches/branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff 2010-04-06 21:43:08 +0000
@@ -24,11 +24,74 @@
create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" || exit 1;
create_unopkg_wrapper "$PREFIX/bin/unopkg${BINSUFFIX}" "" || exit 1;
if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
+diff --git a/bin/setup.in b/bin/setup.in
+index 04d3652..bf3a22d 100755
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/setup.in
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/setup.in
+@@ -54,7 +54,6 @@ ENABLE_MONO='@ENABLE_MONO@'
+ ENABLE_EXTENSIONS='@ENABLE_EXTENSIONS@'
+ ENABLE_SCSOLVER='@ENABLE_SCSOLVER@'
+ ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
+-GRAPHITE_SRC='@GRAPHITE_SRC@'
+ PROPAGATED_ARGS="@PROPAGATED_ARGS@"
+ CAIRO_VER=@CAIRO_VER@
+ CAIRO_ENABLED=@CAIRO_ENABLED@
+diff --git a/configure.in b/configure.in
+index 4485c45..81207bb 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/configure.in
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/configure.in
+@@ -1232,14 +1232,12 @@ AC_MSG_CHECKING([whether to enable graphite support])
+ if test -n "$enable_graphite" -a "$enable_graphite" != "no"; then
+ ENABLE_GRAPHITE=TRUE
+ graphite_enabled=yes
+- GRAPHITE_SRC=silgraphite-2.3.1.tar.gz
+ else
+ ENABLE_GRAPHITE=FALSE
+ graphite_enabled=no
+ fi
+ AC_MSG_RESULT([$graphite_enabled])
+ AC_SUBST(ENABLE_GRAPHITE)
+-AC_SUBST(GRAPHITE_SRC)
+
+ AC_MSG_CHECKING([whether to enable Access import])
+ if test "$enable_access" = "no"; then
+diff --git a/download.in b/download.in
+index 73115af..8223637 100755
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/download.in
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/download.in
+@@ -89,8 +89,6 @@ sub trim($)
+ 'libpixman-.*' => '@MIRROR@/SRC680',
+ 'glitz-.*' => '@MIRROR@/SRC680',
+ 'biblio.*' => '@MIRROR@/SRC680',
+-# Graphite rendering bits
+- 'silgraphite-.*' => '@MIRROR@/SRC680',
+ # Prebuilt dictionaries for Novell Windows builds
+ 'writingaids.*\.zip' => '@MIRROR@/SRC680',
+
+@@ -442,10 +440,6 @@ if ('@PIECE@' eq 'bootstrap') {
+ source_file( 'setup_native_packinfo-ooo320-m9.tar.bz2' );
+ }
+
+-if ('@GRAPHITE_SRC@' ne '') {
+- source_file( '@GRAPHITE_SRC@' );
+-}
+-
+ if ('@SYSTEM_LIBWPD@' eq 'NO') {
+ source_file( '@LIBWPD_TARBALL@' );
+ }
diff --git a/patches/dev300/apply b/patches/dev300/apply
-index dc2c6c5..3723c9b 100644
+index dc2c6c5..c607359 100644
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
-@@ -3574,6 +3574,7 @@ connectivity-build-fix.diff, i#107957, fridrich
+@@ -2303,6 +2303,7 @@ ubuntu-no-stack-protector.diff, doko
+ system-lpsolve-rpath.diff, rengelha
+ #gccXXXXX.solenv.javaregistration.diff
+ ubuntu-mstopdf.diff, ccheney
++f11-fullscreen.diff, ccheney
+
+ [ UbuntuOnly ]
+ unxlngi6-notune.diff, doko
+@@ -3574,6 +3575,7 @@ connectivity-build-fix.diff, i#107957, fridrich
oowintool-java6.diff, fridrich
connectivity-build-fix-mac.diff, thorsten
vcl-xinerama-clone-fix.diff, n#578730, thorsten
@@ -36,12 +99,821 @@
[ HyphenFix ]
# László Németh's patch for hyphen module
+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
+index a6dbf23..0793c9d 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
+@@ -1,32 +1,32 @@
+---- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2007-12-12 15:35:44.000000000 +0000
+-+++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2010-03-15 11:57:20.000000000 +0000
+-@@ -8,15 +8,22 @@
+- .global privateSnippetExecutor
+- .type privateSnippetExecutor, %function
+- privateSnippetExecutor:
+-+ .fnstart @ start of unwinder entry
+-+
+- stmfd sp!, {r0-r3} @ follow other parameters on stack
+-+ .pad #16 @ throw this data away on exception
+- mov r0, ip @ r0 points to functionoffset/vtable
+-- mov ip, sp @ fix up the ip
+-- stmfd sp!, {fp,ip,lr,pc} @ 8 x 4 => stack remains 8 aligned
+-- sub fp, ip, #4 @ set frame pointer
+-+ mov r1, sp @ r1 points to this and params
+-+ @ (see cppuno.cxx:codeSnippet())
+-+ stmfd sp!, {r4,lr} @ save return address
+-+ @ (r4 pushed to preserve stack alignment)
+-+ .save {r4,lr} @ restore these regs on exception
+-
+-- add r1, sp, #16 @ r1 points to this and params
+- bl cpp_vtable_call(PLT)
+-
+-- add sp, sp, #32 @ restore stack
+-- ldr fp, [sp, #-32] @ restore frame pointer
+-- ldr pc, [sp, #-24] @ return
+-+ add sp, sp, #4 @ no need to restore r4 (we didn't touch it)
+-+ ldr pc, [sp], #20 @ return, discarding function arguments
+-+
+-+ .fnend @ end of unwinder entry
+-+
+-+ .size privateSnippetExecutor, . - privateSnippetExecutor
++--- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s.old 2010-02-02 12:49:41.000000000 +0100
+++++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2010-03-29 16:45:43.000000000 +0200
++@@ -8,15 +8,22 @@
++ .global privateSnippetExecutor
++ .type privateSnippetExecutor, %function
++ privateSnippetExecutor:
+++ .fnstart @ start of unwinder entry
+++
++ stmfd sp!, {r0-r3} @ follow other parameters on stack
+++ .pad #16 @ throw this data away on exception
++ mov r0, ip @ r0 points to functionoffset/vtable
++- mov ip, sp @ fix up the ip
++- stmfd sp!, {fp,ip,lr,pc} @ 8 x 4 => stack remains 8 aligned
++- sub fp, ip, #4 @ set frame pointer
+++ mov r1, sp @ r1 points to this and params
+++ @ (see cppuno.cxx:codeSnippet())
+++ stmfd sp!, {r4,lr} @ save return address
+++ @ (r4 pushed to preserve stack alignment)
+++ .save {r4,lr} @ restore these regs on exception
++
++- add r1, sp, #16 @ r1 points to this and params
++ bl cpp_vtable_call(PLT)
++
++- add sp, sp, #32 @ restore stack
++- ldr fp, [sp, #-32] @ restore frame pointer
++- ldr pc, [sp, #-24] @ return
+++ add sp, sp, #4 @ no need to restore r4 (we didn't touch it)
+++ ldr pc, [sp], #20 @ return, discarding function arguments
+++
+++ .fnend @ end of unwinder entry
+++
+++ .size privateSnippetExecutor, . - privateSnippetExecutor
+diff --git a/patches/dev300/f11-fullscreen.diff b/patches/dev300/f11-fullscreen.diff
+new file mode 100644
+index 0000000..3da57bf
+--- /dev/null
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/f11-fullscreen.diff
+@@ -0,0 +1,467 @@
++--- officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 2010-03-25 20:30:12 +0000
+++++ officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 2010-03-26 05:06:54 +0000
++@@ -469,7 +469,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -1036,7 +1036,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -1442,7 +1442,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -1984,7 +1984,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -2473,7 +2473,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -3093,7 +3093,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -3713,7 +3713,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -4318,7 +4318,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++@@ -4928,7 +4928,7 @@
++ </node>
++ <node oor:name="F11" oor:op="replace">
++ <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
++- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
+++ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
++ </prop>
++ </node>
++ <node oor:name="F11_MOD1" oor:op="replace">
++
++--- sc/uiconfig/scalc/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
+++++ sc/uiconfig/scalc/accelerator/de/default.xml 2010-03-26 04:05:22 +0000
++@@ -4,7 +4,7 @@
++ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
++ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
++ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
++
++--- sc/uiconfig/scalc/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
+++++ sc/uiconfig/scalc/accelerator/en-GB/default.xml 2010-03-26 04:05:22 +0000
++@@ -4,7 +4,7 @@
++ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
++ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
++ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
++
++--- sc/uiconfig/scalc/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
+++++ sc/uiconfig/scalc/accelerator/en-US/default.xml 2010-03-26 04:05:22 +0000
++@@ -4,7 +4,7 @@
++ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
++ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
++ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
++
++--- sc/uiconfig/scalc/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
+++++ sc/uiconfig/scalc/accelerator/es/default.xml 2010-03-26 04:05:22 +0000
++@@ -4,7 +4,7 @@
++ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
++ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
++ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
++
++--- sc/uiconfig/scalc/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
+++++ sc/uiconfig/scalc/accelerator/fr/default.xml 2010-03-26 04:05:22 +0000
++@@ -4,7 +4,7 @@
++ <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
++ <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
++ <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
++
++--- sw/uiconfig/sglobal/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sglobal/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sglobal/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sglobal/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sglobal/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sglobal/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sglobal/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sglobal/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sglobal/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sglobal/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sweb/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sweb/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sweb/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sweb/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sweb/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sweb/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sweb/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sweb/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/sweb/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/sweb/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swform/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swform/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
++@@ -37,7 +37,7 @@
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
++
++--- sw/uiconfig/swform/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swform/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
++@@ -38,7 +38,7 @@
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
++
++--- sw/uiconfig/swform/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swform/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
++@@ -36,7 +36,7 @@
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
++
++--- sw/uiconfig/swform/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swform/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
++@@ -37,7 +37,7 @@
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
++ <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
++
++--- sw/uiconfig/swreport/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swreport/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swreport/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swreport/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swreport/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swreport/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swreport/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swreport/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swreport/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swreport/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swriter/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swriter/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swriter/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swriter/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swriter/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swriter/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swriter/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swriter/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swriter/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swriter/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swxform/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swxform/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swxform/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swxform/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swxform/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swxform/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swxform/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swxform/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
++--- sw/uiconfig/swxform/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
+++++ sw/uiconfig/swxform/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
++@@ -1,6 +1,6 @@
++ <?xml version="1.0" encoding="UTF-8"?>
++ <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel"; xmlns:xlink="http://www.w3.org/1999/xlink";>
++- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
+++ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
++ <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
++ <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
++
+diff --git a/patches/dev300/human-icons-add.diff b/patches/dev300/human-icons-add.diff
+index 295c375..1f6673f 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/human-icons-add.diff
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/human-icons-add.diff
+@@ -1,9 +1,41 @@
+---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-09-26 21:13:11 +0000
+-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-09-26 21:21:30 +0000
+-@@ -5588,6 +5588,11 @@
+- <desc>Oxygen - the KDE4 default theme</desc>
+- </info>
+- </enumeration>
++--- binfilter/bf_svtools/source/config/svt_miscopt.cxx 2010-03-25 20:30:12 +0000
+++++ binfilter/bf_svtools/source/config/svt_miscopt.cxx 2010-03-25 21:02:18 +0000
++@@ -268,6 +268,7 @@
++ case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
++ case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL;
++ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
+++ case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
++ }
++
++ return SFX_SYMBOLS_STYLE_AUTO;
++@@ -283,6 +284,7 @@
++ case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
++ case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL;
++ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
+++ case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
++ }
++
++ return STYLE_SYMBOLS_AUTO;
++
++--- binfilter/inc/bf_svtools/imgdef.hxx 2010-03-25 20:30:12 +0000
+++++ binfilter/inc/bf_svtools/imgdef.hxx 2010-03-25 21:03:12 +0000
++@@ -48,7 +48,8 @@
++ SFX_SYMBOLS_STYLE_HICONTRAST,
++ SFX_SYMBOLS_STYLE_INDUSTRIAL,
++ SFX_SYMBOLS_STYLE_CRYSTAL,
++- SFX_SYMBOLS_STYLE_TANGO
+++ SFX_SYMBOLS_STYLE_TANGO,
+++ SFX_SYMBOLS_STYLE_HUMAN
++ };
++
++ #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
++
++--- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-25 20:30:12 +0000
+++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-25 20:58:36 +0000
++@@ -5839,6 +5839,11 @@
++ <desc>Oxygen - the KDE4 default theme</desc>
++ </info>
++ </enumeration>
+ + <enumeration oor:value="human">
+ + <info>
+ + <desc>Human - the Gnome default theme for Ubuntu</desc>
+@@ -13,25 +45,24 @@
+ <value>auto</value>
+ </prop>
+
+---- solenv/inc/settings.mk 2008-09-26 21:13:11 +0000
+-+++ solenv/inc/settings.mk 2008-09-26 21:24:30 +0000
+-@@ -989,6 +989,9 @@
+- RSCDEFS+= -DDEBUG
+- .ENDIF
+-
+-+# additional image sets
++--- packimages/pack/makefile.mk 2010-03-25 20:30:12 +0000
+++++ packimages/pack/makefile.mk 2010-03-25 21:09:53 +0000
++@@ -41,7 +41,7 @@
++ IMAGES := $(COMMONBIN)$/images.zip
++ SORTED_LIST=$(RES)$/img$/sorted.lst
++ # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
++-CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen
+ +CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen human
+-+
+- # settings for mozilla idl compiler
+- XPIDL=xpidl
+- XPIDL_LINK=xpt_link
++ CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
++ CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
++ CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
+
+---- svtools/inc/imgdef.hxx 2008-09-26 21:13:11 +0000
+-+++ svtools/inc/imgdef.hxx 2008-09-26 21:25:01 +0000
+-@@ -46,7 +46,8 @@
++--- svtools/inc/imgdef.hxx 2010-03-25 20:30:12 +0000
+++++ svtools/inc/imgdef.hxx 2010-03-25 20:59:24 +0000
++@@ -47,7 +47,8 @@
+ SFX_SYMBOLS_STYLE_CRYSTAL,
+ SFX_SYMBOLS_STYLE_TANGO,
+- SFX_SYMBOLS_STYLE_CLASSIC,
++ SFX_SYMBOLS_STYLE_CLASSIC,
+ - SFX_SYMBOLS_STYLE_OXYGEN
+ + SFX_SYMBOLS_STYLE_OXYGEN,
+ + SFX_SYMBOLS_STYLE_HUMAN
+@@ -39,130 +70,69 @@
+
+ #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
+
+---- svtools/source/config/miscopt.cxx 2008-09-26 21:13:11 +0000
+-+++ svtools/source/config/miscopt.cxx 2008-09-26 21:26:12 +0000
+-@@ -275,6 +275,7 @@
++--- svtools/source/config/miscopt.cxx 2010-03-25 20:30:12 +0000
+++++ svtools/source/config/miscopt.cxx 2010-03-25 21:00:18 +0000
++@@ -317,6 +317,7 @@
+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
+ case STYLE_SYMBOLS_CLASSIC: return SFX_SYMBOLS_STYLE_CLASSIC;
+- case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
++ case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
+ + case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
+ }
+
+ return SFX_SYMBOLS_STYLE_AUTO;
+-@@ -291,6 +292,7 @@
++@@ -334,6 +335,7 @@
+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
+ case SFX_SYMBOLS_STYLE_CLASSIC: return STYLE_SYMBOLS_CLASSIC;
+- case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
++ case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
+ + case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
+ }
+
+ return STYLE_SYMBOLS_AUTO;
+
+---- vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
+-+++ vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
++--- svx/source/cui/optgdlg.src 2010-03-25 20:30:12 +0000
+++++ svx/source/cui/optgdlg.src 2010-03-25 21:14:27 +0000
++@@ -265,6 +265,7 @@
++ < "Tango" ; > ;
++ < "Classic" ; > ;
++ < "Oxygen" ; > ;
+++ < "Human" ; > ;
++ };
++ };
++ CheckBox CB_SYSTEM_FONT
++
++--- vcl/inc/vcl/settings.hxx 2010-03-25 20:30:12 +0000
+++++ vcl/inc/vcl/settings.hxx 2010-03-25 21:00:57 +0000
+ @@ -525,7 +525,8 @@
+- #define STYLE_SYMBOLS_TANGO ((ULONG)5)
+- #define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
+- #define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
+--#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
+-+#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
+-+#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9)
++ #define STYLE_SYMBOLS_TANGO ((ULONG)5)
++ #define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
++ #define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
++-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
+++#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
+++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9)
+
+ #define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
+
+---- vcl/source/app/settings.cxx 2008-09-26 21:13:11 +0000
+-+++ vcl/source/app/settings.cxx 2008-09-26 21:39:55 +0000
+-@@ -52,6 +52,11 @@
+- #include "tools/postwin.h"
+- #endif
+-
+-+extern "C" {
+-+#include <unistd.h>
+-+#include <string.h>
+-+}
+-+
+- using namespace rtl;
+-
+- // =======================================================================
+-@@ -701,6 +706,7 @@
++
++--- vcl/source/app/settings.cxx 2010-03-25 20:30:12 +0000
+++++ vcl/source/app/settings.cxx 2010-03-25 21:25:20 +0000
++@@ -712,6 +712,7 @@
+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
+ case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" );
+- case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
++ case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
+ + case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString::createFromAscii( "human" );
+ }
+
+ return ::rtl::OUString::createFromAscii( "auto" );
+-@@ -734,6 +735,8 @@
+- return STYLE_SYMBOLS_CLASSIC;
+- else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
+- return STYLE_SYMBOLS_OXYGEN;
++@@ -735,6 +736,8 @@
++ return STYLE_SYMBOLS_CLASSIC;
++ else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
++ return STYLE_SYMBOLS_OXYGEN;
+ + else if ( rName == ::rtl::OUString::createFromAscii( "human" ) )
+ + return STYLE_SYMBOLS_HUMAN;
+-
+- return STYLE_SYMBOLS_AUTO;
+- }
+-@@ -768,22 +764,50 @@
+
+- // -----------------------------------------------------------------------
+-
+-+ULONG SymbolsStyleOrAuto (ULONG nStyle)
+-+{
+-+ // if the images*.zip file doesn't exist, fall back to auto
+-+ if ( nStyle != STYLE_SYMBOLS_AUTO )
+-+ {
+-+ char zipfile[100] = "/usr/lib/openoffice/basis-link/share/config/images";
+-+ switch ( nStyle )
+-+ {
+-+ case STYLE_SYMBOLS_DEFAULT: strcat (zipfile, ""); break;
+-+ case STYLE_SYMBOLS_HICONTRAST: strcat (zipfile, "_hicontrast"); break;
+-+ case STYLE_SYMBOLS_INDUSTRIAL: strcat (zipfile, "_industrial"); break;
+-+ case STYLE_SYMBOLS_CRYSTAL: strcat (zipfile, "_crystal"); break;
+-+ case STYLE_SYMBOLS_TANGO: strcat (zipfile, "_tango"); break;
+-+ case STYLE_SYMBOLS_CLASSIC: strcat (zipfile, "_classic"); break;
+-+ case STYLE_SYMBOLS_OXYGEN: strcat (zipfile, "_oxygen"); break;
+-+ case STYLE_SYMBOLS_HUMAN: strcat (zipfile, "_human"); break;
+-+ }
+-+ strcat (zipfile, ".zip");
+-+ if ( access( zipfile, R_OK ) )
+-+ nStyle = STYLE_SYMBOLS_AUTO;
+-+ }
+-+ return nStyle;
+-+}
+-+
+-+// -----------------------------------------------------------------------
+-+
+- ULONG StyleSettings::GetCurrentSymbolsStyle() const
+- {
+- // style selected in Tools -> Options... -> OpenOffice.org -> View
+- ULONG nStyle = GetSymbolsStyle();
+-+ nStyle = SymbolsStyleOrAuto(nStyle);
+-
+- if ( nStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nStyle) ) )
+- {
+- // the preferred style can be read from the desktop setting by the desktop native widgets modules
+- ULONG nPreferredStyle = GetPreferredSymbolsStyle();
+-+ nPreferredStyle = SymbolsStyleOrAuto(nPreferredStyle);
+-
+- if ( nPreferredStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nPreferredStyle) ) )
+- {
+-
+- // use a hardcoded desktop-specific fallback if no preferred style has been detected
+- static bool sbFallbackDesktopChecked = false;
+-- static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
+-+ static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_HUMAN;
+-
+- if ( !sbFallbackDesktopChecked )
+- {
+-@@ -793,7 +828,7 @@
+- ULONG StyleSettings::GetAutoSymbolsStyle() const
+- {
+- const ::rtl::OUString& rDesktopEnvironment = Application::GetDesktopEnvironment();
+-- ULONG nRet = STYLE_SYMBOLS_DEFAULT;
+-+ ULONG nRet = STYLE_SYMBOLS_HUMAN;
+- bool bCont = true;
+-
+- try
+-@@ -814,7 +849,7 @@
++ return STYLE_SYMBOLS_AUTO;
++ }
++@@ -830,7 +833,7 @@
+ {
+ if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
+ rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
+@@ -170,5 +140,5 @@
+ + nRet = STYLE_SYMBOLS_HUMAN;
+ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+ nRet = STYLE_SYMBOLS_CRYSTAL;
+- }
++ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
+
diff --git a/patches/dev300/vcl-stl-fix.diff b/patches/dev300/vcl-stl-fix.diff
new file mode 100644
-index 0000000..549ed3c
+index 0000000..0452d9f
--- /dev/null
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/vcl-stl-fix.diff
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,62 @@
+Fix iterator handliŋ for drawPolygon
+
+From: Thorsten Behrens <tbehrens@novell.com>
@@ -104,14 +976,3 @@
+
+ // prepare to split the old trapezoid and keep its upper part
+ // find the old trapezoids entry in the VerticalTrapSet and remove it
-+@@ -1463,7 +1477,10 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
-+ for(; aVTSit != aVTSPair.second; ++aVTSit )
-+ {
-+ if( *aVTSit != *aActiveTrapsIt )
-++ {
-++ ++aActiveTrapsIt;
-+ continue;
-++ }
-+ aVerticalTraps.erase( aVTSit );
-+ break;
-+ }
=== modified file 'patches/series'
--- a/patches/series 2010-04-01 20:32:16 +0000
+++ b/patches/series 2010-04-06 21:43:08 +0000
@@ -1,4 +1,4 @@
-branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff
+branch-update-bc571534c9b7435429003010d733e9c3a34df32d.diff
update-mysqlc.diff
cws-linuxaxp01.diff
fix-system-redland.diff
Reply to: