GNOME.org
 

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

Author: kyoshida
Date: Wed Jan 28 03:49:44 2009
New Revision: 15189
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15189&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/default-no-registration-menu-m39.diff:
	* patches/dev300/default-no-registration-menu.diff:
	* patches/dev300/apply: adjusted for dev300-m40.
	
	* patches/dev300/default-no-registration-menu-sd.diff: need to isolate 
	the hunks that patch against files with CR line endings, or else you
	can't check it in to gnome.org's svn. 


Added:
   trunk/patches/dev300/default-no-registration-menu-m39.diff
      - copied unchanged from r15185, /trunk/patches/dev300/default-no-registration-menu.diff
   trunk/patches/dev300/default-no-registration-menu-sd.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/default-no-registration-menu.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 03:49:44 2009
@@ -1472,9 +1472,17 @@
 # => Tango should be preferred over Industrial.
 tango-prefer-over-industrial.diff, n#304615, pmladek
 
+[ Defaults <= dev300-m39 ]
+# no Help->registration dialog by default
+default-no-registration-menu-m39.diff, michael
+
+[ Defaults > dev300-m39 ]
 # no Help->registration dialog by default
 default-no-registration-menu.diff, michael
+# CR line endings again...
+default-no-registration-menu-sd.diff, michael/kohei
 
+[ Defaults ]
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 

Added: trunk/patches/dev300/default-no-registration-menu-sd.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/default-no-registration-menu-sd.diff	Wed Jan 28 03:49:44 2009
@@ -0,0 +1,24 @@
+diff --git sd/uiconfig/sdraw/menubar/menubar.xml sd/uiconfig/sdraw/menubar/menubar.xml
+index 6d62634..f53c293 100644
+--- sd/uiconfig/sdraw/menubar/menubar.xml
++++ sd/uiconfig/sdraw/menubar/menubar.xml
+@@ -319,7 +319,6 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>
+diff --git sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
+index b01d431..8e6fd46 100644
+--- sd/uiconfig/simpress/menubar/menubar.xml
++++ sd/uiconfig/simpress/menubar/menubar.xml
+@@ -294,7 +294,6 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>

Modified: trunk/patches/dev300/default-no-registration-menu.diff
==============================================================================
--- trunk/patches/dev300/default-no-registration-menu.diff	(original)
+++ trunk/patches/dev300/default-no-registration-menu.diff	Wed Jan 28 03:49:44 2009
@@ -1,10 +1,7 @@
-Index: basctl/uiconfig/basicide/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/script/basctl/uiconfig/basicide/menubar/menubar.xml,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 menubar.xml
---- basctl/uiconfig/basicide/menubar/menubar.xml	16 Nov 2004 15:19:18 -0000	1.8
-+++ basctl/uiconfig/basicide/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
+diff --git basctl/uiconfig/basicide/menubar/menubar.xml basctl/uiconfig/basicide/menubar/menubar.xml
+index 974632f..8093ae4 100644
+--- basctl/uiconfig/basicide/menubar/menubar.xml
++++ basctl/uiconfig/basicide/menubar/menubar.xml
 @@ -82,7 +82,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -13,14 +10,11 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: dbaccess/uiconfig/dbapp/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/dba/dbaccess/uiconfig/dbapp/menubar/menubar.xml,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 menubar.xml
---- dbaccess/uiconfig/dbapp/menubar/menubar.xml	17 Nov 2004 14:54:32 -0000	1.6
-+++ dbaccess/uiconfig/dbapp/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -132,7 +132,6 @@
+diff --git chart2/uiconfig/menubar/menubar.xml chart2/uiconfig/menubar/menubar.xml
+index dd7fcf4..ba3fe37 100644
+--- chart2/uiconfig/menubar/menubar.xml
++++ chart2/uiconfig/menubar/menubar.xml
+@@ -148,7 +148,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -28,59 +22,22 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: dbaccess/uiconfig/dbquery/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/dba/dbaccess/uiconfig/dbquery/menubar/menubar.xml,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 menubar.xml
---- dbaccess/uiconfig/dbquery/menubar/menubar.xml	16 Nov 2004 14:33:54 -0000	1.7
-+++ dbaccess/uiconfig/dbquery/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -78,7 +78,6 @@
- 			<menu:menuitem menu:id=".uno:ActiveHelp"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
--			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
-Index: dbaccess/uiconfig/dbquery/menubar/menubar.xml
-Index: dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/dba/dbaccess/uiconfig/dbrelation/menubar/menubar.xml,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 menubar.xml
---- dbaccess/uiconfig/dbrelation/menubar/menubar.xml	16 Nov 2004 14:34:06 -0000	1.6
-+++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -61,7 +61,6 @@
- 			<menu:menuitem menu:id=".uno:ActiveHelp"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
--			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
-Index: dbaccess/uiconfig/dbtable/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/dba/dbaccess/uiconfig/dbtable/menubar/menubar.xml,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 menubar.xml
---- dbaccess/uiconfig/dbtable/menubar/menubar.xml	16 Nov 2004 14:34:22 -0000	1.6
-+++ dbaccess/uiconfig/dbtable/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -62,7 +62,6 @@
- 			<menu:menuitem menu:id=".uno:ActiveHelp"/>
+diff --git dbaccess/uiconfig/dbapp/menubar/menubar.xml dbaccess/uiconfig/dbapp/menubar/menubar.xml
+index c35b3cb..1a5c7c7 100644
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml
++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml
+@@ -134,7 +134,6 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
 -			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: framework/uiconfig/startmodule/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/framework/framework/uiconfig/startmodule/menubar/menubar.xml,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 menubar.xml
