summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-12-08 02:38:10 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2017-12-09 21:29:40 +0100
commit591ed2391389120efdf366f207642a98eb9f054c (patch)
tree1da37cc6cb6d0af633c4cbce34faa58be1087127
parente730c6ad094d63f133b338d111923dfade87d634 (diff)
tdf#113715 Fix .uno: names appearing in the customization dialog
Change-Id: Ia4a4231acf2f15ebf58f2acd02b7fc0ab5a88072 Reviewed-on: https://gerrit.libreoffice.org/46062 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com> Tested-by: Heiko Tietze <tietze.heiko@googlemail.com> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu8
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu8
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu8
-rw-r--r--sc/sdi/cellsh.sdi6
-rw-r--r--sc/sdi/scalc.sdi2
-rw-r--r--starmath/sdi/smath.sdi6
-rw-r--r--svx/sdi/svx.sdi8
-rw-r--r--sw/sdi/_viewsh.sdi1
8 files changed, 22 insertions, 25 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index c91b33b9fe9e..4d25cc30a9f3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1879,14 +1879,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:AutoSum" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sum</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:TableSort" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">So~rt...</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 791ebefce51b..0c70d811a465 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6029,6 +6029,14 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:AutoSum" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Sum</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:ThesaurusFromContext" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Synony~ms</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 08127c537ee1..2c3c827be9c4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2393,14 +2393,6 @@
<value xml:lang="en-US">Go to Previous Index Mark</value>
</prop>
</node>
- <node oor:name=".uno:AutoSum" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sum</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:GotoNextTableFormula" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Go to next table formula</value>
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 22a66319cd53..decb76cfc659 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -193,7 +193,11 @@ interface CellSelection
SID_CHARMAP_CONTROL [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
SID_INSERT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
- SID_EDIT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
+ SID_EDIT_POSTIT
+ [
+ ExecMethod = ExecuteEdit; StateMethod = GetCellState;
+ ToolBoxConfig, MenuConfig , AccelConfig;
+ ]
SID_TABOP [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
SID_CONSOLIDATE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 071ed56e250f..e06f17bd4695 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2228,7 +2228,7 @@ SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
RecordAbsolute = FALSE,
RecordPerSet;
- AccelConfig = TRUE,
+ AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Options;
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index bf564dcf88cc..0ee7306938ca 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -228,9 +228,9 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
RecordPerSet;
Asynchron;
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Insert;
]
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 3d684944a963..eed15720caa9 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4491,9 +4491,9 @@ SfxVoidItem EditAnnotation SID_EDIT_POSTIT
RecordAbsolute = FALSE,
RecordPerSet;
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Edit;
]
@@ -6166,7 +6166,7 @@ SvxSizeItem AttributePageSize SID_ATTR_PAGE_SIZE
AccelConfig = FALSE,
MenuConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Format;
]
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index b31c42112be6..099033a1a278 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -430,6 +430,7 @@ interface BaseTextEditView
[
ExecMethod = Execute ;
StateMethod = GetState ;
+ ToolBoxConfig;
]
SID_ATTR_PAGE_MAXSIZE // status()
[