summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-02-16 20:56:57 +0100
committerAndras Timar <andras.timar@collabora.com>2019-02-17 11:06:51 +0100
commit9ad8532b84c355958c9b7035bb8159eabb6bcbed (patch)
tree4011180f69530c16743328071d712af05c170c95 /officecfg
parent4a4218eeece5a7b9740f8f6660075300e2efff8d (diff)
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 <tamas.zolnai@collabora.com> (cherry picked from commit 6a4653ed1b24a161950a9cd84caabdd5ad4fe536) Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469 Reviewed-on: https://gerrit.libreoffice.org/67927 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu10
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu15
2 files changed, 15 insertions, 10 deletions
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>