1
Description: Upstream changes introduced in version 1:3.2.0-5ubuntu1
2
This patch has been created by dpkg-source during the package build.
3
Here's the last changelog entry, hopefully it gives details on why
4
those changes were made:
6
openoffice.org (1:3.2.0-5ubuntu1) lucid; urgency=low
10
The person named in the Author field signed this changelog entry.
11
Author: Chris Cheney <ccheney@ubuntu.com>
14
The information above should follow the Patch Tagging Guidelines, please
15
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
16
are templates for supplementary fields that you might want to add:
18
Origin: <vendor|upstream|other>, <url of original patch>
19
Bug: <url in upstream bugtracker>
20
Bug-Debian: http://bugs.debian.org/<bugnumber>
21
Forwarded: <no|not-needed|url proving that it has been forwarded>
22
Reviewed-By: <name and email of someone who approved the patch>
23
Last-Update: <YYYY-MM-DD>
25
--- openoffice.org-3.2.0.orig/ooo-build-3-2-0-9/patches/dev300/apply
26
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
27
@@ -2294,7 +2294,8 @@ SectionOwner => ccheney
30
ubuntu-dictionary.diff
31
-ubuntu-lpi.diff, i#64895, mklose
32
+ubuntu-lpi-help-translate.diff, i#64895, mklose
33
+#ubuntu-lpi-bugs.diff, i#64895, mklose
34
ubuntu-sparc-hack.diff, mklose
35
human-icons-add.diff, mklose
36
static-libs-use-_pic.diff, rengelha
38
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/ubuntu-lpi-help-translate.diff
40
+=== modified file 'basctl/uiconfig/basicide/menubar/menubar.xml'
41
+--- basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 21:10:42 +0000
42
++++ basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 21:59:44 +0000
44
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
45
+ <menu:menuseparator/>
46
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
47
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
48
+ <menu:menuseparator/>
49
+ <menu:menuitem menu:id=".uno:About"/>
52
+=== modified file 'chart2/uiconfig/menubar/menubar.xml'
53
+--- chart2/uiconfig/menubar/menubar.xml 2010-04-06 21:10:42 +0000
54
++++ chart2/uiconfig/menubar/menubar.xml 2010-04-06 21:59:59 +0000
56
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
57
+ <menu:menuseparator/>
58
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
59
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
60
+ <menu:menuseparator/>
61
+ <menu:menuitem menu:id=".uno:About"/>
64
+=== modified file 'dbaccess/uiconfig/dbapp/menubar/menubar.xml'
65
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 21:10:42 +0000
66
++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 22:00:03 +0000
68
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
69
+ <menu:menuseparator/>
70
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
71
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
72
+ <menu:menuseparator/>
73
+ <menu:menuitem menu:id=".uno:About"/>
76
+=== modified file 'dbaccess/uiconfig/dbquery/menubar/menubar.xml'
77
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 21:10:42 +0000
78
++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 22:00:05 +0000
80
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
81
+ <menu:menuseparator/>
82
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
83
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
84
+ <menu:menuseparator/>
85
+ <menu:menuitem menu:id=".uno:About"/>
88
+=== modified file 'dbaccess/uiconfig/dbrelation/menubar/menubar.xml'
89
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 21:10:42 +0000
90
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 22:00:10 +0000
92
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
93
+ <menu:menuseparator/>
94
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
95
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
96
+ <menu:menuseparator/>
97
+ <menu:menuitem menu:id=".uno:About"/>
100
+=== modified file 'dbaccess/uiconfig/dbtable/menubar/menubar.xml'
101
+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 21:10:42 +0000
102
++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 22:00:15 +0000
104
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
105
+ <menu:menuseparator/>
106
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
107
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
108
+ <menu:menuseparator/>
109
+ <menu:menuitem menu:id=".uno:About"/>
112
+=== modified file 'dbaccess/uiconfig/dbtdata/menubar/menubar.xml'
113
+--- dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 21:10:42 +0000
114
++++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 22:00:18 +0000
116
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
117
+ <menu:menuseparator/>
118
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
119
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
120
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
121
+ <menu:menuseparator/>
122
+ <menu:menuitem menu:id=".uno:About"/>
125
+=== modified file 'extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml'
126
+--- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 21:10:42 +0000
127
++++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 22:00:21 +0000
129
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
130
+ <menu:menuseparator/>
131
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
132
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
133
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
134
+ <menu:menuseparator/>
135
+ <menu:menuitem menu:id=".uno:About"/>
138
+=== modified file 'framework/uiconfig/startmodule/menubar/menubar.xml'
139
+--- framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 21:10:42 +0000
140
++++ framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 22:00:23 +0000
142
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
143
+ <menu:menuseparator/>
144
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
145
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
146
+ <menu:menuseparator/>
147
+ <menu:menuitem menu:id=".uno:About"/>
150
+=== modified file 'helpcontent2/helpers/help_hid.lst'
151
+--- helpcontent2/helpers/help_hid.lst 2010-04-06 21:10:42 +0000
152
++++ helpcontent2/helpers/help_hid.lst 2010-04-06 22:00:30 +0000
153
+@@ -5387,6 +5387,7 @@
154
+ SID_HELP_PI,5962,.uno:HelperDialog
155
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
156
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
157
++SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
158
+ SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
159
+ SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
160
+ SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
162
+=== modified file 'helpcontent2/helpers/longnames_commands.csv'
163
+--- helpcontent2/helpers/longnames_commands.csv 2010-04-06 21:10:42 +0000
164
++++ helpcontent2/helpers/longnames_commands.csv 2010-04-06 22:00:33 +0000
165
+@@ -1246,6 +1246,7 @@
166
+ SID_HELP_PI,.uno:HelperDialog
167
+ SID_HELP_SEARCH,.uno:HelpSearch
168
+ SID_HELP_SUPPORTPAGE,.uno:HelpSupport
169
++SID_HELP_TRANSLATEPAGE,.uno:HelpTranslate
170
+ SID_HELP_TUTORIALS,.uno:HelpTutorials
171
+ SID_HELP_ZOOMIN,.uno:HelpZoomIn
172
+ SID_HELP_ZOOMOUT,.uno:HelpZoomOut
174
+=== modified file 'helpcontent2/helpers/uno-commands.csv'
175
+--- helpcontent2/helpers/uno-commands.csv 2010-04-06 21:10:42 +0000
176
++++ helpcontent2/helpers/uno-commands.csv 2010-04-06 22:00:35 +0000
183
+ .uno:HelplinesFront
186
+=== modified file 'helpcontent2/helpers/uno_hid.lst'
187
+--- helpcontent2/helpers/uno_hid.lst 2010-04-06 21:10:42 +0000
188
++++ helpcontent2/helpers/uno_hid.lst 2010-04-06 22:00:40 +0000
189
+@@ -1244,6 +1244,7 @@
190
+ SID_HELP_PI,5962,.uno:HelperDialog
191
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
192
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
193
++SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
194
+ SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
195
+ SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
196
+ SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
198
+=== modified file 'helpcontent2/helpers/unocmds.txt'
199
+--- helpcontent2/helpers/unocmds.txt 2010-04-06 21:10:42 +0000
200
++++ helpcontent2/helpers/unocmds.txt 2010-04-06 22:00:43 +0000
202
+ .uno:HelpOnHelp;shared/05/00000110.xhp
203
+ .uno:HelpSupport;shared/main0108.xhp
204
+ .uno:HelpTip;shared/00/00000099.xhp
205
++.uno:HelpTranslate;shared/main0108.xhp
206
+ .uno:HelperDialog;shared/00/00000099.xhp
207
+ .uno:HelplinesFront;shared/optionen/01050100.xhp
208
+ .uno:HelplinesMove;shared/02/01171400.xhp
210
+=== modified file 'officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu'
211
+--- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 21:10:42 +0000
212
++++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 22:00:54 +0000
213
+@@ -4090,7 +4090,14 @@
215
+ <node oor:name=".uno:HelpSupport" oor:op="replace">
216
+ <prop oor:name="Label" oor:type="xs:string">
217
+- <value xml:lang="en-US">~Support</value>
218
++ <value xml:lang="de">~Online-Hilfe...</value>
219
++ <value xml:lang="en-US">~Get Help Online...</value>
222
++ <node oor:name=".uno:HelpTranslate" oor:op="replace">
223
++ <prop oor:name="Label" oor:type="xs:string">
224
++ <value xml:lang="de">Diese Anwendung ~übersetzen...</value>
225
++ <value xml:lang="en-US">T~ranslate This Application...</value>
228
+ <node oor:name=".uno:StatusBarVisible" oor:op="replace">
230
+=== modified file 'reportdesign/uiconfig/dbreport/menubar/menubar.xml'
231
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 21:10:42 +0000
232
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 22:00:57 +0000
234
+ <menu:menuitem menu:id=".uno:HelperDialog"/>
235
+ <menu:menuseparator/>
236
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
237
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
238
+ <menu:menuseparator/>
239
+ <menu:menuitem menu:id=".uno:About"/>
242
+=== modified file 'sc/uiconfig/scalc/menubar/menubar.xml'
243
+--- sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 21:10:42 +0000
244
++++ sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 22:00:59 +0000
246
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
247
+ <menu:menuseparator/>
248
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
249
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
250
+ <menu:menuseparator/>
251
+ <menu:menuitem menu:id=".uno:About"/>
254
+=== modified file 'scripting/workben/bindings/calcmenubar.xml'
255
+--- scripting/workben/bindings/calcmenubar.xml 2010-04-06 21:10:42 +0000
256
++++ scripting/workben/bindings/calcmenubar.xml 2010-04-06 22:01:20 +0000
258
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
259
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
260
+ <menu:menuseparator/>
261
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
262
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
263
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
264
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
265
+ <menu:menuseparator/>
266
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
268
+=== modified file 'scripting/workben/bindings/drawmenubar.xml'
269
+--- scripting/workben/bindings/drawmenubar.xml 2010-04-06 21:10:42 +0000
270
++++ scripting/workben/bindings/drawmenubar.xml 2010-04-06 22:01:25 +0000
272
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
273
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
274
+ <menu:menuseparator/>
275
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
276
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
277
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
278
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
279
+ <menu:menuseparator/>
280
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
282
+=== modified file 'scripting/workben/bindings/impressmenubar.xml'
283
+--- scripting/workben/bindings/impressmenubar.xml 2010-04-06 21:10:42 +0000
284
++++ scripting/workben/bindings/impressmenubar.xml 2010-04-06 22:01:29 +0000
286
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
287
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
288
+ <menu:menuseparator/>
289
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
290
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
291
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
292
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
293
+ <menu:menuseparator/>
294
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
296
+=== modified file 'scripting/workben/bindings/writermenubar.xml'
297
+--- scripting/workben/bindings/writermenubar.xml 2010-04-06 21:10:42 +0000
298
++++ scripting/workben/bindings/writermenubar.xml 2010-04-06 22:01:31 +0000
300
+ <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
301
+ <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
302
+ <menu:menuseparator/>
303
+- <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
304
++ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
305
++ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
306
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
307
+ <menu:menuseparator/>
308
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
310
+=== modified file 'sd/uiconfig/sdraw/menubar/menubar.xml'
311
+--- sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 21:10:42 +0000
312
++++ sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 22:01:34 +0000
314
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
315
+ <menu:menuseparator/>
316
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
317
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
318
+ <menu:menuseparator/>
319
+ <menu:menuitem menu:id=".uno:About"/>
322
+=== modified file 'sd/uiconfig/simpress/menubar/menubar.xml'
323
+--- sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 21:10:42 +0000
324
++++ sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 22:01:36 +0000
326
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
327
+ <menu:menuseparator/>
328
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
329
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
330
+ <menu:menuseparator/>
331
+ <menu:menuitem menu:id=".uno:About"/>
334
+=== modified file 'sfx2/inc/sfx2/sfxsids.hrc'
335
+--- sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 21:10:42 +0000
336
++++ sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 22:01:50 +0000
338
+ #define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
339
+ #define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
340
+ #define SID_HELP_SUPPORTPAGE (SID_SFX_START + 1683)
341
++#define SID_HELP_TRANSLATEPAGE (SID_SFX_START + 1712)
342
+ #define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
344
+ // default-ids for document
346
+=== modified file 'sfx2/sdi/appslots.sdi'
347
+--- sfx2/sdi/appslots.sdi 2010-04-06 21:10:42 +0000
348
++++ sfx2/sdi/appslots.sdi 2010-04-06 22:01:59 +0000
349
+@@ -174,6 +174,10 @@
351
+ ExecMethod = MiscExec_Impl ;
353
++ SID_HELP_TRANSLATEPAGE
355
++ ExecMethod = MiscExec_Impl ;
361
+=== modified file 'sfx2/sdi/sfx.sdi'
362
+--- sfx2/sdi/sfx.sdi 2010-04-06 21:10:42 +0000
363
++++ sfx2/sdi/sfx.sdi 2010-04-06 22:02:15 +0000
364
+@@ -7969,6 +7969,31 @@
367
+ //--------------------------------------------------------------------------
368
++SfxVoidItem HelpTranslate SID_HELP_TRANSLATEPAGE
372
++ AutoUpdate = FALSE,
373
++ Cachable = Cachable,
375
++ HasCoreId = FALSE,
376
++ HasDialog = FALSE,
377
++ ReadOnlyDoc = TRUE,
379
++ Container = FALSE,
380
++ RecordAbsolute = FALSE,
385
++ AccelConfig = TRUE,
386
++ MenuConfig = TRUE,
387
++ StatusBarConfig = FALSE,
388
++ ToolBoxConfig = TRUE,
389
++ GroupId = GID_APPLICATION;
392
++//--------------------------------------------------------------------------
393
+ SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
397
+=== modified file 'sfx2/source/appl/appserv.cxx'
398
+--- sfx2/source/appl/appserv.cxx 2010-04-06 21:10:42 +0000
399
++++ sfx2/source/appl/appserv.cxx 2010-04-06 22:02:26 +0000
400
+@@ -346,9 +346,35 @@
404
++ case SID_HELP_SUPPORTPAGE:
407
++ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
408
++ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
409
++ if ( xSystemShell.is())
410
++ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -i")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
413
++ } catch (const ::com::sun::star::uno::Exception &) {
418
++ case SID_HELP_TRANSLATEPAGE:
421
++ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
422
++ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
423
++ if ( xSystemShell.is())
424
++ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -t")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
427
++ } catch (const ::com::sun::star::uno::Exception &) {
431
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
432
+ case SID_HELPINDEX:
433
+- case SID_HELP_SUPPORTPAGE:
435
+ Help* pHelp = Application::GetHelp();
438
+=== modified file 'sfx2/source/appl/makefile.mk'
439
+--- sfx2/source/appl/makefile.mk 2010-04-06 21:10:42 +0000
440
++++ sfx2/source/appl/makefile.mk 2010-04-06 21:39:50 +0000
443
+ CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST)
445
++CFLAGS+=-DUBUNTU_RELEASE=\"$(shell lsb_release -cs)\"
447
+ # --- Files --------------------------------------------------------
450
+=== modified file 'starmath/uiconfig/smath/menubar/menubar.xml'
451
+--- starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 21:10:42 +0000
452
++++ starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 22:02:40 +0000
454
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
455
+ <menu:menuseparator/>
456
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
457
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
458
+ <menu:menuseparator/>
459
+ <menu:menuitem menu:id=".uno:About"/>
462
+=== modified file 'svx/inc/globlmn_tmpl.hrc'
463
+--- svx/inc/globlmn_tmpl.hrc 2010-04-06 21:10:42 +0000
464
++++ svx/inc/globlmn_tmpl.hrc 2010-04-06 22:02:49 +0000
465
+@@ -1062,7 +1062,15 @@
466
+ Identifier = SID_HELP_SUPPORTPAGE ; \
467
+ Command = ".uno:HelpSupport" ; \
468
+ HelpID = SID_HELP_SUPPORTPAGE ; \
469
+- Text [ en-US ] = "~Support" ; \
470
++ Text [ de ] = "~Online-Hilfe..." ; \
471
++ Text [ en-US ] = "Get Help ~Online..." ; \
473
++#define ITEM_HELP_TRANSLATEPAGE \
474
++ Identifier = SID_HELP_TRANSLATEPAGE ; \
475
++ Command = ".uno:HelpTranslate" ; \
476
++ HelpID = SID_HELP_TRANSLATEPAGE ; \
477
++ Text [ de ] = "Diese Anwendung ~�bersetzen..." ; \
478
++ Text [ en-US ] = "T~ranslate This Application..." ; \
480
+ #define ITEM_HELP_ONLINE_REGISTRATION \
481
+ Identifier = SID_ONLINE_REGISTRATION ; \
483
+=== modified file 'sw/uiconfig/sglobal/menubar/menubar.xml'
484
+--- sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 21:10:42 +0000
485
++++ sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 22:02:54 +0000
487
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
488
+ <menu:menuseparator/>
489
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
490
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
491
+ <menu:menuseparator/>
492
+ <menu:menuitem menu:id=".uno:About"/>
495
+=== modified file 'sw/uiconfig/sweb/menubar/menubar.xml'
496
+--- sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 21:10:42 +0000
497
++++ sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 22:02:57 +0000
499
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
500
+ <menu:menuseparator/>
501
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
502
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
503
+ <menu:menuseparator/>
504
+ <menu:menuitem menu:id=".uno:About"/>
507
+=== modified file 'sw/uiconfig/swform/menubar/menubar.xml'
508
+--- sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 21:10:42 +0000
509
++++ sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 22:03:00 +0000
511
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
512
+ <menu:menuseparator/>
513
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
514
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
515
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
516
+ <menu:menuseparator/>
517
+ <menu:menuitem menu:id=".uno:About"/>
520
+=== modified file 'sw/uiconfig/swreport/menubar/menubar.xml'
521
+--- sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 21:10:42 +0000
522
++++ sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 22:03:02 +0000
524
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
525
+ <menu:menuseparator/>
526
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
527
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
528
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
529
+ <menu:menuseparator/>
530
+ <menu:menuitem menu:id=".uno:About"/>
533
+=== modified file 'sw/uiconfig/swriter/menubar/menubar.xml'
534
+--- sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 21:10:42 +0000
535
++++ sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 22:03:04 +0000
537
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
538
+ <menu:menuseparator/>
539
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
540
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
541
+ <menu:menuseparator/>
542
+ <menu:menuitem menu:id=".uno:About"/>
545
+=== modified file 'sw/uiconfig/swxform/menubar/menubar.xml'
546
+--- sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 21:10:42 +0000
547
++++ sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 22:03:06 +0000
549
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
550
+ <menu:menuseparator/>
551
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
552
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
553
++ <menu:menuitem menu:id=".uno:HelpTranslate"/>
554
+ <menu:menuseparator/>
555
+ <menu:menuitem menu:id=".uno:About"/>
559
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/ubuntu-lpi-bugs.diff
561
+=== modified file 'basctl/uiconfig/basicide/menubar/menubar.xml'
562
+--- basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 22:13:54 +0000
563
++++ basctl/uiconfig/basicide/menubar/menubar.xml 2010-04-06 22:14:24 +0000
565
+ <menu:menuseparator/>
566
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
567
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
568
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
569
+ <menu:menuseparator/>
570
+ <menu:menuitem menu:id=".uno:About"/>
573
+=== modified file 'chart2/uiconfig/menubar/menubar.xml'
574
+--- chart2/uiconfig/menubar/menubar.xml 2010-04-06 22:13:54 +0000
575
++++ chart2/uiconfig/menubar/menubar.xml 2010-04-06 22:14:24 +0000
577
+ <menu:menuseparator/>
578
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
579
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
580
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
581
+ <menu:menuseparator/>
582
+ <menu:menuitem menu:id=".uno:About"/>
585
+=== modified file 'dbaccess/uiconfig/dbapp/menubar/menubar.xml'
586
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 22:13:54 +0000
587
++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml 2010-04-06 22:14:24 +0000
589
+ <menu:menuseparator/>
590
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
591
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
592
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
593
+ <menu:menuseparator/>
594
+ <menu:menuitem menu:id=".uno:About"/>
597
+=== modified file 'dbaccess/uiconfig/dbquery/menubar/menubar.xml'
598
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 22:13:54 +0000
599
++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml 2010-04-06 22:14:24 +0000
601
+ <menu:menuseparator/>
602
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
603
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
604
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
605
+ <menu:menuseparator/>
606
+ <menu:menuitem menu:id=".uno:About"/>
609
+=== modified file 'dbaccess/uiconfig/dbrelation/menubar/menubar.xml'
610
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 22:13:54 +0000
611
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml 2010-04-06 22:14:24 +0000
613
+ <menu:menuseparator/>
614
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
615
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
616
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
617
+ <menu:menuseparator/>
618
+ <menu:menuitem menu:id=".uno:About"/>
621
+=== modified file 'dbaccess/uiconfig/dbtable/menubar/menubar.xml'
622
+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 22:13:54 +0000
623
++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml 2010-04-06 22:14:24 +0000
625
+ <menu:menuseparator/>
626
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
627
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
628
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
629
+ <menu:menuseparator/>
630
+ <menu:menuitem menu:id=".uno:About"/>
633
+=== modified file 'dbaccess/uiconfig/dbtdata/menubar/menubar.xml'
634
+--- dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 22:13:54 +0000
635
++++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml 2010-04-06 22:14:24 +0000
637
+ <menu:menuseparator/>
638
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
639
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
640
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
641
+ <menu:menuseparator/>
642
+ <menu:menuitem menu:id=".uno:About"/>
645
+=== modified file 'extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml'
646
+--- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 22:13:54 +0000
647
++++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 2010-04-06 22:14:24 +0000
649
+ <menu:menuseparator/>
650
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
651
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
652
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
653
+ <menu:menuseparator/>
654
+ <menu:menuitem menu:id=".uno:About"/>
657
+=== modified file 'framework/uiconfig/startmodule/menubar/menubar.xml'
658
+--- framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 22:13:54 +0000
659
++++ framework/uiconfig/startmodule/menubar/menubar.xml 2010-04-06 22:14:24 +0000
661
+ <menu:menuseparator/>
662
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
663
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
664
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
665
+ <menu:menuseparator/>
666
+ <menu:menuitem menu:id=".uno:About"/>
669
+=== modified file 'helpcontent2/helpers/help_hid.lst'
670
+--- helpcontent2/helpers/help_hid.lst 2010-04-06 22:13:54 +0000
671
++++ helpcontent2/helpers/help_hid.lst 2010-04-06 22:14:24 +0000
672
+@@ -5385,6 +5385,7 @@
673
+ SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
674
+ SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
675
+ SID_HELP_PI,5962,.uno:HelperDialog
676
++SID_HELP_REPORTPROBLEM,6712,.uno:HelpReportProblem
677
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
678
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
679
+ SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
681
+=== modified file 'helpcontent2/helpers/longnames_commands.csv'
682
+--- helpcontent2/helpers/longnames_commands.csv 2010-04-06 22:13:54 +0000
683
++++ helpcontent2/helpers/longnames_commands.csv 2010-04-06 22:14:24 +0000
684
+@@ -1244,6 +1244,7 @@
685
+ SID_HELP_DOWNLOAD,.uno:HelpDownload
686
+ SID_HELP_HELPFILEBOX,.uno:HelpChooseFile
687
+ SID_HELP_PI,.uno:HelperDialog
688
++SID_HELP_REPORTPROBLEM,.uno:HelpReportProblem
689
+ SID_HELP_SEARCH,.uno:HelpSearch
690
+ SID_HELP_SUPPORTPAGE,.uno:HelpSupport
691
+ SID_HELP_TRANSLATEPAGE,.uno:HelpTranslate
693
+=== modified file 'helpcontent2/helpers/uno-commands.csv'
694
+--- helpcontent2/helpers/uno-commands.csv 2010-04-06 22:13:54 +0000
695
++++ helpcontent2/helpers/uno-commands.csv 2010-04-06 22:14:24 +0000
700
++.uno:HelpReportProblem
705
+=== modified file 'helpcontent2/helpers/uno_hid.lst'
706
+--- helpcontent2/helpers/uno_hid.lst 2010-04-06 22:13:54 +0000
707
++++ helpcontent2/helpers/uno_hid.lst 2010-04-06 22:14:24 +0000
708
+@@ -1242,6 +1242,7 @@
709
+ SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
710
+ SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
711
+ SID_HELP_PI,5962,.uno:HelperDialog
712
++SID_HELP_REPORTPROBLEM,6712,.uno:HelpReportProblem
713
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
714
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
715
+ SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
717
+=== modified file 'helpcontent2/helpers/unocmds.txt'
718
+--- helpcontent2/helpers/unocmds.txt 2010-04-06 22:13:54 +0000
719
++++ helpcontent2/helpers/unocmds.txt 2010-04-06 22:14:24 +0000
721
+ .uno:HelpIndex;shared/main0108.xhp
722
+ .uno:HelpMenu;shared/main0108.xhp
723
+ .uno:HelpOnHelp;shared/05/00000110.xhp
724
++.uno:HelpReportProblem;shared/main0108.xhp
725
+ .uno:HelpSupport;shared/main0108.xhp
726
+ .uno:HelpTip;shared/00/00000099.xhp
727
+ .uno:HelpTranslate;shared/main0108.xhp
729
+=== modified file 'officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu'
730
+--- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 22:13:54 +0000
731
++++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 2010-04-06 22:14:24 +0000
732
+@@ -4100,6 +4100,12 @@
733
+ <value xml:lang="en-US">T~ranslate This Application...</value>
736
++ <node oor:name=".uno:HelpReportProblem" oor:op="replace">
737
++ <prop oor:name="Label" oor:type="xs:string">
738
++ <value xml:lang="de">Einen ~Fehler melden...</value>
739
++ <value xml:lang="en-US">R~eport a Problem...</value>
742
+ <node oor:name=".uno:StatusBarVisible" oor:op="replace">
743
+ <prop oor:name="Label" oor:type="xs:string">
744
+ <value xml:lang="en-US">Status ~Bar</value>
746
+=== modified file 'reportdesign/uiconfig/dbreport/menubar/menubar.xml'
747
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 22:13:54 +0000
748
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml 2010-04-06 22:14:24 +0000
750
+ <menu:menuseparator/>
751
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
752
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
753
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
754
+ <menu:menuseparator/>
755
+ <menu:menuitem menu:id=".uno:About"/>
758
+=== modified file 'sc/uiconfig/scalc/menubar/menubar.xml'
759
+--- sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 22:13:54 +0000
760
++++ sc/uiconfig/scalc/menubar/menubar.xml 2010-04-06 22:14:24 +0000
762
+ <menu:menuseparator/>
763
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
764
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
765
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
766
+ <menu:menuseparator/>
767
+ <menu:menuitem menu:id=".uno:About"/>
770
+=== modified file 'scripting/workben/bindings/calcmenubar.xml'
771
+--- scripting/workben/bindings/calcmenubar.xml 2010-04-06 22:13:54 +0000
772
++++ scripting/workben/bindings/calcmenubar.xml 2010-04-06 22:14:24 +0000
774
+ <menu:menuseparator/>
775
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
776
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
777
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
778
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
779
+ <menu:menuseparator/>
780
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
782
+=== modified file 'scripting/workben/bindings/drawmenubar.xml'
783
+--- scripting/workben/bindings/drawmenubar.xml 2010-04-06 22:13:54 +0000
784
++++ scripting/workben/bindings/drawmenubar.xml 2010-04-06 22:14:24 +0000
786
+ <menu:menuseparator/>
787
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
788
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
789
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
790
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
791
+ <menu:menuseparator/>
792
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
794
+=== modified file 'scripting/workben/bindings/impressmenubar.xml'
795
+--- scripting/workben/bindings/impressmenubar.xml 2010-04-06 22:13:54 +0000
796
++++ scripting/workben/bindings/impressmenubar.xml 2010-04-06 22:14:24 +0000
798
+ <menu:menuseparator/>
799
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
800
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
801
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
802
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
803
+ <menu:menuseparator/>
804
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
806
+=== modified file 'scripting/workben/bindings/writermenubar.xml'
807
+--- scripting/workben/bindings/writermenubar.xml 2010-04-06 22:13:54 +0000
808
++++ scripting/workben/bindings/writermenubar.xml 2010-04-06 22:14:24 +0000
810
+ <menu:menuseparator/>
811
+ <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Get Help Online..."/>
812
+ <menu:menuitem menu:id="slot:6711" menu:helpid="6711" menu:label="T~ranslate This Application..."/>
813
++ <menu:menuitem menu:id="slot:6712" menu:helpid="6712" menu:label="R~eport a Problem..."/>
814
+ <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
815
+ <menu:menuseparator/>
816
+ <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
818
+=== modified file 'sd/uiconfig/sdraw/menubar/menubar.xml'
819
+--- sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 22:13:54 +0000
820
++++ sd/uiconfig/sdraw/menubar/menubar.xml 2010-04-06 22:14:24 +0000
822
+ <menu:menuseparator/>
823
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
824
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
825
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
826
+ <menu:menuseparator/>
827
+ <menu:menuitem menu:id=".uno:About"/>
830
+=== modified file 'sd/uiconfig/simpress/menubar/menubar.xml'
831
+--- sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 22:13:54 +0000
832
++++ sd/uiconfig/simpress/menubar/menubar.xml 2010-04-06 22:14:24 +0000
834
+ <menu:menuseparator/>
835
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
836
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
837
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
838
+ <menu:menuseparator/>
839
+ <menu:menuitem menu:id=".uno:About"/>
842
+=== modified file 'sfx2/inc/sfx2/sfxsids.hrc'
843
+--- sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 22:13:54 +0000
844
++++ sfx2/inc/sfx2/sfxsids.hrc 2010-04-06 22:14:24 +0000
846
+ #define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420)
847
+ #define SID_HELP_SUPPORTPAGE (SID_SFX_START + 1683)
848
+ #define SID_HELP_TRANSLATEPAGE (SID_SFX_START + 1712)
849
++#define SID_HELP_REPORTPROBLEM (SID_SFX_START + 1713)
850
+ #define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
852
+ // default-ids for document
854
+=== modified file 'sfx2/sdi/appslots.sdi'
855
+--- sfx2/sdi/appslots.sdi 2010-04-06 22:13:54 +0000
856
++++ sfx2/sdi/appslots.sdi 2010-04-06 22:14:24 +0000
857
+@@ -178,6 +178,10 @@
859
+ ExecMethod = MiscExec_Impl ;
861
++ SID_HELP_REPORTPROBLEM
863
++ ExecMethod = MiscExec_Impl ;
869
+=== modified file 'sfx2/sdi/sfx.sdi'
870
+--- sfx2/sdi/sfx.sdi 2010-04-06 22:13:54 +0000
871
++++ sfx2/sdi/sfx.sdi 2010-04-06 22:14:24 +0000
872
+@@ -7994,6 +7994,31 @@
875
+ //--------------------------------------------------------------------------
876
++SfxVoidItem HelpReportProblem SID_HELP_REPORTPROBLEM
880
++ AutoUpdate = FALSE,
881
++ Cachable = Cachable,
883
++ HasCoreId = FALSE,
884
++ HasDialog = FALSE,
885
++ ReadOnlyDoc = TRUE,
887
++ Container = FALSE,
888
++ RecordAbsolute = FALSE,
893
++ AccelConfig = TRUE,
894
++ MenuConfig = TRUE,
895
++ StatusBarConfig = FALSE,
896
++ ToolBoxConfig = TRUE,
897
++ GroupId = GID_APPLICATION;
900
++//--------------------------------------------------------------------------
901
+ SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
905
+=== modified file 'sfx2/source/appl/appserv.cxx'
906
+--- sfx2/source/appl/appserv.cxx 2010-04-06 22:13:54 +0000
907
++++ sfx2/source/appl/appserv.cxx 2010-04-06 22:14:24 +0000
908
+@@ -373,6 +373,19 @@
912
++ case SID_HELP_REPORTPROBLEM:
915
++ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
916
++ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
917
++ if ( xSystemShell.is())
918
++ xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/basis-link/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -b")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
921
++ } catch (const ::com::sun::star::uno::Exception &) {
925
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
926
+ case SID_HELPINDEX:
929
+=== modified file 'starmath/uiconfig/smath/menubar/menubar.xml'
930
+--- starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 22:13:54 +0000
931
++++ starmath/uiconfig/smath/menubar/menubar.xml 2010-04-06 22:14:24 +0000
933
+ <menu:menuseparator/>
934
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
935
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
936
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
937
+ <menu:menuseparator/>
938
+ <menu:menuitem menu:id=".uno:About"/>
941
+=== modified file 'svx/inc/globlmn_tmpl.hrc'
942
+--- svx/inc/globlmn_tmpl.hrc 2010-04-06 22:13:54 +0000
943
++++ svx/inc/globlmn_tmpl.hrc 2010-04-06 22:14:24 +0000
944
+@@ -1072,6 +1072,13 @@
945
+ Text [ de ] = "Diese Anwendung ~�bersetzen..." ; \
946
+ Text [ en-US ] = "T~ranslate This Application..." ; \
948
++#define ITEM_HELP_REPORTPROBLEM \
949
++ Identifier = SID_HELP_REPORTPROBLEM ; \
950
++ Command = ".uno:HelpReportProblem" ; \
951
++ HelpID = SID_HELP_REPORTPROBLEM ; \
952
++ Text [ de ] = "Einen ~Fehler melden..." ; \
953
++ Text [ en-US ] = "R~eport a Problem..." ; \
955
+ #define ITEM_HELP_ONLINE_REGISTRATION \
956
+ Identifier = SID_ONLINE_REGISTRATION ; \
957
+ Command = ".uno:OnlineRegistrationDlg" ; \
959
+=== modified file 'sw/uiconfig/sglobal/menubar/menubar.xml'
960
+--- sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 22:13:54 +0000
961
++++ sw/uiconfig/sglobal/menubar/menubar.xml 2010-04-06 22:14:24 +0000
963
+ <menu:menuseparator/>
964
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
965
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
966
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
967
+ <menu:menuseparator/>
968
+ <menu:menuitem menu:id=".uno:About"/>
971
+=== modified file 'sw/uiconfig/sweb/menubar/menubar.xml'
972
+--- sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 22:13:54 +0000
973
++++ sw/uiconfig/sweb/menubar/menubar.xml 2010-04-06 22:14:24 +0000
975
+ <menu:menuseparator/>
976
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
977
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
978
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
979
+ <menu:menuseparator/>
980
+ <menu:menuitem menu:id=".uno:About"/>
983
+=== modified file 'sw/uiconfig/swform/menubar/menubar.xml'
984
+--- sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 22:13:54 +0000
985
++++ sw/uiconfig/swform/menubar/menubar.xml 2010-04-06 22:14:24 +0000
987
+ <menu:menuseparator/>
988
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
989
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
990
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
991
+ <menu:menuseparator/>
992
+ <menu:menuitem menu:id=".uno:About"/>
995
+=== modified file 'sw/uiconfig/swreport/menubar/menubar.xml'
996
+--- sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 22:13:54 +0000
997
++++ sw/uiconfig/swreport/menubar/menubar.xml 2010-04-06 22:14:24 +0000
999
+ <menu:menuseparator/>
1000
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
1001
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
1002
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
1003
+ <menu:menuseparator/>
1004
+ <menu:menuitem menu:id=".uno:About"/>
1007
+=== modified file 'sw/uiconfig/swriter/menubar/menubar.xml'
1008
+--- sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 22:13:54 +0000
1009
++++ sw/uiconfig/swriter/menubar/menubar.xml 2010-04-06 22:14:24 +0000
1010
+@@ -453,6 +453,7 @@
1011
+ <menu:menuseparator/>
1012
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
1013
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
1014
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
1015
+ <menu:menuseparator/>
1016
+ <menu:menuitem menu:id=".uno:About"/>
1019
+=== modified file 'sw/uiconfig/swxform/menubar/menubar.xml'
1020
+--- sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 22:13:54 +0000
1021
++++ sw/uiconfig/swxform/menubar/menubar.xml 2010-04-06 22:14:24 +0000
1022
+@@ -446,6 +446,7 @@
1023
+ <menu:menuseparator/>
1024
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
1025
+ <menu:menuitem menu:id=".uno:HelpTranslate"/>
1026
++ <menu:menuitem menu:id=".uno:HelpReportProblem"/>
1027
+ <menu:menuseparator/>
1028
+ <menu:menuitem menu:id=".uno:About"/>