diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-03-08 13:37:18 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-03-08 13:53:46 +0200 |
commit | 6d2db6cf7caf55422eed69212236aab8542a3415 (patch) | |
tree | dc713aa5c3743c8a8a61cb31a8a37d61096d236e /sw/uiconfig/swform | |
parent | 2600220f53f51be2d017b012c56293bf8cf835ef (diff) |
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
Diffstat (limited to 'sw/uiconfig/swform')
-rw-r--r-- | sw/uiconfig/swform/menubar/menubar.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/anchor.xml | 16 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/draw.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/form.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/frame.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/graphic.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/media.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/oleobject.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/swform/toolbar/drawingobjectbar.xml | 2 | ||||
-rw-r--r-- | sw/uiconfig/swform/toolbar/formdesign.xml | 2 | ||||
-rw-r--r-- | sw/uiconfig/swform/toolbar/frameobjectbar.xml | 2 | ||||
-rw-r--r-- | sw/uiconfig/swform/toolbar/oleobjectbar.xml | 2 |
12 files changed, 27 insertions, 67 deletions
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 17c8cd43200d..9c0495edf25e 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -277,15 +277,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/swform/popupmenu/anchor.xml b/sw/uiconfig/swform/popupmenu/anchor.xml new file mode 100644 index 000000000000..e87252b599f4 --- /dev/null +++ b/sw/uiconfig/swform/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/swform/popupmenu/draw.xml b/sw/uiconfig/swform/popupmenu/draw.xml index ccaa538a53cb..fc12e15ae0bb 100644 --- a/sw/uiconfig/swform/popupmenu/draw.xml +++ b/sw/uiconfig/swform/popupmenu/draw.xml @@ -19,15 +19,7 @@ <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/> <menu:menuitem menu:id=".uno:InsertCaptionDialog"/> <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/swform/popupmenu/form.xml b/sw/uiconfig/swform/popupmenu/form.xml index a0f4cc938cc5..6c2cf9e9da5c 100644 --- a/sw/uiconfig/swform/popupmenu/form.xml +++ b/sw/uiconfig/swform/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/swform/popupmenu/frame.xml b/sw/uiconfig/swform/popupmenu/frame.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swform/popupmenu/frame.xml +++ b/sw/uiconfig/swform/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/swform/popupmenu/graphic.xml b/sw/uiconfig/swform/popupmenu/graphic.xml index 8c3c2eab5bf5..1286b7747f42 100644 --- a/sw/uiconfig/swform/popupmenu/graphic.xml +++ b/sw/uiconfig/swform/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/swform/popupmenu/media.xml b/sw/uiconfig/swform/popupmenu/media.xml index 2c7c9669405c..30b6baae954a 100644 --- a/sw/uiconfig/swform/popupmenu/media.xml +++ b/sw/uiconfig/swform/popupmenu/media.xml @@ -49,15 +49,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/swform/popupmenu/oleobject.xml b/sw/uiconfig/swform/popupmenu/oleobject.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swform/popupmenu/oleobject.xml +++ b/sw/uiconfig/swform/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/swform/toolbar/drawingobjectbar.xml b/sw/uiconfig/swform/toolbar/drawingobjectbar.xml index 0933b16e85d2..2ae3e9a4c5bd 100644 --- a/sw/uiconfig/swform/toolbar/drawingobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/drawingobjectbar.xml @@ -50,7 +50,7 @@ <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:helpid="10287"/> <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="10130"/> <toolbar:toolbarseparator/> - <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:FormatUngroup" toolbar:helpid="10455"/> <toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:helpid="10454"/> diff --git a/sw/uiconfig/swform/toolbar/formdesign.xml b/sw/uiconfig/swform/toolbar/formdesign.xml index 12f0800adc0a..2e831322cc69 100644 --- a/sw/uiconfig/swform/toolbar/formdesign.xml +++ b/sw/uiconfig/swform/toolbar/formdesign.xml @@ -32,7 +32,7 @@ <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/> - <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/swform/toolbar/frameobjectbar.xml b/sw/uiconfig/swform/toolbar/frameobjectbar.xml index 4b7995041ff8..3127de1317ba 100644 --- a/sw/uiconfig/swform/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swform/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/swform/toolbar/oleobjectbar.xml b/sw/uiconfig/swform/toolbar/oleobjectbar.xml index dd0b6cbbd683..4ac1c8fc0f16 100644 --- a/sw/uiconfig/swform/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swform/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"/> |