---- framework/uiconfig/startmodule/menubar/menubar.xml	16 Nov 2004 14:57:41 -0000	1.9
-+++ framework/uiconfig/startmodule/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
+diff --git dbaccess/uiconfig/dbquery/menubar/menubar.xml dbaccess/uiconfig/dbquery/menubar/menubar.xml
+index f1b0042..c5b2b43 100644
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml
++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml
 @@ -75,7 +75,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -89,29 +46,23 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: chart2/uiconfig/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/graphics/chart2/uiconfig/menubar/menubar.xml,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 menubar.xml
---- chart2/uiconfig/menubar/menubar.xml	9 Nov 2004 18:31:58 -0000	1.3
-+++ chart2/uiconfig/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -131,7 +131,6 @@
- 			<menu:menuitem menu:id=".uno:ActiveHelp"/>
+diff --git dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+index 31dbcdb..4f8f375 100644
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+@@ -58,7 +58,6 @@
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
 -			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: sc/uiconfig/scalc/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/sc/sc/uiconfig/scalc/menubar/menubar.xml,v
-retrieving revision 1.21
-diff -u -p -u -r1.21 menubar.xml
---- sc/uiconfig/scalc/menubar/menubar.xml	16 Nov 2005 10:15:26 -0000	1.21
-+++ sc/uiconfig/scalc/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -427,7 +426,6 @@
+diff --git dbaccess/uiconfig/dbtable/menubar/menubar.xml dbaccess/uiconfig/dbtable/menubar/menubar.xml
+index eefcf17..60bfeb3 100644
+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml
++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml
+@@ -59,7 +59,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -119,14 +70,37 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: sd/uiconfig/sdraw/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/graphics/sd/uiconfig/sdraw/menubar/menubar.xml,v
-retrieving revision 1.22
-diff -u -p -u -r1.22 menubar.xml
---- sd/uiconfig/sdraw/menubar/menubar.xml	16 Nov 2005 09:23:48 -0000	1.22
-+++ sd/uiconfig/sdraw/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -314,7 +310,6 @@
+diff --git framework/source/services/backingwindow.cxx framework/source/services/backingwindow.cxx
+index b6b1624..a06cd06 100644
+--- framework/source/services/backingwindow.cxx
++++ framework/source/services/backingwindow.cxx
+@@ -157,8 +157,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
+     
+     BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) );
+     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
+-    BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) );
+-    String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
+     BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
+     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
+     BitmapEx aTplRepImage( FwkResId( BMP_BACKING_TPLREP ) );
+@@ -189,12 +187,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
+     maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
+     maToolbox.ShowItem( nItemId_Extensions );
+     
+-    maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
+-    maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
+-    maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
+-    maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
+-    maToolbox.ShowItem( nItemId_Reg );
+-    
+     maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
+     maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
+     maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
+diff --git framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
+index fc1e520..f90a6f1 100644
+--- framework/uiconfig/startmodule/menubar/menubar.xml
++++ framework/uiconfig/startmodule/menubar/menubar.xml
+@@ -75,7 +75,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -134,14 +108,23 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: sd/uiconfig/simpress/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/graphics/sd/uiconfig/simpress/menubar/menubar.xml,v
-retrieving revision 1.24
-diff -u -p -u -r1.24 menubar.xml
---- sd/uiconfig/simpress/menubar/menubar.xml	16 Nov 2005 09:25:04 -0000	1.24
-+++ sd/uiconfig/simpress/menubar/menubar.xml	15 Feb 2006 11:59:33 -0000
-@@ -287,7 +284,6 @@
+diff --git reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
+index 3e678b5..47850b2 100644
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml
+@@ -164,7 +164,6 @@
+       <menu:menuitem menu:id=".uno:HelperDialog"/>
+       <menu:menuseparator/>
+       <menu:menuitem menu:id=".uno:HelpSupport"/>
+-      <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+       <menu:menuseparator/>
+       <menu:menuitem menu:id=".uno:About"/>
+     </menu:menupopup>
+diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
+index d3e95d4..7f113f5 100644
+--- sc/uiconfig/scalc/menubar/menubar.xml
++++ sc/uiconfig/scalc/menubar/menubar.xml
+@@ -441,7 +441,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -149,13 +132,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: starmath/uiconfig/smath/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/sw/starmath/uiconfig/smath/menubar/menubar.xml,v
-retrieving revision 1.11
-diff -u -p -u -r1.11 menubar.xml
---- starmath/uiconfig/smath/menubar/menubar.xml	9 Sep 2004 16:32:46 -0000	1.11
-+++ starmath/uiconfig/smath/menubar/menubar.xml	15 Feb 2006 11:59:34 -0000
+diff --git starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
+index b9b45c8..5d0a8fe 100644
+--- starmath/uiconfig/smath/menubar/menubar.xml
++++ starmath/uiconfig/smath/menubar/menubar.xml
 @@ -111,7 +111,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -164,14 +144,26 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: sw/uiconfig/sglobal/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/sw/sw/uiconfig/sglobal/menubar/menubar.xml,v
