summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-09-15 10:52:08 +0200
committerJan Holesovsky <kendy@suse.cz>2010-09-15 10:52:08 +0200
commitb25ed8d91223afcd81f07108504aa3ad2a86fa9c (patch)
tree981f48626bde8d18a10d1331f3903fdbb9d94bac
parenta5f6da09fccd47c0bb6d7a6b39fb67d774446d69 (diff)
default-no-registration-menu.diff: Remove registration from menu.
-rw-r--r--framework/source/services/backingwindow.cxx8
-rw-r--r--framework/uiconfig/startmodule/menubar/menubar.xml1
-rw-r--r--svx/inc/globlmn_tmpl.hrc4
3 files changed, 0 insertions, 13 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 8817e60e92..a7d8709917 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -185,7 +185,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
}
String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
- String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
@@ -214,12 +213,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() );
- 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() );
maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
@@ -431,7 +424,6 @@ void BackingWindow::initBackground()
maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
}
maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
- maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) );
maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) );
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index b5e52e7afa..e9a0f333f4 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -75,7 +75,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 a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 22dc0b1772..2a3c5c411b 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1110,10 +1110,6 @@
};\
MenuItem\
{\
- ITEM_HELP_ONLINE_REGISTRATION\
- };\
- MenuItem\
- {\
Separator = TRUE ; \
};\
MenuItem\