?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0241-default-no-registration-menu.diff
blobccc87c46367e6960cc5fd297caa49d6a443595ce
1 diff --git basctl/uiconfig/basicide/menubar/menubar.xml basctl/uiconfig/basicide/menubar/menubar.xml
2 index 974632f..8093ae4 100644
3 --- basctl/uiconfig/basicide/menubar/menubar.xml
4 +++ basctl/uiconfig/basicide/menubar/menubar.xml
5 @@ -82,7 +82,6 @@
6 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
7 <menu:menuseparator/>
8 <menu:menuitem menu:id=".uno:HelpSupport"/>
9 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
10 <menu:menuseparator/>
11 <menu:menuitem menu:id=".uno:About"/>
12 </menu:menupopup>
13 diff --git chart2/uiconfig/menubar/menubar.xml chart2/uiconfig/menubar/menubar.xml
14 index dd7fcf4..ba3fe37 100644
15 --- chart2/uiconfig/menubar/menubar.xml
16 +++ chart2/uiconfig/menubar/menubar.xml
17 @@ -148,7 +148,6 @@
18 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
19 <menu:menuseparator/>
20 <menu:menuitem menu:id=".uno:HelpSupport"/>
21 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
22 <menu:menuseparator/>
23 <menu:menuitem menu:id=".uno:About"/>
24 </menu:menupopup>
25 diff --git dbaccess/uiconfig/dbapp/menubar/menubar.xml dbaccess/uiconfig/dbapp/menubar/menubar.xml
26 index c35b3cb..1a5c7c7 100644
27 --- dbaccess/uiconfig/dbapp/menubar/menubar.xml
28 +++ dbaccess/uiconfig/dbapp/menubar/menubar.xml
29 @@ -134,7 +134,6 @@
30 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
31 <menu:menuseparator/>
32 <menu:menuitem menu:id=".uno:HelpSupport"/>
33 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
34 <menu:menuseparator/>
35 <menu:menuitem menu:id=".uno:About"/>
36 </menu:menupopup>
37 diff --git dbaccess/uiconfig/dbquery/menubar/menubar.xml dbaccess/uiconfig/dbquery/menubar/menubar.xml
38 index f1b0042..c5b2b43 100644
39 --- dbaccess/uiconfig/dbquery/menubar/menubar.xml
40 +++ dbaccess/uiconfig/dbquery/menubar/menubar.xml
41 @@ -75,7 +75,6 @@
42 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
43 <menu:menuseparator/>
44 <menu:menuitem menu:id=".uno:HelpSupport"/>
45 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
46 <menu:menuseparator/>
47 <menu:menuitem menu:id=".uno:About"/>
48 </menu:menupopup>
49 diff --git dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
50 index 31dbcdb..4f8f375 100644
51 --- dbaccess/uiconfig/dbrelation/menubar/menubar.xml
52 +++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml
53 @@ -58,7 +58,6 @@
54 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
55 <menu:menuseparator/>
56 <menu:menuitem menu:id=".uno:HelpSupport"/>
57 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
58 <menu:menuseparator/>
59 <menu:menuitem menu:id=".uno:About"/>
60 </menu:menupopup>
61 diff --git dbaccess/uiconfig/dbtable/menubar/menubar.xml dbaccess/uiconfig/dbtable/menubar/menubar.xml
62 index eefcf17..60bfeb3 100644
63 --- dbaccess/uiconfig/dbtable/menubar/menubar.xml
64 +++ dbaccess/uiconfig/dbtable/menubar/menubar.xml
65 @@ -59,7 +59,6 @@
66 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
67 <menu:menuseparator/>
68 <menu:menuitem menu:id=".uno:HelpSupport"/>
69 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
70 <menu:menuseparator/>
71 <menu:menuitem menu:id=".uno:About"/>
72 </menu:menupopup>
73 diff --git framework/source/services/backingwindow.cxx framework/source/services/backingwindow.cxx
74 index b6b1624..a06cd06 100644
75 --- framework/source/services/backingwindow.cxx
76 +++ framework/source/services/backingwindow.cxx
77 @@ -157,8 +157,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
78
79 BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) );
80 String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
81 - BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) );
82 - String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
83 BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
84 String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
85 BitmapEx aTplRepImage( FwkResId( BMP_BACKING_TPLREP ) );
86 @@ -189,12 +187,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
87 maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
88 maToolbox.ShowItem( nItemId_Extensions );
89
90 - maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
91 - maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
92 - maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
93 - maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
94 - maToolbox.ShowItem( nItemId_Reg );
95 -
96 maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
97 maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
98 maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
99 diff --git framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
100 index fc1e520..f90a6f1 100644
101 --- framework/uiconfig/startmodule/menubar/menubar.xml
102 +++ framework/uiconfig/startmodule/menubar/menubar.xml
103 @@ -75,7 +75,6 @@
104 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
105 <menu:menuseparator/>
106 <menu:menuitem menu:id=".uno:HelpSupport"/>
107 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
108 <menu:menuseparator/>
109 <menu:menuitem menu:id=".uno:About"/>
110 </menu:menupopup>
111 diff --git reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
112 index 3e678b5..47850b2 100644
113 --- reportdesign/uiconfig/dbreport/menubar/menubar.xml
114 +++ reportdesign/uiconfig/dbreport/menubar/menubar.xml
115 @@ -164,7 +164,6 @@
116 <menu:menuitem menu:id=".uno:HelperDialog"/>
117 <menu:menuseparator/>
118 <menu:menuitem menu:id=".uno:HelpSupport"/>
119 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
120 <menu:menuseparator/>
121 <menu:menuitem menu:id=".uno:About"/>
122 </menu:menupopup>
123 diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
124 index d3e95d4..7f113f5 100644
125 --- sc/uiconfig/scalc/menubar/menubar.xml
126 +++ sc/uiconfig/scalc/menubar/menubar.xml
127 @@ -441,7 +441,6 @@
128 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
129 <menu:menuseparator/>
130 <menu:menuitem menu:id=".uno:HelpSupport"/>
131 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
132 <menu:menuseparator/>
133 <menu:menuitem menu:id=".uno:About"/>
134 </menu:menupopup>
135 diff --git starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
136 index b9b45c8..5d0a8fe 100644
137 --- starmath/uiconfig/smath/menubar/menubar.xml
138 +++ starmath/uiconfig/smath/menubar/menubar.xml
139 @@ -111,7 +111,6 @@
140 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
141 <menu:menuseparator/>
142 <menu:menuitem menu:id=".uno:HelpSupport"/>
143 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
144 <menu:menuseparator/>
145 <menu:menuitem menu:id=".uno:About"/>
146 </menu:menupopup>
147 diff --git svx/inc/globlmn_tmpl.hrc svx/inc/globlmn_tmpl.hrc
148 index 22e5e58..5befa5b 100644
149 --- svx/inc/globlmn_tmpl.hrc
150 +++ svx/inc/globlmn_tmpl.hrc
151 @@ -1117,10 +1117,6 @@
152 {\
153 ITEM_HELP_SUPPORTPAGE\
154 };\
155 - MenuItem\
156 - {\
157 - ITEM_HELP_ONLINE_REGISTRATION\
158 - };\
159 MenuItem\
160 {\
161 Separator = TRUE ; \
162 diff --git sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
163 index bca4e89..76c9571 100644
164 --- sw/uiconfig/sglobal/menubar/menubar.xml
165 +++ sw/uiconfig/sglobal/menubar/menubar.xml
166 @@ -449,7 +449,6 @@
167 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
168 <menu:menuseparator/>
169 <menu:menuitem menu:id=".uno:HelpSupport"/>
170 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
171 <menu:menuseparator/>
172 <menu:menuitem menu:id=".uno:About"/>
173 </menu:menupopup>
174 diff --git sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
175 index b1892c8..9a03be2 100644
176 --- sw/uiconfig/sweb/menubar/menubar.xml
177 +++ sw/uiconfig/sweb/menubar/menubar.xml
178 @@ -378,7 +378,6 @@
179 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
180 <menu:menuseparator/>
181 <menu:menuitem menu:id=".uno:HelpSupport"/>
182 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
183 <menu:menuseparator/>
184 <menu:menuitem menu:id=".uno:About"/>
185 </menu:menupopup>
186 diff --git sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
187 index 057515d..590c9f5 100644
188 --- sw/uiconfig/swriter/menubar/menubar.xml
189 +++ sw/uiconfig/swriter/menubar/menubar.xml
190 @@ -452,7 +452,6 @@
191 <menu:menuitem menu:id=".uno:ExtendedHelp"/>
192 <menu:menuseparator/>
193 <menu:menuitem menu:id=".uno:HelpSupport"/>
194 - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
195 <menu:menuseparator/>
196 <menu:menuitem menu:id=".uno:About"/>
197 </menu:menupopup>
vba interoperability for OOo