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/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 'sw/sdi')
| -rw-r--r-- | sw/sdi/_frmsh.sdi | 2 | ||||
| -rw-r--r-- | sw/sdi/_grfsh.sdi | 2 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 41 |
3 files changed, 10 insertions, 35 deletions
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi index 31cb86d0f281..808e204a61d5 100644 --- a/sw/sdi/_frmsh.sdi +++ b/sw/sdi/_frmsh.sdi @@ -184,7 +184,7 @@ interface BaseTextFrame StateMethod = GetState ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_PROPERTY_WRAP_DLG // status(final|play) + FN_DRAW_WRAP_DLG // status(final|play) [ ExecMethod = Execute ; StateMethod = GetState ; diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi index a3198b919e9d..30372b52e510 100644 --- a/sw/sdi/_grfsh.sdi +++ b/sw/sdi/_grfsh.sdi @@ -53,7 +53,7 @@ interface BaseTextGraphic StateMethod = GetAttrState ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_PROPERTY_WRAP_DLG // status(final|play) + FN_DRAW_WRAP_DLG // status(final|play) [ ExecMethod = Execute ; StateMethod = GetAttrState ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index c9e027eca730..10f29fd934d2 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -3373,31 +3373,6 @@ SfxVoidItem GraphicDialog FN_FORMAT_GRAFIC_DLG ] //-------------------------------------------------------------------------- -SfxVoidItem ObjectWrapDialog FN_PROPERTY_WRAP_DLG -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerItem; - Asynchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_GRAPHIC; -] - -//-------------------------------------------------------------------------- SfxVoidItem Grow FN_GROW_FONT_SIZE () [ @@ -6253,10 +6228,10 @@ SfxVoidItem PageSettingDialog FN_FORMAT_PAGE_SETTING_DLG Asynchron; /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, + AccelConfig = FALSE, + MenuConfig = FALSE, StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + ToolBoxConfig = FALSE, GroupId = GID_FORMAT; ] @@ -10380,7 +10355,7 @@ SfxVoidItem OpenFromWriter FN_OPEN_FILE GroupId = GID_APPLICATION; ] -SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN +SfxInt16Item SwPageColumnType SID_ATTR_PAGE_COLUMN [ /* flags: */ @@ -10399,11 +10374,11 @@ SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN Readonly = TRUE, /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, + AccelConfig = FALSE, + MenuConfig = FALSE, StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_VIEW; + ToolBoxConfig = FALSE, + GroupId = GID_FORMAT; ] SvxLongULSpaceItem SwPageULMargin SID_ATTR_PAGE_ULSPACE |