diff options
102 files changed, 233 insertions, 660 deletions
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 03babf01063f..f706b43beb14 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -171,6 +171,7 @@ cmd/lc_optionstreedialog.png cmd/lc_controlproperties.png cmd/sc_optionstreedialog.png cmd/sc_controlproperties.png # Formatmenu +cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png cmd/lc_conditionalformatmenu.png cmd/lc_conditionalformatdialog.png cmd/sc_conditionalformatmenu.png cmd/sc_conditionalformatdialog.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 8e1c4ab03112..599f982c75a8 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -122,6 +122,8 @@ cmd/ko/sc_bold.png cmd/sc_bold.png cmd/ko/sc_italic.png cmd/sc_italic.png cmd/ko/sc_underline.png cmd/sc_underline.png cmd/ko/sc_underlinedouble.png cmd/sc_underlinedouble.png +cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png +cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png cmd/lc_adddatefield.png cmd/lc_datefield.png cmd/lc_advancedmode.png cmd/lc_toggleobjectrotatemode.png cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index 9ec8e863ccbb..70b2b49f420a 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -50,6 +50,7 @@ cmd/sc_functiondialog.png cmd/sc_insertformula.png cmd/sc_wrapmenu.png cmd/sc_wrapon.png cmd/sc_alignframemenu.png cmd/sc_objectalign.png cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png +cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png cmd/sc_arrangeframemenu.png cmd/sc_bringtofront.png cmd/sc_savegraphic.png cmd/sc_save.png diff --git a/icon-themes/hicontrast/links.txt b/icon-themes/hicontrast/links.txt index ea11b2abd70c..c23ec86b31ce 100644 --- a/icon-themes/hicontrast/links.txt +++ b/icon-themes/hicontrast/links.txt @@ -1,3 +1,6 @@ +cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png +cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png + # paragraph line spacing cmd/lc_linespacing.png cmd/lc_spacepara15.png cmd/sc_linespacing.png cmd/sc_spacepara15.png diff --git a/icon-themes/human/links.txt b/icon-themes/human/links.txt index 5b1aca0d60d8..3fa696e5aaa8 100644 --- a/icon-themes/human/links.txt +++ b/icon-themes/human/links.txt @@ -1,3 +1,5 @@ +cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png +cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png cmd/lc_showsinglepage.png cmd/lc_adddirect.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 160f85b34088..a116d406964c 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -154,3 +154,6 @@ cmd/sc_insertrowsafter.png cmd/sc_insertrows.png cmd/lc_insertcolumnsafter.png cmd/lc_insertcolumns.png cmd/sc_insertcolumnsafter.png cmd/sc_insertcolumns.png +# anchor menu +cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png +cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 05858da2c643..60bf03f8d986 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -532,3 +532,7 @@ cmd/lc_showgraphics.png cmd/lc_insertgraphic.png # Calc conditional formatting group button cmd/lc_conditionalformatmenu.png cmd/lc_colorscaleformatdialog.png + +# anchor menu +cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png +cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 21fde6e16c17..6108449f7edf 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -333,6 +333,20 @@ <value>insertfield</value> </prop> </node> + <node oor:name="c28" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:AnchorMenu</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.ResourceMenuController</value> + </prop> + <prop oor:name="Value"> + <value>anchor</value> + </prop> + </node> </node> <node oor:name="ToolBar"> <node oor:name="ZoomToolBox" oor:op="replace"> @@ -1118,6 +1132,17 @@ <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> </prop> </node> + <node oor:name="AnchorController" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:AnchorMenu</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> + </prop> + </node> <node oor:name="org.apache.openoffice.comp.framework.NewToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:AddDirect</value> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index b9fd7a47f076..b0c65de23538 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5869,6 +5869,9 @@ </node> <node oor:name=".uno:AnchorMenu" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Change Anchor</value> + </prop> + <prop oor:name="ContextLabel" oor:type="xs:string"> <value xml:lang="en-US">Anc~hor</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 74cb3751ecc6..f67a879d94c0 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/scalc,\ endif $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\ + sc/uiconfig/scalc/popupmenu/anchor \ sc/uiconfig/scalc/popupmenu/audit \ sc/uiconfig/scalc/popupmenu/cell \ sc/uiconfig/scalc/popupmenu/celledit \ diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index daef1a3d4d1c..44b5272366ab 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -371,12 +371,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:SetAnchorToCell" menu:style="radio"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:AnchorMenu"/> <menu:menu menu:id=".uno:ArrangeMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:BringToFront"/> diff --git a/sc/uiconfig/scalc/popupmenu/anchor.xml b/sc/uiconfig/scalc/popupmenu/anchor.xml new file mode 100644 index 000000000000..c269bef3ad16 --- /dev/null +++ b/sc/uiconfig/scalc/popupmenu/anchor.xml @@ -0,0 +1,13 @@ +<?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:SetAnchorToCell" menu:style="radio"/> +</menu:menupopup> diff --git a/sc/uiconfig/scalc/popupmenu/chart.xml b/sc/uiconfig/scalc/popupmenu/chart.xml index d811cd9b5e3c..d2581d879551 100644 --- a/sc/uiconfig/scalc/popupmenu/chart.xml +++ b/sc/uiconfig/scalc/popupmenu/chart.xml @@ -43,12 +43,7 @@ <menu:menuitem menu:id=".uno:AlignDown"/> </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:SetAnchorToCell" 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/sc/uiconfig/scalc/popupmenu/draw.xml b/sc/uiconfig/scalc/popupmenu/draw.xml index 54f3fa5d79d3..daeb44d65036 100644 --- a/sc/uiconfig/scalc/popupmenu/draw.xml +++ b/sc/uiconfig/scalc/popupmenu/draw.xml @@ -48,12 +48,7 @@ <menu:menuitem menu:id=".uno:AlignDown"/> </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:SetAnchorToCell" menu:style="radio"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:AnchorMenu"/> <menu:menuitem menu:id=".uno:AssignMacro"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/> diff --git a/sc/uiconfig/scalc/popupmenu/form.xml b/sc/uiconfig/scalc/popupmenu/form.xml index f2367baa4813..2efbc4d9e16c 100644 --- a/sc/uiconfig/scalc/popupmenu/form.xml +++ b/sc/uiconfig/scalc/popupmenu/form.xml @@ -43,12 +43,7 @@ <menu:menuitem menu:id=".uno:AlignDown"/> </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:SetAnchorToCell" 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/sc/uiconfig/scalc/popupmenu/graphic.xml b/sc/uiconfig/scalc/popupmenu/graphic.xml index 4a17aa2bfbf0..ab60b0ce44f7 100644 --- a/sc/uiconfig/scalc/popupmenu/graphic.xml +++ b/sc/uiconfig/scalc/popupmenu/graphic.xml @@ -49,12 +49,7 @@ <menu:menuitem menu:id=".uno:AlignDown"/> </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:SetAnchorToCell" menu:style="radio"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:AnchorMenu"/> <menu:menuitem menu:id=".uno:AssignMacro"/> <menu:menuseparator/> <menu:menu menu:id=".uno:GroupMenu"> diff --git a/sc/uiconfig/scalc/popupmenu/media.xml b/sc/uiconfig/scalc/popupmenu/media.xml index 1ff8c233609c..242ac43d498d 100644 --- a/sc/uiconfig/scalc/popupmenu/media.xml +++ b/sc/uiconfig/scalc/popupmenu/media.xml @@ -45,12 +45,7 @@ <menu:menuitem menu:id=".uno:AlignDown"/> </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:SetAnchorToCell" 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/sc/uiconfig/scalc/popupmenu/oleobject.xml b/sc/uiconfig/scalc/popupmenu/oleobject.xml index fcaf47328641..cc1c3e208646 100644 --- a/sc/uiconfig/scalc/popupmenu/oleobject.xml +++ b/sc/uiconfig/scalc/popupmenu/oleobject.xml @@ -43,12 +43,7 @@ <menu:menuitem menu:id=".uno:AlignDown"/> </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:SetAnchorToCell" 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/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 6c2d839cd4b9..03f7f3efef8a 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -102,7 +102,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/misc/glossary.src \ sw/source/ui/misc/numberingtypelistbox.src \ sw/source/ui/misc/swruler.src \ - sw/source/ui/ribbar/tbxanchr.src \ sw/source/ui/shells/shells.src \ sw/source/ui/sidebar/PagePropertyPanel.src \ sw/source/ui/utlui/poolfmt.src \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index f9725be77cdf..b405797d1b86 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -645,7 +645,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/uibase/ribbar/drawbase \ sw/source/uibase/ribbar/dselect \ sw/source/uibase/ribbar/inputwin \ - sw/source/uibase/ribbar/tbxanchr \ sw/source/uibase/ribbar/workctrl \ sw/source/uibase/shells/annotsh \ sw/source/uibase/shells/basesh \ diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk index e373e72aa33e..f718b967f81a 100644 --- a/sw/UIConfig_sglobal.mk +++ b/sw/UIConfig_sglobal.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sglobal,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\ + sw/uiconfig/sglobal/popupmenu/anchor \ sw/uiconfig/sglobal/popupmenu/annotation \ sw/uiconfig/sglobal/popupmenu/draw \ sw/uiconfig/sglobal/popupmenu/drawtext \ diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk index 588a043be465..19addac06df1 100644 --- a/sw/UIConfig_sweb.mk +++ b/sw/UIConfig_sweb.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sweb,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\ + sw/uiconfig/sweb/popupmenu/anchor \ sw/uiconfig/sweb/popupmenu/annotation \ sw/uiconfig/sweb/popupmenu/form \ sw/uiconfig/sweb/popupmenu/formrichtext \ diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk index b733cb9c930f..c11d85ae45f9 100644 --- a/sw/UIConfig_swform.mk +++ b/sw/UIConfig_swform.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swform,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\ + sw/uiconfig/swform/popupmenu/anchor \ sw/uiconfig/swform/popupmenu/annotation \ sw/uiconfig/swform/popupmenu/draw \ sw/uiconfig/swform/popupmenu/drawtext \ diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk index b1286f89685d..061dd92655a8 100644 --- a/sw/UIConfig_swreport.mk +++ b/sw/UIConfig_swreport.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swreport,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\ + sw/uiconfig/swreport/popupmenu/anchor \ sw/uiconfig/swreport/popupmenu/annotation \ sw/uiconfig/swreport/popupmenu/draw \ sw/uiconfig/swreport/popupmenu/drawtext \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index b65cf151a82a..c85d90dce099 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swriter,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\ + sw/uiconfig/swriter/popupmenu/anchor \ sw/uiconfig/swriter/popupmenu/annotation \ sw/uiconfig/swriter/popupmenu/draw \ sw/uiconfig/swriter/popupmenu/drawtext \ diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk index 2fa8e2413d5e..67a061a364da 100644 --- a/sw/UIConfig_swxform.mk +++ b/sw/UIConfig_swxform.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swxform,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\ + sw/uiconfig/swxform/popupmenu/anchor \ sw/uiconfig/swxform/popupmenu/annotation \ sw/uiconfig/swxform/popupmenu/draw \ sw/uiconfig/swxform/popupmenu/drawtext \ diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 7f8a13323901..9a1bee2effee 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -5829,7 +5829,7 @@ SfxVoidItem TextWrap FN_DRAW_WRAP_DLG GroupId = GID_FORMAT; ] -SfxVoidItem ToggleAnchorType FN_TOOL_ANCHOR +SfxVoidItem AnchorMenu FN_TOOL_ANCHOR () [ AutoUpdate = FALSE, diff --git a/sw/source/ui/ribbar/tbxanchr.src b/sw/source/ui/ribbar/tbxanchr.src deleted file mode 100644 index c647c7ee9e1c..000000000000 --- a/sw/source/ui/ribbar/tbxanchr.src +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "ribbar.hrc" -#include "cmdid.h" -Menu MN_ANCHOR_POPUP -{ - ItemList = - { - MenuItem - { - _MenuItemFlags = MIB_RADIOCHECK ; - RadioCheck = TRUE ; - Identifier = FN_TOOL_ANCHOR_PAGE ; - Text [ en-US ] = "To Page" ; - }; - MenuItem - { - _MenuItemFlags = MIB_RADIOCHECK ; - RadioCheck = TRUE ; - Identifier = FN_TOOL_ANCHOR_PARAGRAPH ; - Text [ en-US ] = "To Paragraph" ; - }; - MenuItem - { - _MenuItemFlags = MIB_RADIOCHECK ; - RadioCheck = TRUE ; - Identifier = FN_TOOL_ANCHOR_AT_CHAR ; - Text [ en-US ] = "To Character" ; - }; - MenuItem - { - _MenuItemFlags = MIB_RADIOCHECK ; - RadioCheck = TRUE ; - Identifier = FN_TOOL_ANCHOR_CHAR ; - Text [ en-US ] = "As Character" ; - }; - MenuItem - { - _MenuItemFlags = MIB_RADIOCHECK ; - RadioCheck = TRUE ; - Identifier = FN_TOOL_ANCHOR_FRAME ; - Text [ en-US ] = "To Frame" ; - }; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index e65313a5bcb3..7388e67df65e 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -92,7 +92,6 @@ #include <zoomctrl.hxx> #include <wordcountctrl.hxx> #include <workctrl.hxx> -#include <tbxanchr.hxx> #include <fldwrap.hxx> #include <redlndlg.hxx> #include <syncbtn.hxx> @@ -284,7 +283,6 @@ void SwDLL::RegisterControls() SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod ); SvxTbxCtlDraw::RegisterControl(SID_TRACK_CHANGES_BAR, pMod ); - SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod ); SwTbxAutoTextCtrl::RegisterControl(FN_GLOSSARY_DLG, pMod ); svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod); diff --git a/sw/source/uibase/inc/tbxanchr.hxx b/sw/source/uibase/inc/tbxanchr.hxx deleted file mode 100644 index 5ee3595f8d87..000000000000 --- a/sw/source/uibase/inc/tbxanchr.hxx +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TBXANCHR_HXX -#define INCLUDED_SW_SOURCE_UIBASE_INC_TBXANCHR_HXX - -#include <sfx2/tbxctrl.hxx> - -class SwTbxAnchor : public SfxToolBoxControl -{ - sal_uInt16 nActAnchorId; - -public: - - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual void Click() override; - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; - - SFX_DECL_TOOLBOX_CONTROL(); - - SwTbxAnchor( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SwTbxAnchor(); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/ribbar/tbxanchr.cxx b/sw/source/uibase/ribbar/tbxanchr.cxx deleted file mode 100644 index d3a55457e520..000000000000 --- a/sw/source/uibase/ribbar/tbxanchr.cxx +++ /dev/null @@ -1,122 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <string> -#include <vcl/timer.hxx> -#include <sfx2/app.hxx> -#include <sfx2/htmlmode.hxx> -#include <svl/intitem.hxx> -#include <sfx2/dispatch.hxx> -#include <vcl/toolbox.hxx> - -#include "cmdid.h" -#include "docsh.hxx" -#include "swtypes.hxx" -#include "swmodule.hxx" -#include "wrtsh.hxx" -#include "view.hxx" -#include "viewopt.hxx" -#include "ribbar.hrc" -#include "tbxanchr.hxx" - -SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item); - -SwTbxAnchor::SwTbxAnchor( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : - SfxToolBoxControl( nSlotId, nId, rTbx ), - nActAnchorId(0) -{ - rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) ); -} - - SwTbxAnchor::~SwTbxAnchor() -{ -} - -void SwTbxAnchor::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) -{ - GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) ); - - if( eState == SfxItemState::DEFAULT ) - { - const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >( pState ); - if(pItem) - nActAnchorId = pItem->GetValue(); - } - -} - -VclPtr<SfxPopupWindow> SwTbxAnchor::CreatePopupWindow() -{ - SwTbxAnchor::Click(); - return nullptr; -} - -void SwTbxAnchor::Click() -{ - PopupMenu aPopMenu(SW_RES(MN_ANCHOR_POPUP)); - - SfxViewFrame* pViewFrame( nullptr ); - SfxDispatcher* pDispatch( nullptr ); - SfxViewShell* pCurSh( SfxViewShell::Current() ); - - if ( pCurSh ) - { - pViewFrame = pCurSh->GetViewFrame(); - if ( pViewFrame ) - pDispatch = pViewFrame->GetDispatcher(); - } - - SwView* pActiveView = nullptr; - if(pViewFrame) - { - SwView* pView = static_cast<SwView*>(SfxViewShell::GetFirst(true, checkSfxViewShell<SwView>)); - while( pView ) - { - if(pView->GetViewFrame() == pViewFrame) - { - pActiveView = pView; - break; - } - pView = static_cast<SwView*>(SfxViewShell::GetNext(*pView, true, checkSfxViewShell<SwView>)); - } - } - if(!pActiveView) - { - OSL_FAIL("No active view found"); - return; - } - SwWrtShell* pWrtShell = pActiveView->GetWrtShellPtr(); - aPopMenu.EnableItem( FN_TOOL_ANCHOR_FRAME, nullptr != pWrtShell->IsFlyInFly() ); - - Rectangle aRect(GetToolBox().GetItemRect(GetId())); - - if (pWrtShell->IsInHeaderFooter()) - aPopMenu.RemoveItem(aPopMenu.GetItemPos(FN_TOOL_ANCHOR_PAGE)); - - if (nActAnchorId) - aPopMenu.CheckItem(nActAnchorId); - - sal_uInt16 nSlotId = aPopMenu.Execute(&GetToolBox(), aRect); - GetToolBox().EndSelection(); - - if (nSlotId) - pDispatch->Execute(nSlotId, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 0e015abf4737..0f3a7193833b 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -278,15 +278,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/sglobal/popupmenu/anchor.xml b/sw/uiconfig/sglobal/popupmenu/anchor.xml new file mode 100644 index 000000000000..e87252b599f4 --- /dev/null +++ b/sw/uiconfig/sglobal/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/sglobal/popupmenu/draw.xml b/sw/uiconfig/sglobal/popupmenu/draw.xml index ccaa538a53cb..fc12e15ae0bb 100644 --- a/sw/uiconfig/sglobal/popupmenu/draw.xml +++ b/sw/uiconfig/sglobal/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/sglobal/popupmenu/form.xml b/sw/uiconfig/sglobal/popupmenu/form.xml index a0f4cc938cc5..6c2cf9e9da5c 100644 --- a/sw/uiconfig/sglobal/popupmenu/form.xml +++ b/sw/uiconfig/sglobal/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/sglobal/popupmenu/frame.xml b/sw/uiconfig/sglobal/popupmenu/frame.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/sglobal/popupmenu/frame.xml +++ b/sw/uiconfig/sglobal/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/sglobal/popupmenu/graphic.xml b/sw/uiconfig/sglobal/popupmenu/graphic.xml index 8c3c2eab5bf5..1286b7747f42 100644 --- a/sw/uiconfig/sglobal/popupmenu/graphic.xml +++ b/sw/uiconfig/sglobal/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/sglobal/popupmenu/media.xml b/sw/uiconfig/sglobal/popupmenu/media.xml index 2c7c9669405c..30b6baae954a 100644 --- a/sw/uiconfig/sglobal/popupmenu/media.xml +++ b/sw/uiconfig/sglobal/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/sglobal/popupmenu/oleobject.xml b/sw/uiconfig/sglobal/popupmenu/oleobject.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/sglobal/popupmenu/oleobject.xml +++ b/sw/uiconfig/sglobal/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/sglobal/toolbar/drawingobjectbar.xml b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml index 0933b16e85d2..2ae3e9a4c5bd 100644 --- a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml +++ b/sw/uiconfig/sglobal/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/sglobal/toolbar/formdesign.xml b/sw/uiconfig/sglobal/toolbar/formdesign.xml index db6f6583b962..6ed098f0e34c 100644 --- a/sw/uiconfig/sglobal/toolbar/formdesign.xml +++ b/sw/uiconfig/sglobal/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/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml index 4b7995041ff8..3127de1317ba 100644 --- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/sglobal/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/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml index dd0b6cbbd683..4ac1c8fc0f16 100644 --- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/sglobal/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"/> 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"/> 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"/> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 89857cf3a849..d1cb979a3f93 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -279,15 +279,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/swreport/popupmenu/anchor.xml b/sw/uiconfig/swreport/popupmenu/anchor.xml new file mode 100644 index 000000000000..e87252b599f4 --- /dev/null +++ b/sw/uiconfig/swreport/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/swreport/popupmenu/draw.xml b/sw/uiconfig/swreport/popupmenu/draw.xml index ccaa538a53cb..fc12e15ae0bb 100644 --- a/sw/uiconfig/swreport/popupmenu/draw.xml +++ b/sw/uiconfig/swreport/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/swreport/popupmenu/form.xml b/sw/uiconfig/swreport/popupmenu/form.xml index a0f4cc938cc5..6c2cf9e9da5c 100644 --- a/sw/uiconfig/swreport/popupmenu/form.xml +++ b/sw/uiconfig/swreport/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/swreport/popupmenu/frame.xml b/sw/uiconfig/swreport/popupmenu/frame.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swreport/popupmenu/frame.xml +++ b/sw/uiconfig/swreport/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/swreport/popupmenu/graphic.xml b/sw/uiconfig/swreport/popupmenu/graphic.xml index 8c3c2eab5bf5..1286b7747f42 100644 --- a/sw/uiconfig/swreport/popupmenu/graphic.xml +++ b/sw/uiconfig/swreport/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/swreport/popupmenu/media.xml b/sw/uiconfig/swreport/popupmenu/media.xml index 2c7c9669405c..30b6baae954a 100644 --- a/sw/uiconfig/swreport/popupmenu/media.xml +++ b/sw/uiconfig/swreport/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/swreport/popupmenu/oleobject.xml b/sw/uiconfig/swreport/popupmenu/oleobject.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swreport/popupmenu/oleobject.xml +++ b/sw/uiconfig/swreport/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/swreport/toolbar/drawingobjectbar.xml b/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml index 0933b16e85d2..2ae3e9a4c5bd 100644 --- a/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml +++ b/sw/uiconfig/swreport/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/swreport/toolbar/formdesign.xml b/sw/uiconfig/swreport/toolbar/formdesign.xml index e6ed55cfd798..b00b25188be0 100644 --- a/sw/uiconfig/swreport/toolbar/formdesign.xml +++ b/sw/uiconfig/swreport/toolbar/formdesign.xml @@ -33,7 +33,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/swreport/toolbar/frameobjectbar.xml b/sw/uiconfig/swreport/toolbar/frameobjectbar.xml index 4b7995041ff8..3127de1317ba 100644 --- a/sw/uiconfig/swreport/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swreport/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/swreport/toolbar/oleobjectbar.xml b/sw/uiconfig/swreport/toolbar/oleobjectbar.xml index dd0b6cbbd683..4ac1c8fc0f16 100644 --- a/sw/uiconfig/swreport/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swreport/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"/> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 784d18608117..fc9c443cc99c 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -487,15 +487,7 @@ <menu:menuitem menu:id=".uno:NameGroup"/> <menu:menuitem menu:id=".uno:ObjectTitleDescription"/> <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/swriter/popupmenu/anchor.xml b/sw/uiconfig/swriter/popupmenu/anchor.xml new file mode 100644 index 000000000000..e87252b599f4 --- /dev/null +++ b/sw/uiconfig/swriter/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/swriter/popupmenu/draw.xml b/sw/uiconfig/swriter/popupmenu/draw.xml index ccaa538a53cb..fc12e15ae0bb 100644 --- a/sw/uiconfig/swriter/popupmenu/draw.xml +++ b/sw/uiconfig/swriter/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/swriter/popupmenu/form.xml b/sw/uiconfig/swriter/popupmenu/form.xml index a0f4cc938cc5..6c2cf9e9da5c 100644 --- a/sw/uiconfig/swriter/popupmenu/form.xml +++ b/sw/uiconfig/swriter/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/swriter/popupmenu/frame.xml b/sw/uiconfig/swriter/popupmenu/frame.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swriter/popupmenu/frame.xml +++ b/sw/uiconfig/swriter/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/swriter/popupmenu/graphic.xml b/sw/uiconfig/swriter/popupmenu/graphic.xml index 8c3c2eab5bf5..1286b7747f42 100644 --- a/sw/uiconfig/swriter/popupmenu/graphic.xml +++ b/sw/uiconfig/swriter/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/swriter/popupmenu/media.xml b/sw/uiconfig/swriter/popupmenu/media.xml index 2c7c9669405c..30b6baae954a 100644 --- a/sw/uiconfig/swriter/popupmenu/media.xml +++ b/sw/uiconfig/swriter/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/swriter/popupmenu/oleobject.xml b/sw/uiconfig/swriter/popupmenu/oleobject.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swriter/popupmenu/oleobject.xml +++ b/sw/uiconfig/swriter/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/swriter/toolbar/drawingobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml index 2c3ba2aa17c1..aece92425176 100644 --- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml @@ -29,7 +29,7 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> <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:WrapOff" toolbar:helpid="20472"/> <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/> diff --git a/sw/uiconfig/swriter/toolbar/formdesign.xml b/sw/uiconfig/swriter/toolbar/formdesign.xml index 12f0800adc0a..2e831322cc69 100644 --- a/sw/uiconfig/swriter/toolbar/formdesign.xml +++ b/sw/uiconfig/swriter/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/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index daa05104e0d6..df03c9d7342d 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -20,7 +20,7 @@ <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar"> <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/> + <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:WrapOff"/> <toolbar:toolbaritem xlink:href=".uno:WrapOn"/> diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 941ba4f3b8f3..299402e7ad3d 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -20,7 +20,7 @@ <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink"> <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:helpid="5552" toolbar:visible="false"/> <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:WrapOff" toolbar:helpid="20472"/> <toolbar:toolbaritem xlink:href=".uno:WrapOn" toolbar:helpid="20473"/> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index be99fe4c47ff..a1bbb159aa20 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -279,15 +279,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/swxform/popupmenu/anchor.xml b/sw/uiconfig/swxform/popupmenu/anchor.xml new file mode 100644 index 000000000000..e87252b599f4 --- /dev/null +++ b/sw/uiconfig/swxform/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/swxform/popupmenu/draw.xml b/sw/uiconfig/swxform/popupmenu/draw.xml index ccaa538a53cb..fc12e15ae0bb 100644 --- a/sw/uiconfig/swxform/popupmenu/draw.xml +++ b/sw/uiconfig/swxform/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/swxform/popupmenu/form.xml b/sw/uiconfig/swxform/popupmenu/form.xml index a0f4cc938cc5..6c2cf9e9da5c 100644 --- a/sw/uiconfig/swxform/popupmenu/form.xml +++ b/sw/uiconfig/swxform/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/swxform/popupmenu/frame.xml b/sw/uiconfig/swxform/popupmenu/frame.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swxform/popupmenu/frame.xml +++ b/sw/uiconfig/swxform/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/swxform/popupmenu/graphic.xml b/sw/uiconfig/swxform/popupmenu/graphic.xml index 8c3c2eab5bf5..1286b7747f42 100644 --- a/sw/uiconfig/swxform/popupmenu/graphic.xml +++ b/sw/uiconfig/swxform/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/swxform/popupmenu/media.xml b/sw/uiconfig/swxform/popupmenu/media.xml index 2c7c9669405c..30b6baae954a 100644 --- a/sw/uiconfig/swxform/popupmenu/media.xml +++ b/sw/uiconfig/swxform/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/swxform/popupmenu/oleobject.xml b/sw/uiconfig/swxform/popupmenu/oleobject.xml index f28337c9d0f7..3cd900b12283 100644 --- a/sw/uiconfig/swxform/popupmenu/oleobject.xml +++ b/sw/uiconfig/swxform/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/swxform/toolbar/drawingobjectbar.xml b/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml index 0933b16e85d2..2ae3e9a4c5bd 100644 --- a/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml +++ b/sw/uiconfig/swxform/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/swxform/toolbar/formdesign.xml b/sw/uiconfig/swxform/toolbar/formdesign.xml index b6398aaf4fc3..744dc8a83a1a 100644 --- a/sw/uiconfig/swxform/toolbar/formdesign.xml +++ b/sw/uiconfig/swxform/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/swxform/toolbar/frameobjectbar.xml b/sw/uiconfig/swxform/toolbar/frameobjectbar.xml index 4b7995041ff8..3127de1317ba 100644 --- a/sw/uiconfig/swxform/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swxform/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/swxform/toolbar/oleobjectbar.xml b/sw/uiconfig/swxform/toolbar/oleobjectbar.xml index dd0b6cbbd683..4ac1c8fc0f16 100644 --- a/sw/uiconfig/swxform/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swxform/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"/> |