diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:28:53 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:28:53 +0100 |
| commit | cb494af6970a4d37b8ff81c29f90d18371fedb64 (patch) | |
| tree | 1e6ccce759860c296b02041d2856500cc4636220 /sw/uiconfig | |
| parent | 44712d1232aba3e2e9780d7d7d68e43580b91d90 (diff) | |
| parent | 9ff42ec6fcbf4d6392104303d6437d9ef5d3d8d0 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sw/source/core/crsr/bookmrk.cxx
sw/source/core/doc/doc.cxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/ui/dbui/mmoutputpage.cxx
Diffstat (limited to 'sw/uiconfig')
| -rw-r--r-- | sw/uiconfig/swform/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swreport/menubar/menubar.xml | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swxform/menubar/menubar.xml | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 4e90101c0625..cc8b013959c5 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -448,7 +448,6 @@ <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowCredits"/> <menu:menuitem menu:id=".uno:About"/> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 4e90101c0625..cc8b013959c5 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -448,7 +448,6 @@ <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowCredits"/> <menu:menuitem menu:id=".uno:About"/> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 14e758ef99e0..32df4479b188 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -449,7 +449,6 @@ <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowCredits"/> <menu:menuitem menu:id=".uno:About"/> |