[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Yousuf Philips]

 sw/source/ui/app/mn.src |   88 ++++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 43 deletions(-)

New commits:
commit 78cb68248ea7bc8a5ea52b0992c6d1eadd7633a4
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Thu Dec 18 13:02:45 2014 +0400

    fdo#87185 reorganize the image context menu (4.4)
    
    Change-Id: I31e8f713f65b05e0a17fa79785bed6834dc973b4
    Reviewed-on: https://gerrit.libreoffice.org/13570
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 29bb99c5e735aa1d23e15816bb44f56e79e9bbc7)
    Reviewed-on: https://gerrit.libreoffice.org/13611
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 238c307..5baaefb 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1119,7 +1119,7 @@ String MN_GRF_POPUPMENU
     Text [ en-US ] = "Graphic" ;
 };
 
-#define MN_ALIGN_FRAME \
+#define MN_ARRANGE_FRAME \
     MenuItem\
     {\
         Identifier = MN_SUB_ALIGN ; \
@@ -1141,11 +1141,14 @@ String MN_GRF_POPUPMENU
                 };\
             };\
         };\
-        };\
+    };\
+
+#define MN_ALIGNMENT_FRAME \
     MenuItem\
     {\
         Identifier = MN_FORMAT_FRM_HORZ ; \
         Command = ".uno:AlignFrameMenu" ; \
+        Text [ en-US ] = "A~lignment" ; \
         SubMenu = Menu\
         {\
             ItemList = \
@@ -1189,62 +1192,61 @@ String MN_GRF_POPUPMENU
                     };\
             };\
         };\
-        Text [ en-US ] = "A~lignment" ; \
+    };\
+
+#define MN_ROTATE_IMAGE \
+    MenuItem\
+    {\
+        Identifier = SID_MENU_MANAGE_GRAPHIC ; \
+        Command = ".uno:ManageGraphicMenu" ; \
+        Text [ en-US ] = "~Rotate Image" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_ROTATE_GRAPHIC_LEFT ; \
+                    Command = ".uno:RotateLeft" ; \
+                    Text [ en-US ] = "Rotate 90° Left" ; \
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_ROTATE_GRAPHIC_RIGHT ; \
+                    Command = ".uno:RotateRight" ; \
+                    Text [ en-US ] = "Rotate 90° Right" ; \
+                };\
+            };\
         };\
+    };\
+
+#define MN_ALIGN_FRAME \
+    MN_ARRANGE_FRAME \
+    MN_ALIGNMENT_FRAME \
     MN_ANCHOR
 
 Menu MN_GRF_POPUPMENU
 {
     ItemList =
     {
-        MN_ALIGN_FRAME
-        MN_MOUSE_FRAME_WITH_CONTOUR
-        SEPARATOR ;
-        MN_TITLE_DESCRIPTION_SHAPE
+        MenuItem { ITEM_EXTERNAL_EDIT };
+        MenuItem { ITEM_CHANGE_PICTURE };
+        MenuItem { ITEM_COMPRESS_GRAPHIC };
+        MenuItem { ITEM_SAVE_GRAPHIC };
+        MN_ROTATE_IMAGE
         SEPARATOR ;
+
+        MN_FRM_CAPTION_ITEM
         MenuItem
         {
             Identifier = FN_FORMAT_GRAFIC_DLG ;
             HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
             Text [ en-US ] = "~Image..." ;
         };
-        MN_FRM_CAPTION_ITEM
-        SEPARATOR;
-        MenuItem { ITEM_SAVE_GRAPHIC };
-        MenuItem { ITEM_CHANGE_PICTURE };
-        MenuItem { ITEM_COMPRESS_GRAPHIC };
-        MenuItem { ITEM_EXTERNAL_EDIT };
-
-        MenuItem
-        {
-            Identifier = SID_MENU_MANAGE_GRAPHIC ;
-            Command = ".uno:ManageGraphicMenu" ;
-            Text [ en-US ] = "~Rotate Image" ;
-            SubMenu = Menu
-            {
-                ItemList =
-                {
-                    MenuItem
-                    {
-                        Identifier = SID_ROTATE_GRAPHIC_LEFT ;
-                        Command = ".uno:RotateLeft" ;
-                        Text [ en-US ] = "Rotate 90° Left" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = SID_ROTATE_GRAPHIC_RIGHT ;
-                        Command = ".uno:RotateRight" ;
-                        Text [ en-US ] = "Rotate 90° Right" ;
-                    };
-                };
-            };
-        };
+        SEPARATOR ;
 
-        SEPARATOR;
-        MenuItem
-        {
-            ITEM_EDIT_IMAP
-        };
+        MN_ALIGN_FRAME
+        MN_MOUSE_FRAME_WITH_CONTOUR
     };
 };