include/sfx2/sfxsids.hrc | 1 - sfx2/sdi/sfx.sdi | 24 ------------------------ 2 files changed, 25 deletions(-)
New commits: commit 7b6fdcd83b14a271061b70d43273d5c6cf0bb43c Author: Maxim Monastirsky <momonas...@gmail.com> Date: Mon Jan 25 16:12:01 2016 +0200 Revert "fdo#62947 make IDs unique, fixes, better names" This reverts commit 5398664eed621fbcc644ff949d4841590973bfa3. Conflicts: include/sfx2/sfxcommands.h sw/source/ui/app/mn.src Change-Id: Ic55cfb51a726ab9ee19bac6719d5e2670d1fb494 diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index f4fbd52..5337a42 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -390,7 +390,6 @@ #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 1667d9d..0fd4262 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4209,30 +4209,6 @@ 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 () [ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits