[Libreoffice-commits] core.git: sc/source sw/source

[Yousuf Philips]

 sc/source/ui/drawfunc/objdraw.src |  140 --------------------------------------
 sw/source/ui/app/mn.src           |   18 ----
 2 files changed, 158 deletions(-)

New commits:
commit 2b0be6c0e9d23f1b8535ba7033732ae2e3bfb5c9
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Mon Apr 27 10:51:27 2015 +0400

    tdf#86606 Removal of additional direct formatting
    
    Change-Id: Ied176f9e90b78ad2437fe8c6037508be231f6ebe
    Reviewed-on: https://gerrit.libreoffice.org/15547
    Tested-by: Jenkins <ci at libreoffice.org>
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src
index 065fdf8..b8cbe40 100644
--- a/sc/source/ui/drawfunc/objdraw.src
+++ b/sc/source/ui/drawfunc/objdraw.src
@@ -31,135 +31,6 @@
         Text [ en-US ] = "~Default" ; \
     };
 
- // Font (SID_ATTR_CHAR_FONT) und Groesse (SID_ATTR_CHAR_FONTHEIGHT) duerfen nicht im
- // Formatmenue auftauchen, weil die Controller im ExeEnv sonst im Container angelegt werden
-#define MN_TEXT_ATTR\
-    MenuItem\
-    {\
-        Identifier = RID_MN_FORMAT_STYLE ; \
-        HelpID = HID_MN_FORMAT_STYLE ; \
-        Text [ en-US ] = "~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\
-                {\
-                    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 ] = "~Superscript" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_SET_SUB_SCRIPT ; \
-                    HelpID = CMD_SID_SET_SUB_SCRIPT ; \
-                    Text [ en-US ] = "S~ubscript" ; \
-                };\
-            };\
-        };\
-    };\
-    MenuItem\
-    {\
-        Identifier = RID_MN_FORMAT_ALGN ; \
-        HelpID = HID_MN_FORMAT_ALGN ; \
-        Text [ en-US ] = "~Alignment" ; \
-        RadioCheck = TRUE ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    Identifier = SID_ALIGNLEFT ; \
-                    HelpID = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "~Left" ;\
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ALIGNRIGHT ; \
-                    HelpID = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "~Right" ;\
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ALIGNCENTERHOR ; \
-                    HelpID = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "~Centered" ;\
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ALIGNBLOCK ; \
-                    HelpID = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
-                    RadioCheck = TRUE ; \
-                    Text [ en-US ] = "~Justified" ; \
-                };\
-            };\
-        };\
-    };\
-    MenuItem\
-    {\
-        Identifier = RID_MN_FORMAT_LINESPACE ; \
-        HelpID = HID_MN_FORMAT_LINESPACE ; \
-        Text [ en-US ] = "~Line Spacing" ; \
-        _MenuItemFlags = MIB_RADIOCHECK ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_PARA_LINESPACE_10\
-                    RadioCheck = TRUE ; \
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_PARA_LINESPACE_15\
-                    RadioCheck = TRUE ; \
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_PARA_LINESPACE_20\
-                    RadioCheck = TRUE ; \
-                };\
-            };\
-        };\
-    };
-
 #define MN_DRWTXT \
     MenuItem\
     {\
@@ -606,17 +477,6 @@ Menu RID_POPUP_DRAWTEXT
         MenuItem { Separator = TRUE ; };
         MN_DRWTXTATTR
         MenuItem { Separator = TRUE ; };
-        MenuItem
-        {
-            ITEM_FORMAT_ATTR_CHAR_FONT
-        };
-        MenuItem
-        {
-            ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT
-        };
-         // Stil, Ausrichtung, Zeilenabstand
-        MN_TEXT_ATTR
-        MenuItem { Separator = TRUE ; };
          // Zeichen, Absatz
         MN_DRWTXT
         MenuItem { Separator = TRUE ; };
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index c6e3828..7297344 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1024,24 +1024,6 @@ Menu MN_ANNOTATION_POPUPMENU
 {
     ItemList =
     {
-        MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_WEIGHT\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_POSTURE\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_UNDERLINE\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
-                };\
-        SEPARATOR ;
-        SEPARATOR ;
         MN_ANNOTATIONS
     };
 };