diff options
26 files changed, 158 insertions, 219 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 267177e614f8..d0366d815646 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -319,6 +319,20 @@ <value>freezepanes</value> </prop> </node> + <node oor:name="c27" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:InsertFieldCtrl</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>insertfield</value> + </prop> + </node> </node> <node oor:name="ToolBar"> <node oor:name="ZoomToolBox" oor:op="replace"> @@ -1082,6 +1096,17 @@ <value>.uno:FreezePanesMenu</value> </prop> </node> + <node oor:name="InsertFieldController" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:InsertFieldCtrl</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/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 7d6bf53882a6..05a9b9343fb0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -570,6 +570,9 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Insert Field</value> </prop> + <prop oor:name="ContextLabel" oor:type="xs:string"> + <value xml:lang="en-US">Fiel~d</value> + </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>9</value> </prop> diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk index 8d831d3d9af8..a0124baa9a4e 100644 --- a/sw/UIConfig_sglobal.mk +++ b/sw/UIConfig_sglobal.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\ sw/uiconfig/sglobal/popupmenu/form \ sw/uiconfig/sglobal/popupmenu/frame \ sw/uiconfig/sglobal/popupmenu/graphic \ + sw/uiconfig/sglobal/popupmenu/insertfield \ sw/uiconfig/sglobal/popupmenu/media \ sw/uiconfig/sglobal/popupmenu/oleobject \ sw/uiconfig/sglobal/popupmenu/preview \ diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk index 7b7b809c9d70..38b2c190320c 100644 --- a/sw/UIConfig_sweb.mk +++ b/sw/UIConfig_sweb.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\ sw/uiconfig/sweb/popupmenu/form \ sw/uiconfig/sweb/popupmenu/frame \ sw/uiconfig/sweb/popupmenu/graphic \ + sw/uiconfig/sweb/popupmenu/insertfield \ sw/uiconfig/sweb/popupmenu/oleobject \ sw/uiconfig/sweb/popupmenu/preview \ sw/uiconfig/sweb/popupmenu/source \ diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk index 11dd732e5211..9d3fc8b25ec1 100644 --- a/sw/UIConfig_swform.mk +++ b/sw/UIConfig_swform.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\ sw/uiconfig/swform/popupmenu/form \ sw/uiconfig/swform/popupmenu/frame \ sw/uiconfig/swform/popupmenu/graphic \ + sw/uiconfig/swform/popupmenu/insertfield \ sw/uiconfig/swform/popupmenu/media \ sw/uiconfig/swform/popupmenu/oleobject \ sw/uiconfig/swform/popupmenu/preview \ diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk index aafac331196c..598f90ed4fee 100644 --- a/sw/UIConfig_swreport.mk +++ b/sw/UIConfig_swreport.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\ sw/uiconfig/swreport/popupmenu/form \ sw/uiconfig/swreport/popupmenu/frame \ sw/uiconfig/swreport/popupmenu/graphic \ + sw/uiconfig/swreport/popupmenu/insertfield \ sw/uiconfig/swreport/popupmenu/media \ sw/uiconfig/swreport/popupmenu/oleobject \ sw/uiconfig/swreport/popupmenu/preview \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 1457d21f5f03..a8636f53f9a6 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\ sw/uiconfig/swriter/popupmenu/form \ sw/uiconfig/swriter/popupmenu/frame \ sw/uiconfig/swriter/popupmenu/graphic \ + sw/uiconfig/swriter/popupmenu/insertfield \ sw/uiconfig/swriter/popupmenu/media \ sw/uiconfig/swriter/popupmenu/oleobject \ sw/uiconfig/swriter/popupmenu/preview \ diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk index 8c7994461e66..86673b792fa9 100644 --- a/sw/UIConfig_swxform.mk +++ b/sw/UIConfig_swxform.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\ sw/uiconfig/swxform/popupmenu/form \ sw/uiconfig/swxform/popupmenu/frame \ sw/uiconfig/swxform/popupmenu/graphic \ + sw/uiconfig/swxform/popupmenu/insertfield \ sw/uiconfig/swxform/popupmenu/media \ sw/uiconfig/swxform/popupmenu/oleobject \ sw/uiconfig/swxform/popupmenu/preview \ diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h index 6a235d87bc2a..1a4d957fe790 100644 --- a/sw/inc/swcommands.h +++ b/sw/inc/swcommands.h @@ -25,14 +25,6 @@ #define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop" #define CMD_FN_TABLE_SELECT_COL ".uno:EntireColumn" #define CMD_FN_TABLE_SELECT_ROW ".uno:EntireRow" -#define CMD_FN_INSERT_FLD_AUTHOR ".uno:InsertAuthorField" -#define CMD_FN_INSERT_FLD_DATE ".uno:InsertDateField" -#define CMD_FN_INSERT_FIELD ".uno:InsertField" -#define CMD_FN_INSERT_FLD_PGCOUNT ".uno:InsertPageCountField" -#define CMD_FN_INSERT_FLD_PGNUMBER ".uno:InsertPageNumberField" -#define CMD_FN_INSERT_FLD_TIME ".uno:InsertTimeField" -#define CMD_FN_INSERT_FLD_TITLE ".uno:InsertTitleField" -#define CMD_FN_INSERT_FLD_TOPIC ".uno:InsertTopicField" #define CMD_FN_TABLE_MERGE_TABLE ".uno:MergeTable" #define CMD_FN_FRAME_DOWN ".uno:ObjectBackOne" #define CMD_FN_TABLE_SET_READ_ONLY_CELLS ".uno:Protect" diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 2c3559be17a4..5930ec5f7f01 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -287,7 +287,6 @@ void SwDLL::RegisterControls() SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod ); SvxTbxCtlDraw::RegisterControl(SID_TRACK_CHANGES_BAR, pMod ); SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod ); - SwTbxFieldCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod ); SwTbxAutoTextCtrl::RegisterControl(FN_GLOSSARY_DLG, pMod ); svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod); diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc index 4973d8126f34..fcfe8774e436 100644 --- a/sw/source/uibase/inc/ribbar.hrc +++ b/sw/source/uibase/inc/ribbar.hrc @@ -32,7 +32,6 @@ //Resourcen fuer Inputwin (Rechenleiste) #define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 12) -#define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 13) #define ST_TBL (RC_RIBBAR_BEGIN + 14) #define ST_FRM (RC_RIBBAR_BEGIN + 15) #define ST_PGE (RC_RIBBAR_BEGIN + 16) diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 233168288c27..7abe8a6cc869 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -71,20 +71,6 @@ public: DECL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); }; -class SwTbxFieldCtrl : public SfxToolBoxControl -{ -public: - SFX_DECL_TOOLBOX_CONTROL(); - - SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SwTbxFieldCtrl(); - - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; - virtual void StateChanged( sal_uInt16 nSID, - SfxItemState eState, - const SfxPoolItem* pState ) override; -}; - class SwScrollNaviPopup; class SwScrollNaviToolBox : public ToolBox diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 1a1763419917..420df7eb1ea0 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem ); -SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem ); SwTbxAutoTextCtrl::SwTbxAutoTextCtrl( sal_uInt16 nSlotId, @@ -176,66 +175,6 @@ void SwTbxAutoTextCtrl::DelPopup() } } -SwTbxFieldCtrl::SwTbxFieldCtrl( - sal_uInt16 nSlotId, - sal_uInt16 nId, - ToolBox& rTbx ) : - SfxToolBoxControl( nSlotId, nId, rTbx ) -{ - rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) ); -} - -SwTbxFieldCtrl::~SwTbxFieldCtrl() -{ -} - -VclPtr<SfxPopupWindow> SwTbxFieldCtrl::CreatePopupWindow() -{ - SwView* pView = ::GetActiveView(); - if(pView && !pView->GetDocShell()->IsReadOnly() && - !pView->GetWrtShell().HasReadonlySel() ) - { - PopupMenu* pPopup = new PopupMenu(SW_RES(RID_INSERT_FIELD_CTRL)); - - if (::GetHtmlMode(pView->GetDocShell()) & HTMLMODE_ON) - { - pPopup->RemoveItem(pPopup->GetItemPos(FN_INSERT_FLD_PGCOUNT)); - pPopup->RemoveItem(pPopup->GetItemPos(FN_INSERT_FLD_TOPIC)); - } - - ToolBox* pToolBox = &GetToolBox(); - sal_uInt16 nId = GetId(); - SfxDispatcher *rDispat = pView->GetViewFrame()->GetDispatcher(); - - // set the icons in the Popup-Menu, delete the pPopup - SfxPopupMenuManager aPop( pPopup, rDispat->GetFrame()->GetBindings() ); - - pToolBox->SetItemDown( nId, true ); - - pPopup->Execute( pToolBox, pToolBox->GetItemRect( nId ), - (pToolBox->GetAlign() == WindowAlign::Top || pToolBox->GetAlign() == WindowAlign::Bottom) ? - PopupMenuFlags::ExecuteDown : PopupMenuFlags::ExecuteRight ); - - pToolBox->SetItemDown( nId, false ); - } - - GetToolBox().EndSelection(); - - return nullptr; -} - -void SwTbxFieldCtrl::StateChanged( sal_uInt16, - SfxItemState eState, - const SfxPoolItem* pState ) -{ - GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) ); - if (eState >= SfxItemState::DEFAULT) - { - GetToolBox().CheckItem( GetId(), static_cast<const SfxBoolItem*>(pState)->GetValue() ); - } -} - - // Navigation-Popup // determine the order of the toolbox items static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] = diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src index 0ea858d157d2..4c4b2a9caa33 100644 --- a/sw/source/uibase/ribbar/workctrl.src +++ b/sw/source/uibase/ribbar/workctrl.src @@ -24,64 +24,6 @@ #include "helpid.h" #include "cmdid.h" -Menu RID_INSERT_FIELD_CTRL -{ - ItemList = - { - MenuItem - { - Identifier = FN_INSERT_FLD_PGNUMBER ; - HelpId = CMD_FN_INSERT_FLD_PGNUMBER ; - Text [ en-US ] = "Page Number" ; - }; - MenuItem - { - Identifier = FN_INSERT_FLD_PGCOUNT ; - HelpId = CMD_FN_INSERT_FLD_PGCOUNT ; - Text [ en-US ] = "Page Count" ; - }; - MenuItem - { - Identifier = FN_INSERT_FLD_DATE ; - HelpId = CMD_FN_INSERT_FLD_DATE ; - Text [ en-US ] = "Date" ; - }; - MenuItem - { - Identifier = FN_INSERT_FLD_TIME ; - HelpId = CMD_FN_INSERT_FLD_TIME ; - Text [ en-US ] = "Time" ; - }; - MenuItem - { - Identifier = FN_INSERT_FLD_TITLE ; - HelpId = CMD_FN_INSERT_FLD_TITLE ; - Text [ en-US ] = "Title" ; - }; - MenuItem - { - Identifier = FN_INSERT_FLD_AUTHOR ; - HelpId = CMD_FN_INSERT_FLD_AUTHOR ; - Text [ en-US ] = "Author" ; - }; - MenuItem - { - Identifier = FN_INSERT_FLD_TOPIC ; - HelpId = CMD_FN_INSERT_FLD_TOPIC ; - Text [ en-US ] = "Subject" ; - }; - MenuItem - { - Separator = TRUE ; - }; - MenuItem - { - Identifier = FN_INSERT_FIELD ; - HelpId = CMD_FN_INSERT_FIELD ; - Text [ en-US ] = "More Fields..." ; - }; - }; -}; #define SCROLL_IMAGE_IDLIST \ IdList = \ { \ diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 7c6e1a28c1f0..0e015abf4737 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -166,19 +166,7 @@ <menu:menu menu:id=".uno:InsertMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:InsertBreak"/> - <menu:menu menu:id=".uno:FieldMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:InsertPageNumberField"/> - <menu:menuitem menu:id=".uno:InsertPageCountField"/> - <menu:menuitem menu:id=".uno:InsertDateField"/> - <menu:menuitem menu:id=".uno:InsertTimeField"/> - <menu:menuitem menu:id=".uno:InsertTitleField"/> - <menu:menuitem menu:id=".uno:InsertAuthorField"/> - <menu:menuitem menu:id=".uno:InsertTopicField"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:InsertField"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:InsertFieldCtrl"/> <menu:menuitem menu:id=".uno:InsertSymbol"/> <menu:menu menu:id=".uno:FormattingMarkMenu"> <menu:menupopup> diff --git a/sw/uiconfig/sglobal/popupmenu/insertfield.xml b/sw/uiconfig/sglobal/popupmenu/insertfield.xml new file mode 100644 index 000000000000..6e5815340fe1 --- /dev/null +++ b/sw/uiconfig/sglobal/popupmenu/insertfield.xml @@ -0,0 +1,20 @@ +<?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:InsertPageNumberField"/> + <menu:menuitem menu:id=".uno:InsertPageCountField"/> + <menu:menuitem menu:id=".uno:InsertDateField"/> + <menu:menuitem menu:id=".uno:InsertTimeField"/> + <menu:menuitem menu:id=".uno:InsertTitleField"/> + <menu:menuitem menu:id=".uno:InsertAuthorField"/> + <menu:menuitem menu:id=".uno:InsertTopicField"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:InsertField"/> +</menu:menupopup> diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 41f82571310c..8929f9cff6eb 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -134,17 +134,7 @@ </menu:menu> <menu:menu menu:id=".uno:InsertMenu"> <menu:menupopup> - <menu:menu menu:id=".uno:FieldMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:InsertDateField"/> - <menu:menuitem menu:id=".uno:InsertTimeField"/> - <menu:menuitem menu:id=".uno:InsertTitleField"/> - <menu:menuitem menu:id=".uno:InsertAuthorField"/> - <menu:menuitem menu:id=".uno:InsertTopicField"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:InsertField"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:InsertFieldCtrl"/> <menu:menuitem menu:id=".uno:InsertSymbol"/> <menu:menu menu:id=".uno:FormattingMarkMenu"> <menu:menupopup> diff --git a/sw/uiconfig/sweb/popupmenu/insertfield.xml b/sw/uiconfig/sweb/popupmenu/insertfield.xml new file mode 100644 index 000000000000..4b42ce75668b --- /dev/null +++ b/sw/uiconfig/sweb/popupmenu/insertfield.xml @@ -0,0 +1,18 @@ +<?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:InsertPageNumberField"/> + <menu:menuitem menu:id=".uno:InsertDateField"/> + <menu:menuitem menu:id=".uno:InsertTimeField"/> + <menu:menuitem menu:id=".uno:InsertTitleField"/> + <menu:menuitem menu:id=".uno:InsertAuthorField"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:InsertField"/> +</menu:menupopup> diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index e824b00acd04..17c8cd43200d 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -165,19 +165,7 @@ <menu:menu menu:id=".uno:InsertMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:InsertBreak"/> - <menu:menu menu:id=".uno:FieldMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:InsertPageNumberField"/> - <menu:menuitem menu:id=".uno:InsertPageCountField"/> - <menu:menuitem menu:id=".uno:InsertDateField"/> - <menu:menuitem menu:id=".uno:InsertTimeField"/> - <menu:menuitem menu:id=".uno:InsertTitleField"/> - <menu:menuitem menu:id=".uno:InsertAuthorField"/> - <menu:menuitem menu:id=".uno:InsertTopicField"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:InsertField"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:InsertFieldCtrl"/> <menu:menuitem menu:id=".uno:InsertSymbol"/> <menu:menu menu:id=".uno:FormattingMarkMenu"> <menu:menupopup> diff --git a/sw/uiconfig/swform/popupmenu/insertfield.xml b/sw/uiconfig/swform/popupmenu/insertfield.xml new file mode 100644 index 000000000000..6e5815340fe1 --- /dev/null +++ b/sw/uiconfig/swform/popupmenu/insertfield.xml @@ -0,0 +1,20 @@ +<?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:InsertPageNumberField"/> + <menu:menuitem menu:id=".uno:InsertPageCountField"/> + <menu:menuitem menu:id=".uno:InsertDateField"/> + <menu:menuitem menu:id=".uno:InsertTimeField"/> + <menu:menuitem menu:id=".uno:InsertTitleField"/> + <menu:menuitem menu:id=".uno:InsertAuthorField"/> + <menu:menuitem menu:id=".uno:InsertTopicField"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:InsertField"/> +</menu:menupopup> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 3b090bdf7779..89857cf3a849 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -166,19 +166,7 @@ <menu:menu menu:id=".uno:InsertMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:InsertBreak"/> - <menu:menu menu:id=".uno:FieldMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:InsertPageNumberField"/> - <menu:menuitem menu:id=".uno:InsertPageCountField"/> - <menu:menuitem menu:id=".uno:InsertDateField"/> - <menu:menuitem menu:id=".uno:InsertTimeField"/> - <menu:menuitem menu:id=".uno:InsertTitleField"/> - <menu:menuitem menu:id=".uno:InsertAuthorField"/> - <menu:menuitem menu:id=".uno:InsertTopicField"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:InsertField"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:InsertFieldCtrl"/> <menu:menuitem menu:id=".uno:InsertSymbol"/> <menu:menu menu:id=".uno:FormattingMarkMenu"> <menu:menupopup> diff --git a/sw/uiconfig/swreport/popupmenu/insertfield.xml b/sw/uiconfig/swreport/popupmenu/insertfield.xml new file mode 100644 index 000000000000..6e5815340fe1 --- /dev/null +++ b/sw/uiconfig/swreport/popupmenu/insertfield.xml @@ -0,0 +1,20 @@ +<?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:InsertPageNumberField"/> + <menu:menuitem menu:id=".uno:InsertPageCountField"/> + <menu:menuitem menu:id=".uno:InsertDateField"/> + <menu:menuitem menu:id=".uno:InsertTimeField"/> + <menu:menuitem menu:id=".uno:InsertTitleField"/> + <menu:menuitem menu:id=".uno:InsertAuthorField"/> + <menu:menuitem menu:id=".uno:InsertTopicField"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:InsertField"/> +</menu:menupopup> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index a9f9de95c2bf..784d18608117 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -289,19 +289,7 @@ </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:InsertPageNumberField"/> - <menu:menu menu:id=".uno:FieldMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:InsertPageNumberField"/> - <menu:menuitem menu:id=".uno:InsertPageCountField"/> - <menu:menuitem menu:id=".uno:InsertDateField"/> - <menu:menuitem menu:id=".uno:InsertTimeField"/> - <menu:menuitem menu:id=".uno:InsertTitleField"/> - <menu:menuitem menu:id=".uno:InsertAuthorField"/> - <menu:menuitem menu:id=".uno:InsertTopicField"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:InsertField"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:InsertFieldCtrl"/> <menu:menu menu:id=".uno:InsertHeaderFooterMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:InsertPageHeader"/> diff --git a/sw/uiconfig/swriter/popupmenu/insertfield.xml b/sw/uiconfig/swriter/popupmenu/insertfield.xml new file mode 100644 index 000000000000..6e5815340fe1 --- /dev/null +++ b/sw/uiconfig/swriter/popupmenu/insertfield.xml @@ -0,0 +1,20 @@ +<?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:InsertPageNumberField"/> + <menu:menuitem menu:id=".uno:InsertPageCountField"/> + <menu:menuitem menu:id=".uno:InsertDateField"/> + <menu:menuitem menu:id=".uno:InsertTimeField"/> + <menu:menuitem menu:id=".uno:InsertTitleField"/> + <menu:menuitem menu:id=".uno:InsertAuthorField"/> + <menu:menuitem menu:id=".uno:InsertTopicField"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:InsertField"/> +</menu:menupopup> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 883ec24b8c9f..be99fe4c47ff 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -167,19 +167,7 @@ <menu:menu menu:id=".uno:InsertMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:InsertBreak"/> - <menu:menu menu:id=".uno:FieldMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:InsertPageNumberField"/> - <menu:menuitem menu:id=".uno:InsertPageCountField"/> - <menu:menuitem menu:id=".uno:InsertDateField"/> - <menu:menuitem menu:id=".uno:InsertTimeField"/> - <menu:menuitem menu:id=".uno:InsertTitleField"/> - <menu:menuitem menu:id=".uno:InsertAuthorField"/> - <menu:menuitem menu:id=".uno:InsertTopicField"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:InsertField"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:InsertFieldCtrl"/> <menu:menuitem menu:id=".uno:InsertSymbol"/> <menu:menu menu:id=".uno:FormattingMarkMenu"> <menu:menupopup> diff --git a/sw/uiconfig/swxform/popupmenu/insertfield.xml b/sw/uiconfig/swxform/popupmenu/insertfield.xml new file mode 100644 index 000000000000..6e5815340fe1 --- /dev/null +++ b/sw/uiconfig/swxform/popupmenu/insertfield.xml @@ -0,0 +1,20 @@ +<?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:InsertPageNumberField"/> + <menu:menuitem menu:id=".uno:InsertPageCountField"/> + <menu:menuitem menu:id=".uno:InsertDateField"/> + <menu:menuitem menu:id=".uno:InsertTimeField"/> + <menu:menuitem menu:id=".uno:InsertTitleField"/> + <menu:menuitem menu:id=".uno:InsertAuthorField"/> + <menu:menuitem menu:id=".uno:InsertTopicField"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:InsertField"/> +</menu:menupopup> |