summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-04-18 11:16:00 +0000
committerOliver-Rainer Wittmann <orw@apache.org>2013-04-18 11:16:00 +0000
commit1ea8067f70bb806aa501ea72686a950f1e5ee591 (patch)
tree2718a9ab80933d8852a722c3f2df573406fe1aa7
parent2af65172af2cfc768e4f44507a02e1b17a9806ba (diff)
122026: adjust names of newly introduced UNO commands; correct uno:FlipHorizontal and uno:FlipVertical
Notes
-rw-r--r--default_images/res/commandimagelist/lc_fliphorizontal.pngbin844 -> 902 bytes
-rw-r--r--default_images/res/commandimagelist/lc_flipvertical.pngbin902 -> 844 bytes
-rw-r--r--default_images/res/commandimagelist/lch_fliphorizontal.pngbin142 -> 144 bytes
-rw-r--r--default_images/res/commandimagelist/lch_flipvertical.pngbin144 -> 142 bytes
-rw-r--r--default_images/res/commandimagelist/sc_fliphorizontal.pngbin611 -> 654 bytes
-rw-r--r--default_images/res/commandimagelist/sc_flipvertical.pngbin654 -> 611 bytes
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu10
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu18
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu26
-rw-r--r--svx/sdi/svx.sdi38
-rw-r--r--sw/inc/cmdid.h2
-rw-r--r--sw/sdi/_grfsh.sdi12
-rw-r--r--sw/sdi/drawsh.sdi12
-rw-r--r--sw/sdi/swriter.sdi52
-rw-r--r--sw/source/ui/shells/drawsh.cxx28
-rw-r--r--sw/source/ui/shells/grfsh.cxx11
-rw-r--r--sw/uiconfig/sglobal/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml2
-rw-r--r--sw/uiconfig/sweb/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swform/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/graphicobjectbar.xml4
-rw-r--r--sw/uiconfig/swreport/menubar/menubar.xml4
-rw-r--r--sw/uiconfig/swreport/toolbar/graphicobjectbar.xml2
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/graphicobjectbar.xml2
-rw-r--r--sw/uiconfig/swxform/menubar/menubar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/graphicobjectbar.xml2
27 files changed, 79 insertions, 156 deletions
diff --git a/default_images/res/commandimagelist/lc_fliphorizontal.png b/default_images/res/commandimagelist/lc_fliphorizontal.png
index fd582afa3dcc..67c5743cd677 100644
--- a/default_images/res/commandimagelist/lc_fliphorizontal.png
+++ b/default_images/res/commandimagelist/lc_fliphorizontal.png
Binary files differ
diff --git a/default_images/res/commandimagelist/lc_flipvertical.png b/default_images/res/commandimagelist/lc_flipvertical.png
index 67c5743cd677..fd582afa3dcc 100644
--- a/default_images/res/commandimagelist/lc_flipvertical.png
+++ b/default_images/res/commandimagelist/lc_flipvertical.png
Binary files differ
diff --git a/default_images/res/commandimagelist/lch_fliphorizontal.png b/default_images/res/commandimagelist/lch_fliphorizontal.png
index d05063566759..7e3644170a6b 100644
--- a/default_images/res/commandimagelist/lch_fliphorizontal.png
+++ b/default_images/res/commandimagelist/lch_fliphorizontal.png
Binary files differ
diff --git a/default_images/res/commandimagelist/lch_flipvertical.png b/default_images/res/commandimagelist/lch_flipvertical.png
index 7e3644170a6b..d05063566759 100644
--- a/default_images/res/commandimagelist/lch_flipvertical.png
+++ b/default_images/res/commandimagelist/lch_flipvertical.png
Binary files differ
diff --git a/default_images/res/commandimagelist/sc_fliphorizontal.png b/default_images/res/commandimagelist/sc_fliphorizontal.png
index 5fc16dca71e9..5487379b2d62 100644
--- a/default_images/res/commandimagelist/sc_fliphorizontal.png
+++ b/default_images/res/commandimagelist/sc_fliphorizontal.png
Binary files differ
diff --git a/default_images/res/commandimagelist/sc_flipvertical.png b/default_images/res/commandimagelist/sc_flipvertical.png
index 5487379b2d62..5fc16dca71e9 100644
--- a/default_images/res/commandimagelist/sc_flipvertical.png
+++ b/default_images/res/commandimagelist/sc_flipvertical.png
Binary files differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 96eb65b2ac8b..b333de12aaff 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1282,6 +1282,11 @@
<value xml:lang="en-US">Filter</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>
@@ -1317,11 +1322,6 @@
<value xml:lang="en-US">Row</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">Send</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 225c630d07eb..b888d8f248e7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5147,15 +5147,21 @@
<value>9</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">
@@ -5498,7 +5504,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>
@@ -5511,12 +5517,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>
@@ -5841,7 +5847,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 eceafc3baf30..3f85cc733da9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -380,22 +380,6 @@
<value>1</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: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:FootnoteDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Footnotes/Endnotes...</value>
@@ -1188,6 +1172,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:PageDown" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Next Page</value>
@@ -1551,11 +1540,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:TableBoundaries" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Table Boundaries</value>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 482efeba6f44..9f3c5b17a1b8 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3883,7 +3883,7 @@ SfxVoidItem FontDialog SID_CHAR_DLG
GroupId = GID_FORMAT;
]
-SfxVoidItem FontDialogEff SID_CHAR_DLG_EFFECT
+SfxVoidItem FontEffectsDialog SID_CHAR_DLG_EFFECT
()
[
/* flags: */
@@ -15457,7 +15457,7 @@ XLineEndItem LineEnd SID_ATTR_LINE_END
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormPosX SID_ATTR_TRANSFORM_POS_X
+SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X
[
/* flags: */
AutoUpdate = TRUE,
@@ -15484,7 +15484,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,
@@ -15511,7 +15511,7 @@ SfxUInt32Item SvxTransFormPosY SID_ATTR_TRANSFORM_POS_Y
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
+SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -15538,7 +15538,7 @@ SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
+SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -15565,7 +15565,7 @@ SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
//--------------------------------------------------------------------------
-SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
+SfxUInt32Item TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15590,7 +15590,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,
@@ -15615,7 +15615,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,
@@ -15690,7 +15690,7 @@ SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
+SfxVoidItem FlipHorizontal SID_FLIP_HORIZONTAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -15708,16 +15708,16 @@ SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
Readonly = FALSE,
/* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
+SfxVoidItem FlipVertical SID_FLIP_VERTICAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -15735,16 +15735,16 @@ SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
Readonly = FALSE,
/* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+SfxBoolItem AutomaticWidth SID_ATTR_TRANSFORM_AUTOWIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -15771,7 +15771,7 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
+SfxBoolItem AutomaticHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -15849,7 +15849,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 71315a9998e9..593d353a955d 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -467,8 +467,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_INDENT_TO_TABSTOP (FN_FORMAT + 17) /* Einrueckung auf die naechste Tabpostion */
//schon in svxids.hrc
//#define FN_SET_JUSTIFY_PARA (FN_FORMAT + 21) /* Ausrichtung Absatz */
-#define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* Spiegeln horizontal */
-#define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* Spiegeln vertikal */
#define FN_SET_LINE_SPACE (FN_FORMAT + 27) /* Zeilenabstand parametrisiert */
#define FN_SET_ADJUST (FN_FORMAT + 28) /* Ausrichtung parametrisiert */
#define FN_SET_LRMARGIN (FN_FORMAT + 29) /* linker/rechter Rand */
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 12114f1cd899..ba636faa3597 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -26,12 +26,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 ;
@@ -39,12 +33,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 7f784c719eee..17c8ea8c95ee 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -206,12 +206,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 ;
@@ -219,12 +213,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 480d6220f043..5334819a7167 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1823,56 +1823,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
[
@@ -10232,7 +10182,7 @@ SfxVoidItem CopyHyperlinkLocation FN_COPY_HYPERLINK_LOCATION
]
-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 4485a3768a03..234cf7a97df2 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -169,12 +169,10 @@ void SwDrawShell::Execute(SfxRequest &rReq)
}
break;
- case FN_FLIP_HORZ_GRAFIC:
- case SID_FLIP_HORIZONTAL:
+ case SID_FLIP_VERTICAL:
bMirror = sal_False;
/* no break */
- case FN_FLIP_VERT_GRAFIC:
- case SID_FLIP_VERTICAL:
+ case SID_FLIP_HORIZONTAL:
rSh.MirrorSelection( bMirror );
break;
@@ -348,16 +346,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 357cb0c9858a..847d0bd80d0a 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -382,16 +382,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;
@@ -552,7 +549,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(
@@ -563,7 +560,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 824fa4a6407e..b9d8be230a64 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -309,8 +309,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 a0e3f48f2048..6d95d65da988 100644
--- a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 475e968f6c95..e963f727e2cc 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -256,8 +256,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 84c524e1e652..0f7d10d9f100 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -309,8 +309,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 a0e3f48f2048..f947a2472d4c 100644
--- a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
- <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 84c524e1e652..b7aeadc966cd 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -309,8 +309,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 a0e3f48f2048..6d95d65da988 100644
--- a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index ec4c2dcc6bb6..062e4054272b 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -313,8 +313,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 a0e3f48f2048..6d95d65da988 100644
--- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 7c1038fef64e..04b447ef4725 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -310,8 +310,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 a0e3f48f2048..6d95d65da988 100644
--- a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
@@ -33,8 +33,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlipVertical"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog"/>
</toolbar:toolbar> \ No newline at end of file