summaryrefslogtreecommitdiff
path: root/sc/uiconfig
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-09-20 06:53:45 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-09-20 06:53:45 +0000
commit70852b631baf43191cbd1c038bd05b3f09d1ee2e (patch)
treecdc5d79838c6f805e33d036fa7c91cfcea75b432 /sc/uiconfig
parent2ab9027e4109fe49c0abfee6e73a487a43fe7579 (diff)
#i10000# Correct wrong resolved merge conflict
Diffstat (limited to 'sc/uiconfig')
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml7
1 files changed, 1 insertions, 6 deletions
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 20db13a4022d..87802fdfe5e5 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -289,12 +289,7 @@
</menu:menu>
<menu:menu menu:id=".uno:ToolsMenu" menu:label="" >
<menu:menupopup>
- <menu:menu menu:id=".uno:SpellingMenu" menu:label="" >
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Spelling" menu:helpid="10243" menu:label="" />
- <menu:menuitem menu:id=".uno:SpellOnline" menu:helpid="12021" menu:label="" />
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:SpellDialog" menu:helpid="10243" menu:label="" />
<menu:menu menu:id=".uno:LanguageMenu" menu:label="" >
<menu:menupopup>
<menu:menuitem menu:id=".uno:HangulHanjaConversion" menu:helpid="10959" menu:label="" />