[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy icon-themes/hicontrast officecfg/registry svx/sdi sw/inc sw/sdi sw/source sw/uiconfig
Oliver-Rainer Wittmann
orw at apache.org
Wed May 8 01:22:51 PDT 2013
icon-themes/galaxy/cmd/lc_fliphorizontal.png |binary
icon-themes/galaxy/cmd/lc_flipvertical.png |binary
icon-themes/galaxy/cmd/sc_fliphorizontal.png |binary
icon-themes/galaxy/cmd/sc_flipvertical.png |binary
icon-themes/hicontrast/cmd/lc_fliphorizontal.png |binary
icon-themes/hicontrast/cmd/lc_flipvertical.png |binary
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 10 -
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 18 ++-
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 26 -----
svx/sdi/svx.sdi | 28 ++---
sw/inc/cmdid.h | 3
sw/sdi/_grfsh.sdi | 12 --
sw/sdi/drawsh.sdi | 12 --
sw/sdi/swriter.sdi | 52 ----------
sw/source/ui/shells/drawsh.cxx | 28 +++--
sw/source/ui/shells/grfsh.cxx | 11 --
sw/uiconfig/sglobal/menubar/menubar.xml | 2
sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/sweb/menubar/menubar.xml | 2
sw/uiconfig/swform/menubar/menubar.xml | 2
sw/uiconfig/swform/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swreport/menubar/menubar.xml | 4
sw/uiconfig/swreport/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swriter/menubar/menubar.xml | 2
sw/uiconfig/swriter/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swxform/menubar/menubar.xml | 2
sw/uiconfig/swxform/toolbar/graphicobjectbar.xml | 2
27 files changed, 73 insertions(+), 151 deletions(-)
New commits:
commit fdd548bb9acac6e5cab94533c7ea3a561801b09d
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Apr 18 11:16:00 2013 +0000
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
diff --git a/icon-themes/galaxy/cmd/lc_fliphorizontal.png b/icon-themes/galaxy/cmd/lc_fliphorizontal.png
index cb30e42..67c5743 100644
Binary files a/icon-themes/galaxy/cmd/lc_fliphorizontal.png and b/icon-themes/galaxy/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/galaxy/cmd/lc_flipvertical.png b/icon-themes/galaxy/cmd/lc_flipvertical.png
index 1657948..fd582af 100644
Binary files a/icon-themes/galaxy/cmd/lc_flipvertical.png and b/icon-themes/galaxy/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/galaxy/cmd/sc_fliphorizontal.png b/icon-themes/galaxy/cmd/sc_fliphorizontal.png
index 294ab45..5487379 100644
Binary files a/icon-themes/galaxy/cmd/sc_fliphorizontal.png and b/icon-themes/galaxy/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/galaxy/cmd/sc_flipvertical.png b/icon-themes/galaxy/cmd/sc_flipvertical.png
index c66e5a9..5fc16dc 100644
Binary files a/icon-themes/galaxy/cmd/sc_flipvertical.png and b/icon-themes/galaxy/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/hicontrast/cmd/lc_fliphorizontal.png b/icon-themes/hicontrast/cmd/lc_fliphorizontal.png
index e6e1de0..7e36441 100644
Binary files a/icon-themes/hicontrast/cmd/lc_fliphorizontal.png and b/icon-themes/hicontrast/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/hicontrast/cmd/lc_flipvertical.png b/icon-themes/hicontrast/cmd/lc_flipvertical.png
index 0fe5546..d050635 100644
Binary files a/icon-themes/hicontrast/cmd/lc_flipvertical.png and b/icon-themes/hicontrast/cmd/lc_flipvertical.png differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 12a1263..bb7cdac 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1628,11 +1628,6 @@
<value xml:lang="en-US">~Filter</value>
</prop>
</node>
- <node oor:name=".uno:SCDialogBorder" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Cell Borders</value>
- </prop>
- </node>
<node oor:name=".uno:SendTo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Sen~d</value>
@@ -1643,6 +1638,11 @@
<value xml:lang="en-US">~Protect Document</value>
</prop>
</node>
+ <node oor:name=".uno:FormatCellBorders" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Format Cell Borders</value>
+ </prop>
+ </node>
<node oor:name=".uno:GroupOutlineMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Group and Outline</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c51b593..a6b2387 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1611,7 +1611,7 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:TransAngle" oor:op="replace">
+ <node oor:name=".uno:TransformRotationAngle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Rotation Angle</value>
</prop>
@@ -3404,12 +3404,12 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:TransRotX" oor:op="replace">
+ <node oor:name=".uno:TransformRotationX" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Rotation Pivot Point X</value>
</prop>
</node>
- <node oor:name=".uno:TransRotY" oor:op="replace">
+ <node oor:name=".uno:TransformRotationY" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Rotation Pivot Point Y</value>
</prop>
@@ -3864,15 +3864,21 @@
<value xml:lang="en-US">Merge Documen~t...</value>
</prop>
</node>
- <node oor:name=".uno:SvxFlipHorizontal" oor:op="replace">
+ <node oor:name=".uno:FlipHorizontal" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Flip Horizontally</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
- <node oor:name=".uno:SvxFlipVertical" oor:op="replace">
+ <node oor:name=".uno:FlipVertical" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Flip Vertically</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:SwEditOptions" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
@@ -5319,7 +5325,7 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:FontDialogEff" oor:op="replace">
+ <node oor:name=".uno:FontEffectsDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Character Font Effects...</value>
</prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 6c7b9f0..7ce8ce3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -715,27 +715,11 @@
<value xml:lang="en-US">Select to Page End</value>
</prop>
</node>
- <node oor:name=".uno:FlipHorizontal" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Flip Vertically</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:SendOutlineToClipboard" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Outline to ~Clipboard</value>
</prop>
</node>
- <node oor:name=".uno:FlipVertical" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Flip Horizontally</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:NewHtmlDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Create ~HTML Document</value>
@@ -834,6 +818,11 @@
<value xml:lang="en-US">Page Columns</value>
</prop>
</node>
+ <node oor:name=".uno:PageColumnType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Column Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:BackgroundDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Background</value>
@@ -1466,11 +1455,6 @@
<value xml:lang="en-US">Backspace</value>
</prop>
</node>
- <node oor:name=".uno:SwPageColumnType" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Column Type</value>
- </prop>
- </node>
<node oor:name=".uno:GotoPrevInputField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">To Previous Input Field</value>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 1a99d65..1616bec 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3955,7 +3955,7 @@ SfxVoidItem FontDialog SID_CHAR_DLG
GroupId = GID_FORMAT;
]
-SfxVoidItem FontDialogEff SID_CHAR_DLG_EFFECT
+SfxVoidItem FontEffectsDialog SID_CHAR_DLG_EFFECT
()
[
/* flags: */
@@ -15762,7 +15762,7 @@ XLineEndItem LineEnd SID_ATTR_LINE_END
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormPosX SID_ATTR_TRANSFORM_POS_X
+SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X
[
/* flags: */
AutoUpdate = TRUE,
@@ -15789,7 +15789,7 @@ SfxUInt32Item SvxTransFormPosX SID_ATTR_TRANSFORM_POS_X
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormPosY SID_ATTR_TRANSFORM_POS_Y
+SfxUInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y
[
/* flags: */
AutoUpdate = TRUE,
@@ -15816,7 +15816,7 @@ SfxUInt32Item SvxTransFormPosY SID_ATTR_TRANSFORM_POS_Y
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
+SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -15843,7 +15843,7 @@ SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
+SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -15870,7 +15870,7 @@ SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
//--------------------------------------------------------------------------
-SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
+SfxUInt32Item TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15895,7 +15895,7 @@ SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
//--------------------------------------------------------------------------
-SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
+SfxUInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15920,7 +15920,7 @@ SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
//--------------------------------------------------------------------------
-SfxUInt32Item TransRotY SID_ATTR_TRANSFORM_ROT_Y
+SfxUInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15995,7 +15995,7 @@ SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
+SfxVoidItem FlipHorizontal SID_FLIP_HORIZONTAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -16016,13 +16016,13 @@ SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
+SfxVoidItem FlipVertical SID_FLIP_VERTICAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -16049,7 +16049,7 @@ SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+SfxBoolItem AutomaticWidth SID_ATTR_TRANSFORM_AUTOWIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -16076,7 +16076,7 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
+SfxBoolItem AutomaticHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -16154,7 +16154,7 @@ SvxLineItem BorderBLTR SID_ATTR_BORDER_DIAG_BLTR
//--------------------------------------------------------------------------
-SfxVoidItem SCDialogBorder SID_CELL_FORMAT_BORDER
+SfxVoidItem FormatCellBorders SID_CELL_FORMAT_BORDER
()
[
/* flags: */
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 33d245e..dee921d 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -321,9 +321,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_SET_SUPER_SCRIPT (FN_FORMAT + 11) /* superscript */
#define FN_SET_SUB_SCRIPT (FN_FORMAT + 12) /* subscript */
-#define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* mirror horizontally */
-#define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* mirror vertically */
-
#define FN_FORMAT_PAGE_SETTING_DLG (FN_FORMAT + 42) /* */
#define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* number format in table */
#define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* */
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 3a12e11..87f9858 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 7e5b6c2..49ebe0f 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 10f29fd..c5b7326 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: */
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index e554598..36c758a 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -159,12 +159,10 @@ void SwDrawShell::Execute(SfxRequest &rReq)
}
break;
- case FN_FLIP_HORZ_GRAFIC:
- case SID_FLIP_HORIZONTAL:
+ case SID_FLIP_VERTICAL:
bMirror = false;
/* no break */
- case FN_FLIP_VERT_GRAFIC:
- case SID_FLIP_VERTICAL:
+ case SID_FLIP_HORIZONTAL:
rSh.MirrorSelection( bMirror );
break;
@@ -324,16 +322,30 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
rSet.Put( SfxBoolItem( nWhich, !GetView().IsDrawSelMode()));
break;
- case FN_FLIP_HORZ_GRAFIC:
- case SID_FLIP_HORIZONTAL:
+ case SID_FLIP_VERTICAL:
if ( !pSdrView->IsMirrorAllowed() || bProtected )
+ {
rSet.DisableItem( nWhich );
+ }
+ else
+ {
+ // TTTT - needs to be adapted in aw080:
+ // state is not kept for drawing objects --> provide not flipped state
+ rSet.Put( SfxBoolItem( nWhich, sal_False ) );
+ }
break;
- case FN_FLIP_VERT_GRAFIC:
- case SID_FLIP_VERTICAL:
+ case SID_FLIP_HORIZONTAL:
if ( !pSdrView->IsMirrorAllowed() || bProtected )
+ {
rSet.DisableItem( nWhich );
+ }
+ else
+ {
+ // TTTT - needs to be adapted in aw080:
+ // state is not kept for drawing objects --> provide not flipped state
+ rSet.Put( SfxBoolItem( nWhich, sal_False ) );
+ }
break;
case SID_FONTWORK:
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 0614923..d7a5115 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -445,16 +445,13 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
switch( nSlot )
{
- case FN_FLIP_VERT_GRAFIC:
- case FN_FLIP_HORZ_GRAFIC:
case SID_FLIP_VERTICAL:
case SID_FLIP_HORIZONTAL:
{
GetShell().GetCurAttr( aGrfSet );
- SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get(
- RES_GRFATR_MIRRORGRF ) );
+ SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get( RES_GRFATR_MIRRORGRF ) );
sal_uInt16 nMirror = aMirror.GetValue();
- if( FN_FLIP_VERT_GRAFIC == nSlot || nSlot==SID_FLIP_VERTICAL )
+ if ( nSlot==SID_FLIP_HORIZONTAL )
switch( nMirror )
{
case RES_MIRROR_GRAPH_DONT: nMirror = RES_MIRROR_GRAPH_VERT;
@@ -631,7 +628,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
break;
}
- case FN_FLIP_VERT_GRAFIC:
+ case SID_FLIP_HORIZONTAL:
if( !bParentCntProt )
{
MirrorGraph nState = static_cast< MirrorGraph >(((const SwMirrorGrf &) aCoreSet.Get(
@@ -642,7 +639,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
}
break;
- case FN_FLIP_HORZ_GRAFIC:
+ case SID_FLIP_VERTICAL:
if( !bParentCntProt )
{
MirrorGraph nState = static_cast< MirrorGraph >(((const SwMirrorGrf &) aCoreSet.Get(
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 92d6d01..a856c2d 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -315,8 +315,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
index 4b942df..2790b7f 100644
--- a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
@@ -26,8 +26,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index e51a1c7..c939f8f 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -260,8 +260,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index bd471d4..80fa150 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -314,8 +314,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
index 4b942df..2790b7f 100644
--- a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
@@ -26,8 +26,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 788612e..f1d9177 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -315,8 +315,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
- <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
index 4b942df..2790b7f 100644
--- a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
@@ -26,8 +26,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 5da9304..24ec436 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -324,8 +324,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
index 4b942df..2790b7f 100644
--- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
@@ -26,8 +26,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index e651ae6..5ab825e 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -316,8 +316,8 @@
</menu:menu>
<menu:menu menu:id=".uno:FlipMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:FlipHorizontal"/>
<menu:menuitem menu:id=".uno:FlipVertical"/>
+ <menu:menuitem menu:id=".uno:FlipHorizontal"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
diff --git a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
index 4b942df..2790b7f 100644
--- a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
@@ -26,8 +26,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:helpid="10869"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
More information about the Libreoffice-commits
mailing list