ooo-build r13447 - in trunk: . patches/dev300

From: ccheney svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13447 - in trunk: . patches/dev300
Date: Thu, 31 Jul 2008 05:06:26 +0000 (UTC)
Author: ccheney
Date: Thu Jul 31 05:06:26 2008
New Revision: 13447
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13447&view=rev

Log:
2008-07-30  Chris Cheney  <ccheney ubuntu com>

        * patches/dev300/ubuntu-lpi.diff: update patch for 3.0.0~beta2



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/ubuntu-lpi.diff

Modified: trunk/patches/dev300/ubuntu-lpi.diff
==============================================================================
--- trunk/patches/dev300/ubuntu-lpi.diff	(original)
+++ trunk/patches/dev300/ubuntu-lpi.diff	Thu Jul 31 05:06:26 2008
@@ -1,5 +1,5 @@
---- basctl/uiconfig/basicide/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ OOH680_m8.new/basctl/uiconfig/basicide/menubar/menubar.xml	2008-03-01 17:06:11.000000000 -0600
+--- basctl/uiconfig/basicide/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ basctl/uiconfig/basicide/menubar/menubar.xml	2008-07-30 23:13:05 +0000
 @@ -82,6 +82,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -9,9 +9,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- chart2/uiconfig/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ OOH680_m8.new/chart2/uiconfig/menubar/menubar.xml	2008-03-01 17:06:52.000000000 -0600
-@@ -143,8 +143,10 @@
+
+--- chart2/uiconfig/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ chart2/uiconfig/menubar/menubar.xml	2008-07-31 03:46:44 +0000
+@@ -148,6 +148,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -20,14 +21,11 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
- 	</menu:menu>
--</menu:menubar>
-\ No newline at end of file
-+</menu:menubar>
---- dbaccess/uiconfig/dbapp/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ OOH680_m8.new/dbaccess/uiconfig/dbapp/menubar/menubar.xml	2008-03-01 17:10:23.000000000 -0600
-@@ -138,6 +138,8 @@
- 			<menu:menuitem menu:id=".uno:HelperDialog"/>
+
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -133,6 +133,8 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
@@ -35,10 +33,11 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- dbaccess/uiconfig/dbbrowser/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ OOH680_m8.new/dbaccess/uiconfig/dbbrowser/menubar/menubar.xml	2008-03-01 17:11:44.000000000 -0600
-@@ -66,6 +66,8 @@
- 			<menu:menuitem menu:id=".uno:HelperDialog"/>
+
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -75,6 +75,8 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
@@ -46,10 +45,11 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- dbaccess/uiconfig/dbquery/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ OOH680_m8.new/dbaccess/uiconfig/dbquery/menubar/menubar.xml	2008-03-01 17:12:34.000000000 -0600
-@@ -80,6 +80,8 @@
- 			<menu:menuitem menu:id=".uno:HelperDialog"/>
+
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -58,6 +58,8 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
@@ -57,30 +57,47 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- dbaccess/uiconfig/dbrelation/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml	2008-03-01 17:16:03.000000000 -0600
-@@ -63,6 +63,8 @@
- 			<menu:menuitem menu:id=".uno:HelperDialog"/>
+
+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml	2008-07-30 23:15:40 +0000
+@@ -59,6 +59,8 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
++			<menu:menuitem menu:id=".uno:HelpTranslate"/>
++			<menu:menuitem menu:id=".uno:HelpReportBug"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>
+
+--- dbaccess/uiconfig/dbtdata/menubar/menubar.xml	2008-07-30 22:20:48 +0000
++++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml	2008-07-30 23:16:14 +0000
+@@ -67,7 +67,8 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml	2006-04-26 15:52:52.000000000 -0500
-+++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml	2008-03-01 17:16:43.000000000 -0600
-@@ -85,6 +85,8 @@
+
+--- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml	2008-07-30 22:20:48 +0000
++++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml	2008-07-31 03:56:34 +0000
+@@ -85,7 +85,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- framework/uiconfig/startmodule/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ framework/uiconfig/startmodule/menubar/menubar.xml	2008-03-01 18:12:16.000000000 -0600
+ 		</menu:menupopup>
+
+--- framework/uiconfig/startmodule/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ framework/uiconfig/startmodule/menubar/menubar.xml	2008-07-30 23:13:05 +0000
 @@ -75,6 +75,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -90,9 +107,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- helpcontent2/helpers/help_hid.lst	2007-11-23 10:10:59.000000000 -0600
