GNOME.org
 

ooo-build r12115 - in trunk: . patches/src680

Author: ccheney
Date: Mon Apr  7 03:00:58 2008
New Revision: 12115
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12115&view=rev

Log:
2008-04-05  Chris Cheney <ccheney ubuntu com>

        * patches/src680/ubuntu-lpi.diff: Update to use launchpad-integration
          binary instead of hardcoded urls.



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

Modified: trunk/patches/src680/ubuntu-lpi.diff
==============================================================================
--- trunk/patches/src680/ubuntu-lpi.diff	(original)
+++ trunk/patches/src680/ubuntu-lpi.diff	Mon Apr  7 03:00:58 2008
@@ -1,4 +1,3 @@
-diff -Nrua basctl/uiconfig/basicide/menubar/menubar.xml OOH680_m8.new/basctl/uiconfig/basicide/menubar/menubar.xml
 --- 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
 @@ -82,6 +82,8 @@
@@ -10,7 +9,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua chart2/uiconfig/menubar/menubar.xml OOH680_m8.new/chart2/uiconfig/menubar/menubar.xml
 --- 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 @@
@@ -26,7 +24,6 @@
 -</menu:menubar>
 \ No newline at end of file
 +</menu:menubar>
-diff -Nrua dbaccess/uiconfig/dbapp/menubar/menubar.xml OOH680_m8.new/dbaccess/uiconfig/dbapp/menubar/menubar.xml
 --- 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 @@
@@ -38,7 +35,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua dbaccess/uiconfig/dbbrowser/menubar/menubar.xml OOH680_m8.new/dbaccess/uiconfig/dbbrowser/menubar/menubar.xml
 --- 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 @@
@@ -50,7 +46,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua dbaccess/uiconfig/dbquery/menubar/menubar.xml OOH680_m8.new/dbaccess/uiconfig/dbquery/menubar/menubar.xml
 --- 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 @@
@@ -62,7 +57,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
 --- 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 @@
@@ -74,7 +68,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
 --- 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 @@
@@ -86,7 +79,6 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
-diff -Nrua framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
 --- 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
 @@ -75,6 +75,8 @@
@@ -98,7 +90,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua helpcontent2/helpers/help_hid.lst helpcontent2/helpers/help_hid.lst
 --- 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 @@
@@ -112,7 +103,6 @@
  SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
  SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
-diff -Nrua helpcontent2/helpers/longnames_commands.csv helpcontent2/helpers/longnames_commands.csv
 --- 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
 @@ -1244,8 +1244,10 @@
@@ -126,7 +116,6 @@
  SID_HELP_TUTORIALS,.uno:HelpTutorials
  SID_HELP_ZOOMIN,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,.uno:HelpZoomOut
-diff -Nrua helpcontent2/helpers/unocmds.txt helpcontent2/helpers/unocmds.txt
 --- 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 @@
@@ -140,7 +129,6 @@
  .uno:HelperDialog;shared/00/00000099.xhp
  .uno:HelplinesFront;shared/optionen/01050100.xhp
  .uno:HelplinesMove;shared/02/01171400.xhp
-diff -Nrua helpcontent2/helpers/uno-commands.csv helpcontent2/helpers/uno-commands.csv
 --- 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
 @@ -866,8 +866,10 @@
@@ -154,7 +142,6 @@
  .uno:HelperDialog
  .uno:HelplinesFront
  .uno:HelplinesMove
-diff -Nrua helpcontent2/helpers/uno_hid.lst helpcontent2/helpers/uno_hid.lst
 --- 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
 @@ -1242,8 +1242,10 @@
@@ -168,7 +155,6 @@
  SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
  SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
-diff -Nrua officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 --- 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 @@
@@ -193,7 +179,6 @@
  				</prop>
  			</node>
  			<node oor:name=".uno:StatusBarVisible" oor:op="replace">
-diff -Nrua reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
 --- 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 @@
@@ -204,19 +189,6 @@
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
-diff -Nrua sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
---- 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 @@
- 			<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>
-diff -Nrua scripting/workben/bindings/calcmenubar.xml scripting/workben/bindings/calcmenubar.xml
 --- 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
 @@ -310,7 +310,9 @@
@@ -230,7 +202,6 @@
     <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..."/>
-diff -Nrua scripting/workben/bindings/drawmenubar.xml scripting/workben/bindings/drawmenubar.xml
 --- 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
 @@ -345,7 +345,9 @@
@@ -244,7 +215,6 @@
     <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..."/>
-diff -Nrua scripting/workben/bindings/impressmenubar.xml scripting/workben/bindings/impressmenubar.xml
 --- 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
 @@ -319,7 +319,9 @@
@@ -258,7 +228,6 @@
     <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..."/>
-diff -Nrua scripting/workben/bindings/writermenubar.xml scripting/workben/bindings/writermenubar.xml
 --- 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
 @@ -272,7 +272,9 @@
@@ -272,7 +241,17 @@
     <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..."/>
-diff -Nrua sd/uiconfig/sdraw/menubar/menubar.xml sd/uiconfig/sdraw/menubar/menubar.xml
+--- 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 @@
+ 			<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>
 --- 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 @@
