[Libreoffice-commits] core.git: include/sfx2 sfx2/sdi sw/source

[Tomaž Vajngerl]

 include/sfx2/sfxcommands.h |    1 +
 include/sfx2/sfxsids.hrc   |    1 +
 sfx2/sdi/sfx.sdi           |   24 ++++++++++++++++++++++++
 sw/source/ui/app/mn.src    |    9 ++++-----
 4 files changed, 30 insertions(+), 5 deletions(-)

New commits:
commit 5398664eed621fbcc644ff949d4841590973bfa3
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Fri Sep 19 17:51:52 2014 +0200

    fdo#62947 make IDs unique, fixes, better names
    
    Change-Id: I6cbfd43f037fe89e0f753c67c9368b981b85bd35

diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h
index cde5f46..e9b1b11 100644
--- a/include/sfx2/sfxcommands.h
+++ b/include/sfx2/sfxcommands.h
@@ -39,6 +39,7 @@
 #define CMD_SID_GALLERY_BG_BRUSH                    ".uno:BackgroundImage"
 #define CMD_SID_PASTE                               ".uno:Paste"
 #define CMD_SID_PASTE_SPECIAL                       ".uno:PasteSpecial"
+#define CMD_SID_PASTE_UNFORMATTED                   ".uno:PasteUnformatted"
 #define CMD_SID_PASTE_ONLY                          ".uno:PasteOnly"
 #define CMD_SID_PASTE_ONLY_VALUE                    ".uno:PasteOnlyValue"
 #define CMD_SID_PASTE_ONLY_TEXT                     ".uno:PasteOnlyText"
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 0ecdffa..5d31ca0 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -408,6 +408,7 @@
 #define SID_CUT                             (SID_SFX_START + 710)
 #define SID_COPY                            (SID_SFX_START + 711)
 #define SID_PASTE                           (SID_SFX_START + 712)
+#define SID_MENU_PASTE_SPECIAL              (SID_SFX_START + 713)
 
 #define SID_BACKSPACE                       (SID_SFX_START + 714)
 #define SID_FORMATPAINTBRUSH                (SID_SFX_START + 715)
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index f893324..2016f48 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4516,6 +4516,30 @@ SfxInt16Item PasteSpecial SID_PASTE_SPECIAL
     GroupId = GID_EDIT;
 ]
 
+SfxInt16Item PasteUnformatted SID_PASTE_UNFORMATTED
+(SfxUInt32Item Format SID_PASTE_UNFORMATTED)
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_EDIT;
+]
+
 SfxVoidItem PasteOnly SID_PASTE_ONLY
 ()
 [
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 03c301c..2b94310 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -295,11 +295,10 @@
             Text[ en-US ] = "Down One Level";                              \
         };
 
-#define MN_NEW_PASTE_SPECIAL \
+#define MENU_PASTE_SPECIAL \
     MenuItem\
     {\
-        Identifier = SID_PASTE_SPECIAL ; \
-        HelpId =  CMD_SID_PASTE_SPECIAL ; \
+        Identifier = SID_MENU_PASTE_SPECIAL ; \
         Text [ en-US ] = "Paste ~Special" ; \
         SubMenu = Menu\
         {\
@@ -308,7 +307,7 @@
                 MenuItem\
                 {\
                     Identifier = SID_PASTE_UNFORMATTED ; \
-                    HelpId =  CMD_SID_PASTE_SPECIAL ; \
+                    HelpId =  CMD_SID_PASTE_UNFORMATTED ; \
                     Text [ en-US ] = "~Text Only" ; \
                 };\
                 MenuItem\
@@ -325,7 +324,7 @@
 {                                                                           \
     ItemList =                                                              \
     {                                                                       \
-        MN_NEW_PASTE_SPECIAL                                                \
+        MENU_PASTE_SPECIAL                                                  \
         MN_RESET                                                            \
         _NUMBERING_RELATED_MENU                                             \
         SEPARATOR ;                                                         \