-+++ helpcontent2/helpers/help_hid.lst	2008-03-01 18:22:25.000000000 -0600
-@@ -5225,8 +5225,10 @@
+
+--- helpcontent2/helpers/help_hid.lst	2008-07-30 22:20:48 +0000
++++ helpcontent2/helpers/help_hid.lst	2008-07-30 23:13:05 +0000
+@@ -5290,8 +5290,10 @@
  SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
  SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
  SID_HELP_PI,5962,.uno:HelperDialog
@@ -103,8 +121,9 @@
  SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
  SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
---- helpcontent2/helpers/longnames_commands.csv	2005-01-27 08:51:42.000000000 -0600
-+++ helpcontent2/helpers/longnames_commands.csv	2008-03-01 18:23:28.000000000 -0600
+
+--- helpcontent2/helpers/longnames_commands.csv	2008-07-30 22:20:48 +0000
++++ helpcontent2/helpers/longnames_commands.csv	2008-07-30 23:13:05 +0000
 @@ -1244,8 +1244,10 @@
  SID_HELP_DOWNLOAD,.uno:HelpDownload
  SID_HELP_HELPFILEBOX,.uno:HelpChooseFile
@@ -116,21 +135,9 @@
  SID_HELP_TUTORIALS,.uno:HelpTutorials
  SID_HELP_ZOOMIN,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,.uno:HelpZoomOut
---- helpcontent2/helpers/unocmds.txt	2005-03-08 08:13:36.000000000 -0600
-+++ helpcontent2/helpers/unocmds.txt	2008-03-01 18:24:50.000000000 -0600
-@@ -490,8 +490,10 @@
- .uno:HelpIndex;shared/main0108.xhp
- .uno:HelpMenu;shared/main0108.xhp
- .uno:HelpOnHelp;shared/05/00000110.xhp
-+.uno:HelpReportBug;shared/main0108.xhp
- .uno:HelpSupport;shared/main0108.xhp
- .uno:HelpTip;shared/00/00000099.xhp
-+.uno:HelpTranslate;shared/main0108.xhp
- .uno:HelperDialog;shared/00/00000099.xhp
- .uno:HelplinesFront;shared/optionen/01050100.xhp
- .uno:HelplinesMove;shared/02/01171400.xhp
---- helpcontent2/helpers/uno-commands.csv	2005-01-27 08:52:05.000000000 -0600
-+++ helpcontent2/helpers/uno-commands.csv	2008-03-01 18:25:54.000000000 -0600
+
+--- helpcontent2/helpers/uno-commands.csv	2008-07-30 22:20:48 +0000
++++ helpcontent2/helpers/uno-commands.csv	2008-07-30 23:13:05 +0000
 @@ -866,8 +866,10 @@
  .uno:HelpIndex
  .uno:HelpMenu
@@ -142,8 +149,9 @@
  .uno:HelperDialog
  .uno:HelplinesFront
  .uno:HelplinesMove
---- helpcontent2/helpers/uno_hid.lst	2005-03-08 08:13:24.000000000 -0600
-+++ helpcontent2/helpers/uno_hid.lst	2008-03-01 18:27:18.000000000 -0600
+
+--- helpcontent2/helpers/uno_hid.lst	2008-07-30 22:20:48 +0000
++++ helpcontent2/helpers/uno_hid.lst	2008-07-30 23:13:05 +0000
 @@ -1242,8 +1242,10 @@
  SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
  SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
@@ -155,9 +163,24 @@
  SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
  SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
---- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	2007-11-23 10:18:58.000000000 -0600
-+++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	2008-03-01 18:30:54.000000000 -0600
-@@ -4058,7 +4058,20 @@
+
+--- helpcontent2/helpers/unocmds.txt	2008-07-30 22:20:48 +0000
++++ helpcontent2/helpers/unocmds.txt	2008-07-30 23:13:05 +0000
+@@ -490,8 +490,10 @@
+ .uno:HelpIndex;shared/main0108.xhp
+ .uno:HelpMenu;shared/main0108.xhp
+ .uno:HelpOnHelp;shared/05/00000110.xhp
++.uno:HelpReportBug;shared/main0108.xhp
+ .uno:HelpSupport;shared/main0108.xhp
+ .uno:HelpTip;shared/00/00000099.xhp
++.uno:HelpTranslate;shared/main0108.xhp
+ .uno:HelperDialog;shared/00/00000099.xhp
+ .uno:HelplinesFront;shared/optionen/01050100.xhp
+ .uno:HelplinesMove;shared/02/01171400.xhp
+
+--- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	2008-07-30 22:20:48 +0000
++++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	2008-07-30 23:13:05 +0000
+@@ -4077,7 +4077,20 @@
  			</node>
  			<node oor:name=".uno:HelpSupport" oor:op="replace">
  				<prop oor:name="Label" oor:type="xs:string">
@@ -179,9 +202,10 @@
  				</prop>
  			</node>
  			<node oor:name=".uno:StatusBarVisible" oor:op="replace">
---- reportdesign/uiconfig/dbreport/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ reportdesign/uiconfig/dbreport/menubar/menubar.xml	2008-03-01 18:28:16.000000000 -0600
-@@ -160,5 +160,7 @@
+
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml	2008-07-30 22:20:48 +0000
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml	2008-07-31 03:47:45 +0000
+@@ -160,6 +160,8 @@
  			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -189,8 +213,22 @@
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- scripting/workben/bindings/calcmenubar.xml	2003-06-03 07:54:16.000000000 -0500
-+++ scripting/workben/bindings/calcmenubar.xml	2008-03-01 18:30:54.000000000 -0600
+ 		</menu:menupopup>
+
+--- sc/uiconfig/scalc/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ sc/uiconfig/scalc/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -443,6 +443,8 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
++			<menu:menuitem menu:id=".uno:HelpTranslate"/>
++			<menu:menuitem menu:id=".uno:HelpReportBug"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>
+
+--- scripting/workben/bindings/calcmenubar.xml	2008-07-30 22:20:48 +0000
++++ scripting/workben/bindings/calcmenubar.xml	2008-07-30 23:13:05 +0000
 @@ -310,7 +310,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -202,8 +240,9 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- scripting/workben/bindings/drawmenubar.xml	2003-06-03 07:54:16.000000000 -0500
-+++ scripting/workben/bindings/drawmenubar.xml	2008-03-01 18:30:54.000000000 -0600
+
+--- scripting/workben/bindings/drawmenubar.xml	2008-07-30 22:20:48 +0000
++++ scripting/workben/bindings/drawmenubar.xml	2008-07-30 23:13:05 +0000
 @@ -345,7 +345,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -215,8 +254,9 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- scripting/workben/bindings/impressmenubar.xml	2003-06-03 07:54:16.000000000 -0500
-+++ scripting/workben/bindings/impressmenubar.xml	2008-03-01 18:30:54.000000000 -0600
+
+--- scripting/workben/bindings/impressmenubar.xml	2008-07-30 22:20:48 +0000
++++ scripting/workben/bindings/impressmenubar.xml	2008-07-30 23:13:05 +0000
 @@ -319,7 +319,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -228,8 +268,9 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- scripting/workben/bindings/writermenubar.xml	2003-06-03 07:54:17.000000000 -0500
-+++ scripting/workben/bindings/writermenubar.xml	2008-03-01 18:30:54.000000000 -0600
+
+--- scripting/workben/bindings/writermenubar.xml	2008-07-30 22:20:48 +0000
++++ scripting/workben/bindings/writermenubar.xml	2008-07-30 23:13:05 +0000
 @@ -272,7 +272,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -241,9 +282,10 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- sc/uiconfig/scalc/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ sc/uiconfig/scalc/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -440,6 +440,8 @@
