Move anchor submenu to separate popupmenu file

Objectives:

- Reduce copy-paste, by defining the list of commands
only once, and reusing everywhere (menubar, context
menu, toolbar button).

- Kill SwTbxAnchor. Once we have separate popupmenu,
we can just load it with the generic controller.

Change-Id: I5a8b47892471e293ee2331915361f8ce256dc76c

11 files changed, 26 insertions, 50 deletions

diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index be91c7dfa425..422ce36d12e8 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -223,15 +223,7 @@
         </menu:menupopup>
       </menu:menu>
       <menu:menuseparator/>
-      <menu:menu menu:id=".uno:AnchorMenu">
-        <menu:menupopup>
-          <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
-        </menu:menupopup>
-      </menu:menu>
+      <menu:menuitem menu:id=".uno:AnchorMenu"/>
       <menu:menu menu:id=".uno:WrapMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:WrapOff"/>
diff --git a/sw/uiconfig/sweb/popupmenu/anchor.xml b/sw/uiconfig/sweb/popupmenu/anchor.xml
new file mode 100644
index 000000000000..e87252b599f4
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/anchor.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+  <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+  <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+  <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+  <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/form.xml b/sw/uiconfig/sweb/popupmenu/form.xml
index a0f4cc938cc5..6c2cf9e9da5c 100644
--- a/sw/uiconfig/sweb/popupmenu/form.xml
+++ b/sw/uiconfig/sweb/popupmenu/form.xml
@@ -53,15 +53,7 @@
       <menu:menuitem menu:id=".uno:TextWrap"/>
     </menu:menupopup>
   </menu:menu>
-  <menu:menu menu:id=".uno:AnchorMenu">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menuitem menu:id=".uno:AnchorMenu"/>
   <menu:menuseparator/>
   <menu:menu menu:id=".uno:GroupMenu">
     <menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/frame.xml b/sw/uiconfig/sweb/popupmenu/frame.xml
index f28337c9d0f7..3cd900b12283 100644
--- a/sw/uiconfig/sweb/popupmenu/frame.xml
+++ b/sw/uiconfig/sweb/popupmenu/frame.xml
@@ -12,15 +12,7 @@
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:AnchorMenu">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menuitem menu:id=".uno:AnchorMenu"/>
   <menu:menu menu:id=".uno:WrapMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:WrapOff"/>
diff --git a/sw/uiconfig/sweb/popupmenu/graphic.xml b/sw/uiconfig/sweb/popupmenu/graphic.xml
index 8c3c2eab5bf5..1286b7747f42 100644
--- a/sw/uiconfig/sweb/popupmenu/graphic.xml
+++ b/sw/uiconfig/sweb/popupmenu/graphic.xml
@@ -18,15 +18,7 @@
   <menu:menuitem menu:id=".uno:CompressGraphic"/>
   <menu:menuitem menu:id=".uno:SaveGraphic"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:AnchorMenu">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menuitem menu:id=".uno:AnchorMenu"/>
   <menu:menu menu:id=".uno:WrapMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:WrapOff"/>
diff --git a/sw/uiconfig/sweb/popupmenu/oleobject.xml b/sw/uiconfig/sweb/popupmenu/oleobject.xml
index f28337c9d0f7..3cd900b12283 100644
--- a/sw/uiconfig/sweb/popupmenu/oleobject.xml
+++ b/sw/uiconfig/sweb/popupmenu/oleobject.xml
@@ -12,15 +12,7 @@
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
   <menu:menuseparator/>
-  <menu:menu menu:id=".uno:AnchorMenu">
-    <menu:menupopup>
-      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
-    </menu:menupopup>
-  </menu:menu>
+  <menu:menuitem menu:id=".uno:AnchorMenu"/>
   <menu:menu menu:id=".uno:WrapMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:WrapOff"/>
diff --git a/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml b/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml
index c87522fca404..86151b0ac55c 100644
--- a/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml
@@ -32,7 +32,7 @@
  <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="10129"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu" toolbar:helpid="20349"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:WrapOff" toolbar:visible="false" toolbar:helpid="20472"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:visible="false" toolbar:helpid="20473"/>
diff --git a/sw/uiconfig/sweb/toolbar/formdesign.xml b/sw/uiconfig/sweb/toolbar/formdesign.xml
index db6f6583b962..6ed098f0e34c 100644
--- a/sw/uiconfig/sweb/toolbar/formdesign.xml
+++ b/sw/uiconfig/sweb/toolbar/formdesign.xml
@@ -29,7 +29,7 @@
  <toolbar:toolbaritem xlink:href=".uno:AddField"/>
  <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
diff --git a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
index 4b7995041ff8..3127de1317ba 100644
--- a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
@@ -44,7 +44,7 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
  <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
diff --git a/sw/uiconfig/sweb/toolbar/graphicobjectbar.xml b/sw/uiconfig/sweb/toolbar/graphicobjectbar.xml
index 4a3bd3ad5afa..f6dd99fbf463 100644
--- a/sw/uiconfig/sweb/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/graphicobjectbar.xml
@@ -39,5 +39,5 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
  <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu" toolbar:helpid="20349"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/sweb/toolbar/oleobjectbar.xml b/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
index dd0b6cbbd683..4ac1c8fc0f16 100644
--- a/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
@@ -39,7 +39,7 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:helpid="10286"/>
  <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType" toolbar:helpid="20349"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu" toolbar:helpid="20349"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle" toolbar:helpid="10187"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="10200"/>