summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCor Nouws <oolst@nouenoff.nl>2014-11-13 15:24:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-11-13 14:39:46 +0000
commitcca366231538c62696a424b43353027905e3dfbf (patch)
tree847595999120b1a67deb15c0f361bb6299cbbf9b /sw
parent22ef69b25fa60f4543dc72cb7a8d2f88b789ce43 (diff)
fdo#86252: Menu 'Merge Documents' is at wrong position
Fixing a small mistake that slipped through with the many great improvements Change-Id: I252f2f05e6d624094507cc1f825faab5912e006e Reviewed-on: https://gerrit.libreoffice.org/12407 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/uiconfig/sglobal/menubar/menubar.xml3
-rw-r--r--sw/uiconfig/swform/menubar/menubar.xml3
-rw-r--r--sw/uiconfig/swreport/menubar/menubar.xml3
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml3
-rw-r--r--sw/uiconfig/swxform/menubar/menubar.xml3
5 files changed, 10 insertions, 5 deletions
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 294e44544e20..be10398b12ea 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -106,9 +106,10 @@
<menu:menuitem menu:id=".uno:CommentChangeTracking"/>
<menu:menuitem menu:id=".uno:NextTrackedChange"/>
<menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:MergeDocuments"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
<menu:menuitem menu:id=".uno:CompareDocuments"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 7c9ae515b8a5..d29a58afa9d6 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -105,9 +105,10 @@
<menu:menuitem menu:id=".uno:CommentChangeTracking"/>
<menu:menuitem menu:id=".uno:NextTrackedChange"/>
<menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:MergeDocuments"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
<menu:menuitem menu:id=".uno:CompareDocuments"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index f744dabfa8a7..eb0a9683753f 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -106,9 +106,10 @@
<menu:menuitem menu:id=".uno:CommentChangeTracking"/>
<menu:menuitem menu:id=".uno:NextTrackedChange"/>
<menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:MergeDocuments"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
<menu:menuitem menu:id=".uno:CompareDocuments"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 2b1378955ccd..1495eb5448dd 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -110,9 +110,10 @@
<menu:menuitem menu:id=".uno:CommentChangeTracking"/>
<menu:menuitem menu:id=".uno:NextTrackedChange"/>
<menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:MergeDocuments"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
<menu:menuitem menu:id=".uno:CompareDocuments"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index e59469e5fd39..bbba7b29eee9 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -107,9 +107,10 @@
<menu:menuitem menu:id=".uno:CommentChangeTracking"/>
<menu:menuitem menu:id=".uno:NextTrackedChange"/>
<menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:MergeDocuments"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:MergeDocuments"/>
<menu:menuitem menu:id=".uno:CompareDocuments"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ChangeDatabaseField"/>