@@ -284,7 +263,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
 --- 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 @@
@@ -296,7 +274,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxsids.hrc
 --- 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 @@
@@ -308,7 +285,6 @@
  #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
  
  // default-ids for document
-diff -Nrua sfx2/sdi/appslots.sdi sfx2/sdi/appslots.sdi
 --- 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 @@
@@ -326,7 +302,6 @@
  	SID_RECENTFILELIST
  	[
  	]
-diff -Nrua sfx2/sdi/sfx.sdi sfx2/sdi/sfx.sdi
 --- sfx2/sdi/sfx.sdi	2008-03-01 16:58:34.000000000 -0600
 +++ sfx2/sdi/sfx.sdi	2008-03-01 18:30:54.000000000 -0600
 @@ -7887,6 +7887,56 @@
@@ -386,9 +361,8 @@
  SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
  ()
  [
-diff -Nrua sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
---- sfx2/source/appl/appserv.cxx	2008-01-15 01:56:07.000000000 -0600
-+++ sfx2/source/appl/appserv.cxx	2008-03-01 18:30:54.000000000 -0600
+--- 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>
@@ -402,7 +376,7 @@
  #ifndef _SFXCANCEL_HXX //autogen
  #include <svtools/cancel.hxx>
  #endif
-@@ -419,9 +425,54 @@
+@@ -419,9 +425,48 @@
  			break;
  		}
  
@@ -411,15 +385,13 @@
 +			try {
 +				Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
 +					( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+				if ( xSystemShell.is()) {
-+					rtl::OUString aURI( DEFINE_CONST_UNICODE( "https://answers.launchpad.net/ubuntu/"; UBUNTU_RELEASE "/+sources/openoffice.org/+gethelp" ) );
-+					xSystemShell->execute( aURI, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+				}
++				if ( xSystemShell.is())
++					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -i")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
 +
 +				break;
 +			} catch (const ::com::sun::star::uno::Exception &) {
 + 			}
-+			/* drop through on exception */
++			break;
 +		}
 +
 +		case SID_HELP_TRANSLATEPAGE:
@@ -427,30 +399,26 @@
 +			try {
 +				Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
 +					( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+				if ( xSystemShell.is()) {
-+					rtl::OUString aURI( DEFINE_CONST_UNICODE( "https://translations.launchpad.net/ubuntu/"; UBUNTU_RELEASE "/+sources/openoffice.org/+translate" ) );
-+					xSystemShell->execute( aURI, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+				}
++				if ( xSystemShell.is())
++					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -t")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
 +
 +				break;
 +			} catch (const ::com::sun::star::uno::Exception &) {
 + 			}
-+			/* drop through on exception */
++			break;
 +		}
 +		case SID_HELP_REPORTBUG:
 +		{
 +			try {
 +				Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
 +					( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+				if ( xSystemShell.is()) {
-+					rtl::OUString aURI( DEFINE_CONST_UNICODE( "https://bugs.launchpad.net/ubuntu/"; UBUNTU_RELEASE "/+sources/openoffice.org/+filebug" ) );
-+					xSystemShell->execute( aURI, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+				}
++				if ( xSystemShell.is())
++					xSystemShell->execute( ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/lib/openoffice/program/ooo87965.execute.sh")), ::rtl::OUString(DEFINE_CONST_UNICODE("/usr/bin/launchpad-integration -P openoffice.org-core -b")), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
 +
 +				break;
 +			} catch (const ::com::sun::star::uno::Exception &) {
 + 			}
-+			/* drop through on exception */
++			break;
 +		}
          // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          case SID_HELPINDEX:
@@ -458,7 +426,6 @@
          {
              Help* pHelp = Application::GetHelp();
              if ( pHelp )
-diff -Nrua sfx2/source/appl/makefile.mk sfx2/source/appl/makefile.mk
 --- 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
 @@ -65,6 +65,7 @@
@@ -469,7 +436,6 @@
  
  # --- Files --------------------------------------------------------
  
-diff -Nrua starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
 --- 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
 @@ -111,6 +111,8 @@
@@ -481,7 +447,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua svx/inc/globlmn_tmpl.hrc svx/inc/globlmn_tmpl.hrc
 --- 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 @@
@@ -510,7 +475,6 @@
  
  #define ITEM_HELP_ONLINE_REGISTRATION \
      Identifier = SID_ONLINE_REGISTRATION ; \
-diff -Nrua sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
 --- 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 @@
@@ -522,7 +486,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
 --- 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 @@
@@ -534,7 +497,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua sw/uiconfig/swform/menubar/menubar.xml sw/uiconfig/swform/menubar/menubar.xml
 --- 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 @@
@@ -546,7 +508,6 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
-diff -Nrua sw/uiconfig/swreport/menubar/menubar.xml sw/uiconfig/swreport/menubar/menubar.xml
 --- 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 @@
@@ -558,7 +519,6 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
-diff -Nrua sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
 --- 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 @@
@@ -570,7 +530,6 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-diff -Nrua sw/uiconfig/swxform/menubar/menubar.xml sw/uiconfig/swxform/menubar/menubar.xml
 --- 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 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]