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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/sdi/drtxtob.sdi | 8 | ||||
| -rw-r--r-- | sd/source/ui/view/drtxtob1.cxx | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi index 9941d6341d75..cc466e1a7c9f 100644 --- a/sd/sdi/drtxtob.sdi +++ b/sd/sdi/drtxtob.sdi @@ -184,14 +184,6 @@ shell TextObjectBar ExecMethod = Execute ; StateMethod = GetAttrState; ] - SID_ATTR_PARA_RIGHT - [ - ExecMethod = Execute ; - ] - SID_ATTR_PARA_LEFT - [ - ExecMethod = Execute ; - ] SID_OUTLINE_LEFT // ole : no, status : ? [ diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 04137a3ee153..20fcad0af901 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -228,7 +228,6 @@ void TextObjectBar::Execute( SfxRequest &rReq ) break; case SID_OUTLINE_LEFT: - case SID_ATTR_PARA_LEFT: { if (pOLV) { @@ -244,7 +243,6 @@ void TextObjectBar::Execute( SfxRequest &rReq ) break; case SID_OUTLINE_RIGHT: - case SID_ATTR_PARA_RIGHT: { if (pOLV) { |