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

12 files changed, 32 insertions, 100 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 33d245e225db..dee921d426fa 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 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: */
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index e55459801130..36c758a0bf2d 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 715363b1f4e8..33108c062559 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -442,16 +442,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;
@@ -612,7 +609,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(
@@ -623,7 +620,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 51acde7a0a22..2f3f9ee21954 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:RotateMenu">
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 6022a3de7d24..b018158628aa 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:RotateMenu">
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 870dad31ed56..489032930d45 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:RotateMenu">
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 8b81c84dec41..f523636371bc 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:RotateMenu">
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 89d15b34294e..9506ab904299 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:RotateMenu">
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index d74d3c8005e1..a0f2d893d715 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:RotateMenu">