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

[Yousuf Philips]

 sd/source/ui/app/menuids_tmpl.src |    8 --------
 sd/source/ui/app/popup2_tmpl.src  |   17 -----------------
 2 files changed, 25 deletions(-)

New commits:
commit 7ed3f611d8f1102701b267b801607a6068608a8a
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Thu Dec 18 18:40:19 2014 +0400

    fdo#86607 removal of 'Custom Animation' entry from context menu (4.4)
    
    Change-Id: I34800f3672d3caaa37c751e59b68ed426bf70d50
    Reviewed-on: https://gerrit.libreoffice.org/13525
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 13af803267905099fca117a1428afc8928477d1a)
    Reviewed-on: https://gerrit.libreoffice.org/13592
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 07f6fb0..7944b1c 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -702,14 +702,6 @@
         Text [ en-US ] = "Description..." ; \
     };
 
-#define MN_EFFECT \
-    MenuItem\
-    {\
-        Identifier = SID_CUSTOM_ANIMATION_PANEL ; \
-        HelpId = CMD_SID_CUSTOM_ANIMATION_PANEL ; \
-        Text [ en-US ] = "Custom Animation..." ; \
-    };
-
 #define MN_ACTION \
     MenuItem\
     {\
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index f80926e..65ad296 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -56,7 +56,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -97,7 +96,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -139,7 +137,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -181,7 +178,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -220,7 +216,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
 //      SEPARATOR
@@ -258,7 +253,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
 //      SEPARATOR
@@ -295,7 +289,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -336,7 +329,6 @@
         MN_ENTER_GROUP
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
     };
@@ -374,7 +366,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -416,7 +407,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -458,7 +448,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -500,7 +489,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -565,7 +553,6 @@
         MN_BREAK
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
     };
@@ -604,7 +591,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR
@@ -656,7 +642,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
     };
@@ -707,7 +692,6 @@
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
     };
@@ -861,7 +845,6 @@
         MN_NAME_GROUP
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
         SEPARATOR
-        MN_EFFECT
         MN_ACTION
 #endif
         SEPARATOR