+
+--- sd/uiconfig/sdraw/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ sd/uiconfig/sdraw/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -319,6 +319,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -252,9 +294,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sd/uiconfig/sdraw/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ sd/uiconfig/sdraw/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -317,6 +317,8 @@
+
+--- sd/uiconfig/simpress/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ sd/uiconfig/simpress/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -294,6 +294,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -263,20 +306,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sd/uiconfig/simpress/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ sd/uiconfig/simpress/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -292,6 +292,8 @@
- 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+			<menu:menuitem menu:id=".uno:HelpTranslate"/>
-+			<menu:menuitem menu:id=".uno:HelpReportBug"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
---- sfx2/inc/sfx2/sfxsids.hrc	2008-03-01 16:58:37.000000000 -0600
-+++ sfx2/inc/sfx2/sfxsids.hrc	2008-03-01 18:32:58.000000000 -0600
-@@ -210,6 +210,8 @@
+
+--- sfx2/inc/sfx2/sfxsids.hrc	2008-07-30 22:49:24 +0000
++++ sfx2/inc/sfx2/sfxsids.hrc	2008-07-30 23:13:05 +0000
+@@ -205,6 +205,8 @@
  #define SID_HELP_HELPFILEBOX				(SID_SFX_START + 419)
  #define SID_HELP_HELPFILEBOX_SELECTED		(SID_SFX_START + 420)
  #define SID_HELP_SUPPORTPAGE				(SID_SFX_START + 1683)
@@ -285,9 +318,10 @@
  #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
  
  // default-ids for document
---- sfx2/sdi/appslots.sdi	2007-09-21 04:27:27.000000000 -0500
-+++ sfx2/sdi/appslots.sdi	2008-03-01 18:30:54.000000000 -0600
-@@ -187,6 +187,14 @@
+
+--- sfx2/sdi/appslots.sdi	2008-07-30 22:20:48 +0000
++++ sfx2/sdi/appslots.sdi	2008-07-30 23:13:05 +0000
+@@ -182,6 +182,14 @@
  	[
  		ExecMethod = MiscExec_Impl ;
  	]
@@ -302,8 +336,9 @@
  	SID_RECENTFILELIST
  	[
  	]
---- sfx2/sdi/sfx.sdi	2008-03-01 16:58:34.000000000 -0600
-+++ sfx2/sdi/sfx.sdi	2008-03-01 18:30:54.000000000 -0600
+
+--- sfx2/sdi/sfx.sdi	2008-07-30 22:49:24 +0000
++++ sfx2/sdi/sfx.sdi	2008-07-30 23:13:05 +0000
 @@ -7887,6 +7887,56 @@
  ]
  
@@ -361,22 +396,10 @@
  SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
  ()
  [
---- sfx2/source/appl/appserv.cxx.orig	2008-01-15 01:56:07.000000000 -0600
-+++ sfx2/source/appl/appserv.cxx	2008-04-05 23:15:51.000000000 -0500
-@@ -119,6 +119,12 @@
- #ifndef _SV_MSGBOX_HXX
- #include <vcl/msgbox.hxx>
- #endif
-+#ifndef _COM_SUN_STAR_SYSTEM_XSYSTEMSHELLEXECUTE_HPP_
-+#include <com/sun/star/system/XSystemShellExecute.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_SYSTEM_SYSTEMSHELLEXECUTEFLAGS_HPP_
-+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-+#endif
- #ifndef _SFXCANCEL_HXX //autogen
- #include <svtools/cancel.hxx>
- #endif
-@@ -419,9 +425,48 @@
+
+--- sfx2/source/appl/appserv.cxx	2008-07-30 22:20:48 +0000
++++ sfx2/source/appl/appserv.cxx	2008-07-31 03:51:00 +0000
+@@ -345,9 +345,48 @@
  			break;
  		}
  