-retrieving revision 1.19
-diff -u -p -u -r1.19 menubar.xml
---- sw/uiconfig/sglobal/menubar/menubar.xml	16 Nov 2005 09:54:22 -0000	1.19
-+++ sw/uiconfig/sglobal/menubar/menubar.xml	15 Feb 2006 11:59:34 -0000
-@@ -433,7 +429,6 @@
+diff --git svx/inc/globlmn_tmpl.hrc svx/inc/globlmn_tmpl.hrc
+index 22e5e58..5befa5b 100644
+--- svx/inc/globlmn_tmpl.hrc
++++ svx/inc/globlmn_tmpl.hrc
+@@ -1117,10 +1117,6 @@
+                 {\
+ 					ITEM_HELP_SUPPORTPAGE\
+ 				};\
+-				MenuItem\
+-                {\
+-					ITEM_HELP_ONLINE_REGISTRATION\
+-				};\
+                 MenuItem\
+                 {\
+                     Separator = TRUE ; \
+diff --git sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
+index bca4e89..76c9571 100644
+--- sw/uiconfig/sglobal/menubar/menubar.xml
++++ sw/uiconfig/sglobal/menubar/menubar.xml
+@@ -449,7 +449,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -179,14 +171,11 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: sw/uiconfig/sweb/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/sw/sw/uiconfig/sweb/menubar/menubar.xml,v
-retrieving revision 1.18
-diff -u -p -u -r1.18 menubar.xml
---- sw/uiconfig/sweb/menubar/menubar.xml	16 Nov 2005 09:55:48 -0000	1.18
-+++ sw/uiconfig/sweb/menubar/menubar.xml	15 Feb 2006 11:59:34 -0000
-@@ -361,7 +357,6 @@
+diff --git sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
+index b1892c8..9a03be2 100644
+--- sw/uiconfig/sweb/menubar/menubar.xml
++++ sw/uiconfig/sweb/menubar/menubar.xml
+@@ -378,7 +378,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -194,14 +183,11 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-Index: sw/uiconfig/swriter/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/sw/sw/uiconfig/swriter/menubar/menubar.xml,v
-retrieving revision 1.20
-diff -u -p -u -r1.20 menubar.xml
---- sw/uiconfig/swriter/menubar/menubar.xml	16 Nov 2005 09:57:09 -0000	1.20
-+++ sw/uiconfig/swriter/menubar/menubar.xml	15 Feb 2006 11:59:34 -0000
-@@ -434,7 +431,6 @@
+diff --git sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
+index 057515d..590c9f5 100644
+--- sw/uiconfig/swriter/menubar/menubar.xml
++++ sw/uiconfig/swriter/menubar/menubar.xml
+@@ -452,7 +452,6 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -209,61 +195,3 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
-
-
-This piece is ~obsolete & pointless:
-
-
-Index: svx/inc/globlmn_tmpl.hrc
-===================================================================
-RCS file: /cvs/graphics/svx/inc/globlmn_tmpl.hrc,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 globlmn_tmpl.hrc
---- svx/inc/globlmn_tmpl.hrc	25 Jun 2004 11:46:55 -0000	1.2
-+++ svx/inc/globlmn_tmpl.hrc	26 Nov 2004 12:10:29 -0000
-@@ -1388,10 +1388,6 @@
-                 {\
- 					ITEM_HELP_SUPPORTPAGE\
- 				};\
--				MenuItem\
--                {\
--					ITEM_HELP_ONLINE_REGISTRATION\
--				};\
-                 MenuItem\
-                 {\
-                     Separator = TRUE ; \
---- reportdesign/uiconfig/dbreport/menubar/menubar.xml-old     2007-08-20 13:36:30.000000000 +0200
-+++ reportdesign/uiconfig/dbreport/menubar/menubar.xml 2007-08-20 13:36:41.000000000 +0200
-@@ -159,7 +159,6 @@
-                        <menu:menuitem menu:id=".uno:HelperDialog"/>
-                        <menu:menuseparator/>
-                        <menu:menuitem menu:id=".uno:HelpSupport"/>
--                       <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
-                        <menu:menuseparator/>
-                        <menu:menuitem menu:id=".uno:About"/>
-                </menu:menupopup>
-
---- framework/source/services/backingwindow.cxx
-+++ framework/source/services/backingwindow.cxx
-@@ -152,8 +152,6 @@
-     
-     BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) );
-     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
--    BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) );
--    String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
-     BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
-     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
-     
-@@ -173,12 +173,6 @@
-     maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
-     maToolbox.ShowItem( nItemId_Extensions );
-     
--    maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
--    maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
--    maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
--    maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
--    maToolbox.ShowItem( nItemId_Reg );
--    
-     maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
-     maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
-     maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]