diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-12-08 02:38:10 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-01-08 10:06:47 +0100 |
| commit | 8b9582855a529823191ed6a12b96ec10ac8e2dec (patch) | |
| tree | 7a2ca0314baba6633c8ccb895c2d44f63450344e | |
| parent | bd04d7be1f89600623c148a7837a694c1df388d7 (diff) | |
tdf#113715 Fix .uno: names appearing in the customization dialog
Based on 591ed2391389120efdf366f207642a98eb9f054c
Changes from master:
- Revert officecfg string changes.
- Instead, hide .uno:AutoSum in Calc for 6-0.
Change-Id: Ia4a4231acf2f15ebf58f2acd02b7fc0ab5a88072
Reviewed-on: https://gerrit.libreoffice.org/46970
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
| -rw-r--r-- | sc/sdi/cellsh.sdi | 6 | ||||
| -rw-r--r-- | sc/sdi/scalc.sdi | 4 | ||||
| -rw-r--r-- | starmath/sdi/smath.sdi | 6 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 8 | ||||
| -rw-r--r-- | sw/sdi/_viewsh.sdi | 1 |
5 files changed, 15 insertions, 10 deletions
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 db1a738fe8c8..d332d466253b 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; @@ -6344,6 +6344,6 @@ SfxVoidItem AutoSum SID_AUTO_SUM AccelConfig = FALSE, MenuConfig = FALSE, - ToolBoxConfig = TRUE, + ToolBoxConfig = FALSE, GroupId = SfxGroupId::Intern; ] 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() [ |