[Libreoffice-commits] core.git: sc/source sd/source sw/source
Yousuf Philips
philipz85 at hotmail.com
Thu Mar 26 02:57:11 PDT 2015
sc/source/ui/src/popup.src | 79 ------------------
sd/source/ui/app/menuids_tmpl.src | 162 --------------------------------------
sd/source/ui/app/popup.src | 10 --
sw/source/ui/app/mn.src | 96 ----------------------
4 files changed, 347 deletions(-)
New commits:
commit 2df3522a5159baa1c9d55e52adbfeba7eae76955
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Tue Mar 24 09:36:42 2015 +0400
tdf#86606 remove direct formatting entries from context menu
Change-Id: I57ec4cb36aa0e3a921653d337bcf5029fc5d3fc8
Reviewed-on: https://gerrit.libreoffice.org/14979
Tested-by: Yousuf Philips <philipz85 at hotmail.com>
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 82268dd..16b88c3 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -365,85 +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" ;
- Identifier = RID_MN_FORMAT_STYLE ;
- HelpID = HID_MN_FORMAT_STYLE ;
- SubMenu = Menu
- {
- ItemList =
- {
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_WEIGHT
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_POSTURE
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_OVERLINE
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_UNDERLINE
- };
- MenuItem
- {
- Identifier = SID_ULINE_VAL_DOUBLE ;
- HelpID = CMD_SID_ULINE_VAL_DOUBLE ;
- Text [ en-US ] = "Do~uble Underline" ;
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_STRIKEOUT
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_SHADOWED
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_CONTOUR
- };
- MenuItem
- {
- Separator = TRUE ;
- };
- MenuItem
- {
- Identifier = SID_SET_SUPER_SCRIPT ;
- HelpID = CMD_SID_SET_SUPER_SCRIPT ;
- Text [ en-US ] = "Su~perscript" ;
- };
- MenuItem
- {
- Identifier = SID_SET_SUB_SCRIPT ;
- HelpID = CMD_SID_SET_SUB_SCRIPT ;
- Text [ en-US ] = "Su~bscript" ;
- };
- };
- };
- };
-
- MenuItem { Separator = TRUE ; };
-
MenuItem
{
Text [ en-US ] = "Insert Fields" ;
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 0c8aa1d..cea91ed 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -406,125 +406,6 @@
Text [ en-US ] = "P~aragraph...";\
};
-#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" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- Identifier = SID_ATTR_CHAR_WEIGHT ; \
- HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; \
- Text [ en-US ] = "Bold" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_CHAR_POSTURE ; \
- HelpId = CMD_SID_ATTR_CHAR_POSTURE ; \
- Text [ en-US ] = "Italic" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_CHAR_OVERLINE ; \
- HelpId = CMD_SID_ATTR_CHAR_OVERLINE ; \
- Text [ en-US ] = "Overline" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_CHAR_UNDERLINE ; \
- HelpId = CMD_SID_ATTR_CHAR_UNDERLINE ; \
- Text [ en-US ] = "Underline" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_CHAR_STRIKEOUT ; \
- HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT ; \
- Text [ en-US ] = "Strikethrough" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_CHAR_SHADOWED ; \
- HelpId = CMD_SID_ATTR_CHAR_SHADOWED ; \
- Text [ en-US ] = "Shadow" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_CHAR_CONTOUR ; \
- HelpId = CMD_SID_ATTR_CHAR_CONTOUR ; \
- Text [ en-US ] = "~Contour" ; \
- };\
- MenuItem\
- {\
- Separator = TRUE ; \
- };\
- MenuItem\
- {\
- Identifier = SID_SET_SUPER_SCRIPT; \
- HelpId = CMD_SID_SET_SUPER_SCRIPT; \
- Text [ en-US ] = "Superscript" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_SET_SUB_SCRIPT; \
- HelpId = CMD_SID_SET_SUB_SCRIPT; \
- Text [ en-US ] = "Subscript" ; \
- };\
- };\
- };\
- };
-
-#define MN_LINESPACING_ATTR\
- MenuItem\
- {\
- Identifier = DUMMY + 1 ; \
- Command = ".uno:LineSpacingMenu" ; \
- Text [ en-US ] = "~Line Spacing" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- Identifier = SID_ATTR_PARA_LINESPACE_10 ; \
- HelpId = CMD_SID_ATTR_PARA_LINESPACE_10 ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "Single Line Spacing" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_PARA_LINESPACE_15 ; \
- HelpId = CMD_SID_ATTR_PARA_LINESPACE_15 ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "1.5 Lines" ; \
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_PARA_LINESPACE_20 ; \
- HelpId = CMD_SID_ATTR_PARA_LINESPACE_20 ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~Double" ; \
- };\
- };\
- };\
- };
-
#define MN_BULLET \
MenuItem\
{\
@@ -533,49 +414,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..0a0cbbc 100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@ -50,10 +50,6 @@ Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP
SEPARATOR
MN_TEXTATTR
SEPARATOR
- MN_TEXT_ATTR
- MN_TEXT_ALIGN
- MN_LINESPACING_ATTR
- SEPARATOR
MN_CHAR_PARAGRAPH
SEPARATOR
MenuItem
@@ -77,10 +73,6 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP
SEPARATOR
MN_TEXTATTR
SEPARATOR
- MN_TEXT_ATTR
- MN_TEXT_ALIGN
- MN_LINESPACING_ATTR
- SEPARATOR
MN_CHAR_PARAGRAPH
SEPARATOR
MenuItem
@@ -346,8 +338,6 @@ Menu RID_OUTLINE_POPUP
{
MN_SET_DEFAULT
SEPARATOR
- MN_TEXT_ATTR
- SEPARATOR
MN_CHAR
ITEM_FORMAT_NUMBERING
ITEM_TRANSLITERATE_MENU
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 09f6035..34e03f3 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -48,99 +48,6 @@
Text [ en-US ] = "Pa~ge..." ; \
};
-#define MN_TEXT_ATTR\
- MenuItem\
- {\
- Identifier = MN_FORMAT_STYLE ; \
- Command = ".uno:StyleMenu" ; \
- Text [ en-US ] = "St~yle" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_WEIGHT\
- Checkable = TRUE ; \
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_POSTURE\
- Checkable = TRUE ; \
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_OVERLINE\
- Checkable = TRUE ; \
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_UNDERLINE\
- Checkable = TRUE ; \
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
- Checkable = TRUE ; \
- };\
- SEPARATOR ; \
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_SHADOWED\
- Checkable = TRUE ; \
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_CONTOUR\
- Checkable = TRUE ; \
- };\
- SEPARATOR ; \
- MenuItem\
- {\
- Identifier = FN_SET_SUPER_SCRIPT ; \
- HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
- Text [ en-US ] = "Superscript" ; \
- Checkable = TRUE ; \
- };\
- MenuItem\
- {\
- Identifier = FN_SET_SUB_SCRIPT ; \
- HelpId = CMD_FN_SET_SUB_SCRIPT ; \
- Text [ en-US ] = "Subscript" ; \
- Checkable = TRUE ; \
- };\
- };\
- };\
- };\
- MenuItem\
- {\
- Identifier = MN_FORMAT_LINESPACE ; \
- Command = ".uno:LineSpacingMenu" ; \
- Text [ en-US ] = "Line Spacing" ; \
- _MenuItemFlags = MIB_RADIOCHECK ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_PARA_LINESPACE_10\
- };\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_PARA_LINESPACE_15\
- };\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_PARA_LINESPACE_20\
- };\
- };\
- };\
- };
-
/* --------------------- D O C U M E N T -------------------------- */
#define _MN_EDIT_FIELD \
@@ -287,7 +194,6 @@
_NUMBERING_RELATED_MENU \
SEPARATOR ; \
MN_RESET \
- MN_TEXT_ATTR \
SEPARATOR ; \
MN_TXT \
MN_NUMBERING \
@@ -775,7 +681,6 @@ Menu MN_TAB_POPUPMENU
MN_TAB2
SEPARATOR ;
MN_RESET
- MN_TEXT_ATTR
SEPARATOR ;
MenuItem
{
@@ -1089,7 +994,6 @@ Menu MN_DRWTXT_POPUPMENU
MENU_PASTE_SPECIAL
SEPARATOR ;
MN_RESET
- MN_TEXT_ATTR
SEPARATOR ;
ITEM_TRANSLITERATE_MENU
SEPARATOR ;
More information about the Libreoffice-commits
mailing list