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

[Yousuf Philips]

 sc/source/ui/src/popup.src        |   14 ---------
 sd/source/ui/app/menuids_tmpl.src |   55 --------------------------------------
 sd/source/ui/app/popup.src        |    2 -
 3 files changed, 71 deletions(-)

New commits:
commit a7ae3480928b76be707db57b7089eb72095b4737
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sun Nov 30 20:16:21 2014 +0400

    removal of font name, font size and text alignment from context menus
    
    apply the change made for writer in fdo#81132 to the other modules
    
    Change-Id: Ic7f3252048be070c7e4d5e6ff1b7463b5af9d489
    Reviewed-on: https://gerrit.libreoffice.org/13214
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 82268dd..d49620e 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -365,20 +365,6 @@ Menu RID_POPUP_EDIT
 
         MenuItem { Separator = TRUE ; };
 
-        MenuItem // Menu-Controller
-         // Menu-Controller
-         // Menu-Controller
-         // Menu-Controller
-        {
-            ITEM_FORMAT_ATTR_CHAR_FONT
-        };
-        MenuItem // Menu-Controller
-         // Menu-Controller
-         // Menu-Controller
-         // Menu-Controller
-        {
-            ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT
-        };
         MenuItem
         {
             Text [ en-US ] = "Style" ;
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index cb89cdc..8bdfe05 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -391,18 +391,6 @@
 #define MN_TEXT_ATTR\
     MenuItem\
     {\
-        Identifier = SID_ATTR_CHAR_FONT ; \
-        HelpId = CMD_SID_ATTR_CHAR_FONT ; \
-        Text [ en-US ] = "~Font" ; \
-    };\
-    MenuItem\
-    {\
-        Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
-        HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \
-        Text [ en-US ] = "~Size" ; \
-    };\
-    MenuItem\
-    {\
         Identifier = DUMMY ; \
         Command = ".uno:StyleMenu" ; \
         Text [ en-US ] = "St~yle" ; \
@@ -515,49 +503,6 @@
         Text [ en-US ] = "S~pecial Character..." ; \
     };
 
- // test orientation
-#define MN_TEXT_ALIGN\
-    MenuItem\
-    {\
-        Identifier = DUMMY + 2 ; \
-        Command = ".uno:AlignTextMenu" ; \
-        Text [ en-US ] = "A~lignment" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
-                    HelpId = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "~Left" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \
-                    HelpId = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "~Right" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \
-                    HelpId = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "~Centered" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
-                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "Justified" ; \
-                };\
-            };\
-        };\
-    };
-
  // object orientation
 #define MN_OBJECT_ALIGN \
     MenuItem\
diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src
index 19f5448..f08ddc3 100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@ -51,7 +51,6 @@ Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP
         MN_TEXTATTR
         SEPARATOR
         MN_TEXT_ATTR
-        MN_TEXT_ALIGN
         MN_LINESPACING_ATTR
         SEPARATOR
         MN_CHAR_PARAGRAPH
@@ -78,7 +77,6 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP
         MN_TEXTATTR
         SEPARATOR
         MN_TEXT_ATTR
-        MN_TEXT_ALIGN
         MN_LINESPACING_ATTR
         SEPARATOR
         MN_CHAR_PARAGRAPH