Author: orw
Date: Thu Apr 18 12:16:00 2013
New Revision: 1469292
URL: http://svn.apache.org/r1469292
Log:
122026: adjust names of newly introduced UNO commands; correct
uno:FlipHorizontal and uno:FlipVertical
Modified:
openoffice/trunk/main/default_images/res/commandimagelist/lc_fliphorizontal.png
openoffice/trunk/main/default_images/res/commandimagelist/lc_flipvertical.png
openoffice/trunk/main/default_images/res/commandimagelist/lch_fliphorizontal.png
openoffice/trunk/main/default_images/res/commandimagelist/lch_flipvertical.png
openoffice/trunk/main/default_images/res/commandimagelist/sc_fliphorizontal.png
openoffice/trunk/main/default_images/res/commandimagelist/sc_flipvertical.png
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
openoffice/trunk/main/svx/sdi/svx.sdi
openoffice/trunk/main/sw/inc/cmdid.h
openoffice/trunk/main/sw/sdi/_grfsh.sdi
openoffice/trunk/main/sw/sdi/drawsh.sdi
openoffice/trunk/main/sw/sdi/swriter.sdi
openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx
openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx
openoffice/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml
openoffice/trunk/main/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
openoffice/trunk/main/sw/uiconfig/sweb/menubar/menubar.xml
openoffice/trunk/main/sw/uiconfig/swform/menubar/menubar.xml
openoffice/trunk/main/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
openoffice/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml
openoffice/trunk/main/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
openoffice/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml
openoffice/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
openoffice/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml
openoffice/trunk/main/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
Modified:
openoffice/trunk/main/default_images/res/commandimagelist/lc_fliphorizontal.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/res/commandimagelist/lc_fliphorizontal.png?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/default_images/res/commandimagelist/lc_flipvertical.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/res/commandimagelist/lc_flipvertical.png?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/default_images/res/commandimagelist/lch_fliphorizontal.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/res/commandimagelist/lch_fliphorizontal.png?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/default_images/res/commandimagelist/lch_flipvertical.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/res/commandimagelist/lch_flipvertical.png?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/default_images/res/commandimagelist/sc_fliphorizontal.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/res/commandimagelist/sc_fliphorizontal.png?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/default_images/res/commandimagelist/sc_flipvertical.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/res/commandimagelist/sc_flipvertical.png?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
(original)
+++
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
Thu Apr 18 12:16:00 2013
@@ -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>
Modified:
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
(original)
+++
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
Thu Apr 18 12:16:00 2013
@@ -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>
Modified:
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
(original)
+++
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
Thu Apr 18 12:16:00 2013
@@ -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>
Modified: openoffice/trunk/main/svx/sdi/svx.sdi
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/sdi/svx.sdi?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/svx/sdi/svx.sdi (original)
+++ openoffice/trunk/main/svx/sdi/svx.sdi Thu Apr 18 12:16:00 2013
@@ -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_
//--------------------------------------------------------------------------
-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_
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
+SfxUInt32Item TransformWidth SID_ATTR_TRANSFORM_WIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -15538,7 +15538,7 @@ SfxUInt32Item SvxTransFormWidth SID_ATTR
//--------------------------------------------------------------------------
-SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
+SfxUInt32Item TransformHeight SID_ATTR_TRANSFORM_HEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -15565,7 +15565,7 @@ SfxUInt32Item SvxTransFormHeight SID_ATT
//--------------------------------------------------------------------------
-SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
+SfxUInt32Item TransformRotationAngle SID_ATTR_TRANSFORM_ANGLE
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -15590,7 +15590,7 @@ SfxUInt32Item TransAngle SID_ATTR_TRANSF
//--------------------------------------------------------------------------
-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_TRANSFO
//--------------------------------------------------------------------------
-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_TRANSFO
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
+SfxVoidItem FlipHorizontal SID_FLIP_HORIZONTAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -15708,16 +15708,16 @@ SfxVoidItem SvxFlipHorizontal SID_FLIP_H
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_VER
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_TRANSF
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
+SfxBoolItem AutomaticHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
[
/* flags: */
AutoUpdate = TRUE,
@@ -15849,7 +15849,7 @@ SvxLineItem BorderBLTR SID_ATTR_BORDER_D
//--------------------------------------------------------------------------
-SfxVoidItem SCDialogBorder SID_CELL_FORMAT_BORDER
+SfxVoidItem FormatCellBorders SID_CELL_FORMAT_BORDER
()
[
/* flags: */
Modified: openoffice/trunk/main/sw/inc/cmdid.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/cmdid.h?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/cmdid.h (original)
+++ openoffice/trunk/main/sw/inc/cmdid.h Thu Apr 18 12:16:00 2013
@@ -467,8 +467,6 @@ Achtung: Ab sofort sind in diesem File k
#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
*/
Modified: openoffice/trunk/main/sw/sdi/_grfsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/_grfsh.sdi?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/_grfsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/_grfsh.sdi Thu Apr 18 12:16:00 2013
@@ -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 ;
Modified: openoffice/trunk/main/sw/sdi/drawsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/drawsh.sdi?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/drawsh.sdi (original)
+++ openoffice/trunk/main/sw/sdi/drawsh.sdi Thu Apr 18 12:16:00 2013
@@ -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 ;
Modified: openoffice/trunk/main/sw/sdi/swriter.sdi
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/swriter.sdi?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/sdi/swriter.sdi (original)
+++ openoffice/trunk/main/sw/sdi/swriter.sdi Thu Apr 18 12:16:00 2013
@@ -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_COP
]
-SfxInt16Item SwPageColumnType SID_ATTR_PAGE_COLUMN
+SfxInt16Item PageColumnType SID_ATTR_PAGE_COLUMN
[
/* flags: */
Modified: openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx Thu Apr 18 12:16:00
2013
@@ -169,14 +169,12 @@ void SwDrawShell::Execute(SfxRequest &rR
}
break;
- case FN_FLIP_HORZ_GRAFIC:
- case SID_FLIP_HORIZONTAL:
- bMirror = sal_False;
- /* no break */
- case FN_FLIP_VERT_GRAFIC:
case SID_FLIP_VERTICAL:
- rSh.MirrorSelection( bMirror );
- break;
+ bMirror = sal_False;
+ /* no break */
+ case SID_FLIP_HORIZONTAL:
+ rSh.MirrorSelection( bMirror );
+ break;
case SID_FONTWORK:
{
@@ -348,17 +346,31 @@ void SwDrawShell::GetState(SfxItemSet& r
rSet.Put( SfxBoolItem( nWhich,
!GetView().IsDrawSelMode()));
break;
- case FN_FLIP_HORZ_GRAFIC:
- case SID_FLIP_HORIZONTAL:
- if ( !pSdrView->IsMirrorAllowed() || bProtected
)
- rSet.DisableItem( nWhich );
- break;
-
- case FN_FLIP_VERT_GRAFIC:
case SID_FLIP_VERTICAL:
- if ( !pSdrView->IsMirrorAllowed() || bProtected
)
- rSet.DisableItem( nWhich );
- break;
+ 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_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:
{
Modified: openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx Thu Apr 18 12:16:00 2013
@@ -380,46 +380,43 @@ void SwGrfShell::ExecAttr( SfxRequest &r
if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot,
sal_False, &pItem ))
pItem = 0;
- switch( nSlot )
- {
- case FN_FLIP_VERT_GRAFIC:
- case FN_FLIP_HORZ_GRAFIC:
+ switch( nSlot )
+ {
case SID_FLIP_VERTICAL:
case SID_FLIP_HORIZONTAL:
- {
+ {
GetShell().GetCurAttr( aGrfSet );
- SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get(
-
RES_GRFATR_MIRRORGRF ) );
- sal_uInt16 nMirror = aMirror.GetValue();
- if( FN_FLIP_VERT_GRAFIC == nSlot ||
nSlot==SID_FLIP_VERTICAL )
- switch( nMirror )
- {
+ SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get(
RES_GRFATR_MIRRORGRF ) );
+ sal_uInt16 nMirror = aMirror.GetValue();
+ if ( nSlot==SID_FLIP_HORIZONTAL )
+ switch( nMirror )
+ {
case RES_MIRROR_GRAPH_DONT: nMirror =
RES_MIRROR_GRAPH_VERT;
-
break;
+ break;
case RES_MIRROR_GRAPH_HOR: nMirror =
RES_MIRROR_GRAPH_BOTH;
-
break;
+ break;
case RES_MIRROR_GRAPH_VERT: nMirror =
RES_MIRROR_GRAPH_DONT;
-
break;
+ break;
case RES_MIRROR_GRAPH_BOTH: nMirror = RES_MIRROR_GRAPH_HOR;
-
break;
- }
- else
- switch( nMirror )
- {
+ break;
+ }
+ else
+ switch( nMirror )
+ {
case RES_MIRROR_GRAPH_DONT: nMirror = RES_MIRROR_GRAPH_HOR;
-
break;
+ break;
case RES_MIRROR_GRAPH_VERT: nMirror =
RES_MIRROR_GRAPH_BOTH;
-
break;
+ break;
case RES_MIRROR_GRAPH_HOR: nMirror =
RES_MIRROR_GRAPH_DONT;
-
break;
+ break;
case RES_MIRROR_GRAPH_BOTH: nMirror =
RES_MIRROR_GRAPH_VERT;
-
break;
- }
- aMirror.SetValue( nMirror );
- aGrfSet.ClearItem();
- aGrfSet.Put( aMirror );
- }
- break;
+ break;
+ }
+ aMirror.SetValue( nMirror );
+ aGrfSet.ClearItem();
+ aGrfSet.Put( aMirror );
+ }
+ break;
case SID_ATTR_GRAF_LUMINANCE:
if( pItem )
@@ -552,27 +549,27 @@ void SwGrfShell::GetAttrState(SfxItemSet
break;
}
- case FN_FLIP_VERT_GRAFIC:
- if( !bParentCntProt )
- {
+ case SID_FLIP_HORIZONTAL:
+ if( !bParentCntProt )
+ {
MirrorGraph nState = static_cast< MirrorGraph >(((const
SwMirrorGrf &) aCoreSet.Get(
RES_GRFATR_MIRRORGRF )).GetValue());
rSet.Put(SfxBoolItem( nWhich, nState == RES_MIRROR_GRAPH_VERT
||
nState ==
RES_MIRROR_GRAPH_BOTH));
- }
- break;
+ }
+ break;
- case FN_FLIP_HORZ_GRAFIC:
- if( !bParentCntProt )
- {
+ case SID_FLIP_VERTICAL:
+ if( !bParentCntProt )
+ {
MirrorGraph nState = static_cast< MirrorGraph >(((const
SwMirrorGrf &) aCoreSet.Get(
RES_GRFATR_MIRRORGRF )).GetValue());
rSet.Put(SfxBoolItem( nWhich, nState == RES_MIRROR_GRAPH_HOR ||
nState ==
RES_MIRROR_GRAPH_BOTH));
- }
- break;
+ }
+ break;
case SID_ATTR_GRAF_LUMINANCE:
Modified: openoffice/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml (original)
+++ openoffice/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml Thu Apr 18
12:16:00 2013
@@ -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">
Modified: openoffice/trunk/main/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
(original)
+++ openoffice/trunk/main/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml Thu
Apr 18 12:16:00 2013
@@ -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
Modified: openoffice/trunk/main/sw/uiconfig/sweb/menubar/menubar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/sweb/menubar/menubar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/sweb/menubar/menubar.xml (original)
+++ openoffice/trunk/main/sw/uiconfig/sweb/menubar/menubar.xml Thu Apr 18
12:16:00 2013
@@ -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">
Modified: openoffice/trunk/main/sw/uiconfig/swform/menubar/menubar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swform/menubar/menubar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swform/menubar/menubar.xml (original)
+++ openoffice/trunk/main/sw/uiconfig/swform/menubar/menubar.xml Thu Apr 18
12:16:00 2013
@@ -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">
Modified: openoffice/trunk/main/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swform/toolbar/graphicobjectbar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
(original)
+++ openoffice/trunk/main/sw/uiconfig/swform/toolbar/graphicobjectbar.xml Thu
Apr 18 12:16:00 2013
@@ -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
Modified: openoffice/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml (original)
+++ openoffice/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml Thu Apr 18
12:16:00 2013
@@ -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">
Modified:
openoffice/trunk/main/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
(original)
+++ openoffice/trunk/main/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml Thu
Apr 18 12:16:00 2013
@@ -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
Modified: openoffice/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml (original)
+++ openoffice/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml Thu Apr 18
12:16:00 2013
@@ -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">
Modified: openoffice/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
(original)
+++ openoffice/trunk/main/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml Thu
Apr 18 12:16:00 2013
@@ -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
Modified: openoffice/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml (original)
+++ openoffice/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml Thu Apr 18
12:16:00 2013
@@ -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">
Modified: openoffice/trunk/main/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml?rev=1469292&r1=1469291&r2=1469292&view=diff
==============================================================================
--- openoffice/trunk/main/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
(original)
+++ openoffice/trunk/main/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml Thu
Apr 18 12:16:00 2013
@@ -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