@@ -426,18 +449,20 @@
          {
              Help* pHelp = Application::GetHelp();
              if ( pHelp )
---- sfx2/source/appl/makefile.mk	2007-09-21 04:28:29.000000000 -0500
-+++ sfx2/source/appl/makefile.mk	2008-03-01 18:30:54.000000000 -0600
+
+--- sfx2/source/appl/makefile.mk	2008-07-30 22:20:48 +0000
++++ sfx2/source/appl/makefile.mk	2008-07-30 23:13:05 +0000
 @@ -65,6 +65,7 @@
  .ELSE
-         CDEFS+=-DDLL_NAME=sfx$(UPD)$(DLLPOSTFIX)$(DLLPOST)
+         CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST)
  .ENDIF
 +CFLAGS+=-DUBUNTU_RELEASE=\"$(shell lsb_release -cs)\"
  
  # --- Files --------------------------------------------------------
  
---- starmath/uiconfig/smath/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ starmath/uiconfig/smath/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+
+--- starmath/uiconfig/smath/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ starmath/uiconfig/smath/menubar/menubar.xml	2008-07-30 23:13:05 +0000
 @@ -111,6 +111,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -447,9 +472,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- svx/inc/globlmn_tmpl.hrc	2008-03-01 16:58:41.000000000 -0600
-+++ svx/inc/globlmn_tmpl.hrc	2008-03-01 18:30:54.000000000 -0600
-@@ -1065,7 +1065,24 @@
+
+--- svx/inc/globlmn_tmpl.hrc	2008-07-30 22:49:24 +0000
++++ svx/inc/globlmn_tmpl.hrc	2008-07-30 23:13:05 +0000
+@@ -1056,7 +1056,24 @@
      Identifier = SID_HELP_SUPPORTPAGE ; \
  	Command = ".uno:HelpSupport" ; \
      HelpID = SID_HELP_SUPPORTPAGE ; \
@@ -475,9 +501,10 @@
  
  #define ITEM_HELP_ONLINE_REGISTRATION \
      Identifier = SID_ONLINE_REGISTRATION ; \
---- sw/uiconfig/sglobal/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ sw/uiconfig/sglobal/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -447,6 +447,8 @@
+
+--- sw/uiconfig/sglobal/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ sw/uiconfig/sglobal/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -449,6 +449,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -486,9 +513,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sw/uiconfig/sweb/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ sw/uiconfig/sweb/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -375,6 +375,8 @@
+
+--- sw/uiconfig/sweb/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ sw/uiconfig/sweb/menubar/menubar.xml	2008-07-30 23:13:05 +0000
+@@ -377,6 +377,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -497,31 +525,36 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sw/uiconfig/swform/menubar/menubar.xml	2007-11-22 09:48:44.000000000 -0600
-+++ sw/uiconfig/swform/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -444,6 +444,8 @@
+
+--- sw/uiconfig/swform/menubar/menubar.xml	2008-07-30 22:20:48 +0000
++++ sw/uiconfig/swform/menubar/menubar.xml	2008-07-31 03:58:26 +0000
+@@ -446,7 +446,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- sw/uiconfig/swreport/menubar/menubar.xml	2007-11-22 09:50:45.000000000 -0600
-+++ sw/uiconfig/swreport/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -444,6 +444,8 @@
+ 		</menu:menupopup>
+
+--- sw/uiconfig/swreport/menubar/menubar.xml	2008-07-30 22:20:48 +0000
++++ sw/uiconfig/swreport/menubar/menubar.xml	2008-07-31 03:58:53 +0000
+@@ -446,7 +446,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- sw/uiconfig/swriter/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
-+++ sw/uiconfig/swriter/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -450,6 +450,8 @@
+ 		</menu:menupopup>
+
+--- sw/uiconfig/swriter/menubar/menubar.xml	2008-07-30 22:49:24 +0000
++++ sw/uiconfig/swriter/menubar/menubar.xml	2008-07-30 23:13:06 +0000
+@@ -452,6 +452,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -530,14 +563,17 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sw/uiconfig/swxform/menubar/menubar.xml	2007-11-22 09:54:22.000000000 -0600
-+++ sw/uiconfig/swxform/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
-@@ -444,6 +444,8 @@
+
+--- sw/uiconfig/swxform/menubar/menubar.xml	2008-07-30 22:20:48 +0000
++++ sw/uiconfig/swxform/menubar/menubar.xml	2008-07-31 03:59:24 +0000
+@@ -446,7 +446,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]