officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 10 ------ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 15 ++++++++++ sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml | 6 +++- 3 files changed, 20 insertions(+), 11 deletions(-)
New commits: commit 9ad8532b84c355958c9b7035bb8159eabb6bcbed Author: Tamás Zolnai <[email protected]> AuthorDate: Sat Feb 16 20:56:57 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Feb 17 11:06:51 2019 +0100 MSForms: Rework the MS compatible Forms menu a bit * DateField is saved as a content control in MSO file formats so let have it under content controls submenu * The MS compatible forms menu is a Writer specific thing so better to have the related commands as Writer commands. Reviewed-on: https://gerrit.libreoffice.org/67912 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <[email protected]> (cherry picked from commit 6a4653ed1b24a161950a9cd84caabdd5ad4fe536) Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469 Reviewed-on: https://gerrit.libreoffice.org/67927 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index f146a63caa56..aeb79c35c1ec 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6571,16 +6571,6 @@ <value xml:lang="en-US">Navigate</value> </prop> </node> - <node oor:name=".uno:MSCompatActiveXControls" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">ActiveX Controls</value> - </prop> - </node> - <node oor:name=".uno:MSCompatLegacyControls" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Legacy Forms</value> - </prop> - </node> </node> </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 21c321de95cd..5483c1730e83 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -3305,6 +3305,21 @@ <value xml:lang="en-US">More Fields</value> </prop> </node> + <node oor:name=".uno:MSCompatActiveXControls" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">ActiveX Controls</value> + </prop> + </node> + <node oor:name=".uno:MSCompatLegacyControls" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Legacy Form Fields</value> + </prop> + </node> + <node oor:name=".uno:MSCompatContentControls" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Content Controls</value> + </prop> + </node> </node> </node> </oor:component-data> diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml index 4c8e34467d3e..4d157908dd71 100644 --- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml +++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml @@ -21,7 +21,6 @@ <menu:menuitem menu:id=".uno:RadioButton"/> <menu:menuitem menu:id=".uno:ListBox"/> <menu:menuitem menu:id=".uno:Pushbutton"/> - <menu:menuitem menu:id=".uno:DateField"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:MSCompatLegacyControls"> @@ -31,6 +30,11 @@ <menu:menuitem menu:id=".uno:DropDownFormField"/> </menu:menupopup> </menu:menu> + <menu:menu menu:id=".uno:MSCompatContentControls"> + <menu:menupopup> + <menu:menuitem menu:id=".uno:DateField"/> + </menu:menupopup> + </menu:menu> </menu:menupopup> </menu:menu> </menu:menubar> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
