diff options
author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-04-17 11:50:36 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:15 +0100 |
commit | 58a825b4d047c0f99d4f9a193c97af423b23fb97 (patch) | |
tree | 148c1908c2153f7ba39e8f69ae4900a9fa4e598e /sc/sdi | |
parent | 95b4b0f3e26c049cf04400ffc05bf3ccbdf85b9d (diff) |
Resolves: #i122025# UNO commands introduced with sidebar
apply labels and disable their UI customization
(cherry picked from commit 339494cf948e22dcb089c0d921dfb396d9233cb8)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
svx/inc/svx/svxids.hrc
svx/sdi/svx.sdi
sw/sdi/swriter.sdi
Change-Id: Ie95fb2fde14afe67c80e0037f4252e788f5ec1fb
Related: #i122025# followup - remove usage of removed Slot
(cherry picked from commit 0bef7cb68127ab4ff81cc80bc3f7274adf87f5ac)
Change-Id: I0cf4d8c4c93d5754e4e46d4d1edc43529849b3bf
Diffstat (limited to 'sc/sdi')
-rw-r--r-- | sc/sdi/scalc.sdi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 7328e86f07c3..8945ecbefa6e 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -8489,7 +8489,7 @@ SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC ] //-------------------------------------------------------------------------- -SfxBoolItem ViewOption SID_SCGRIDSHOW +SfxBoolItem ViewGridLines SID_SCGRIDSHOW [ AutoUpdate = TRUE, Cachable = Cachable, @@ -8506,15 +8506,15 @@ SfxBoolItem ViewOption SID_SCGRIDSHOW Readonly = FALSE, /* config */ - AccelConfig = FALSE, //TRUE + AccelConfig = FALSE, MenuConfig = FALSE, StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, //FALSE - GroupId = GID_DATA; + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; ] //-------------------------------------------------------------------------- -SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT +SfxUInt16Item NumberFormatType SID_NUMBER_TYPE_FORMAT [ /* flags: */ AutoUpdate = FALSE, @@ -8535,6 +8535,6 @@ SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT AccelConfig = FALSE, MenuConfig = FALSE, StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_VIEW; + ToolBoxConfig = FALSE, + GroupId = GID_FORMAT; ] |