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 /sw/inc | |
| 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 'sw/inc')
| -rw-r--r-- | sw/inc/cmdid.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 08bb1d75f40e..33d245e225db 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -899,10 +899,9 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_UNO_TITLE (FN_FRAME + 19) #define FN_UNO_DESCRIPTION (FN_FRAME + 20) -#define FN_PROPERTY_WRAP_DLG (FN_SIDEBAR + 0) -#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 1) -#define SID_ATTR_PAGE_ULSPACE (FN_SIDEBAR + 2) -#define SID_ATTR_PAGE_LRSPACE (FN_SIDEBAR + 3) +#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 0) +#define SID_ATTR_PAGE_ULSPACE (FN_SIDEBAR + 1) +#define SID_ATTR_PAGE_LRSPACE (FN_SIDEBAR + 2) //Member IDs for Fill / SetVariable of items #define MID_STYLE 0xe0 |