diff options
author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-04-18 11:16:00 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:16 +0100 |
commit | c991fb49aa174f300be0b978d89bc63e01e0aa2b (patch) | |
tree | f510b9189cb1336ff50627cc801749bf091a13fa /sw/sdi | |
parent | 9d4c1cd63cb8ec8ede01f2d9ad69084027113bec (diff) |
Resolves: #i122026# adjust names of newly introduced UNO commands
correct uno:FlipHorizontal and uno:FlipVertical
(cherry picked from commit 1ea8067f70bb806aa501ea72686a950f1e5ee591)
Conflicts:
default_images/res/commandimagelist/lc_fliphorizontal.png
default_images/res/commandimagelist/lc_flipvertical.png
default_images/res/commandimagelist/lch_fliphorizontal.png
default_images/res/commandimagelist/lch_flipvertical.png
default_images/res/commandimagelist/sc_fliphorizontal.png
default_images/res/commandimagelist/sc_flipvertical.png
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/sdi/svx.sdi
sw/inc/cmdid.h
sw/source/ui/shells/drawsh.cxx
sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
sw/uiconfig/swform/toolbar/graphicobjectbar.xml
sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
Change-Id: I2c646586d592eb1d703c6db07e4c913d858fdc47
Diffstat (limited to 'sw/sdi')
-rw-r--r-- | sw/sdi/_grfsh.sdi | 12 | ||||
-rw-r--r-- | sw/sdi/drawsh.sdi | 12 | ||||
-rw-r--r-- | sw/sdi/swriter.sdi | 52 |
3 files changed, 1 insertions, 75 deletions
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi index 30372b52e510..15c00ccd4bb0 100644 --- a/sw/sdi/_grfsh.sdi +++ b/sw/sdi/_grfsh.sdi @@ -21,12 +21,6 @@ interface BaseTextGraphic Automation = FALSE; ] { - FN_FLIP_VERT_GRAFIC // status(final|play) - [ - ExecMethod = ExecAttr ; - StateMethod = GetAttrState ; - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] SID_FLIP_VERTICAL [ ExecMethod = ExecAttr ; @@ -34,12 +28,6 @@ interface BaseTextGraphic DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_FLIP_HORZ_GRAFIC // status(final|play) - [ - ExecMethod = ExecAttr ; - StateMethod = GetAttrState ; - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] SID_FLIP_HORIZONTAL [ ExecMethod = ExecAttr ; diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi index 7e5b6c2a2195..49ebe0fcf5cd 100644 --- a/sw/sdi/drawsh.sdi +++ b/sw/sdi/drawsh.sdi @@ -201,12 +201,6 @@ interface TextDraw : TextDrawBase StateMethod = DisableState ; ] - FN_FLIP_VERT_GRAFIC - [ - ExecMethod = Execute ; - StateMethod = GetState ; - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] SID_FLIP_VERTICAL [ ExecMethod = Execute ; @@ -214,12 +208,6 @@ interface TextDraw : TextDrawBase DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_FLIP_HORZ_GRAFIC - [ - ExecMethod = Execute ; - StateMethod = GetState ; - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] SID_FLIP_HORIZONTAL [ ExecMethod = Execute ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 10f29fd934d2..c5b7326f0c26 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -1817,56 +1817,6 @@ SfxBoolItem Fields FN_VIEW_FIELDS ] //-------------------------------------------------------------------------- -SfxVoidItem FlipHorizontal FN_FLIP_HORZ_GRAFIC -() -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_FORMAT; -] - -//-------------------------------------------------------------------------- -SfxVoidItem FlipVertical FN_FLIP_VERT_GRAFIC -() -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_FORMAT; -] - -//-------------------------------------------------------------------------- SvxColorItem FontColor SID_ATTR_CHAR_COLOR2 [ @@ -10355,7 +10305,7 @@ SfxVoidItem OpenFromWriter FN_OPEN_FILE GroupId = GID_APPLICATION; ] -SfxInt16Item SwPageColumnType SID_ATTR_PAGE_COLUMN +SfxInt16Item PageColumnType SID_ATTR_PAGE_COLUMN [ /* flags: */ |