diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-04 10:21:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-04 11:36:12 +0100 |
commit | 08209f2b67cf84b96dd03c90d87bc2d8dad26c8c (patch) | |
tree | 56eed4a51eccc28c730e0570f334782e72a3b20d /include | |
parent | 9be88e7281aea0b4b65c9d0da85ca617f58b925c (diff) |
de-duplicate some defines in hrc files
and rename SID_INSERTSYMBOL -> SID_INSERTSPECIAL in starmath to make it
unique
Change-Id: I0eeefe25e0e9374871c73793a31cb3e6cc445f73
Reviewed-on: https://gerrit.libreoffice.org/47369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/editeng/editids.hrc | 2 | ||||
-rw-r--r-- | include/sfx2/sfxsids.hrc | 49 | ||||
-rw-r--r-- | include/svx/svxids.hrc | 41 |
3 files changed, 24 insertions, 68 deletions
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index f728255f4285..5921eff49866 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -138,8 +138,6 @@ #error Resource-Overflow in #line, #file #endif -#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL - #endif // ******************************************************************* EOF diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 995f3641a744..8ded365cdc6e 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -550,41 +550,41 @@ // SlotIds for Basic ------------------------------------------------------- #define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) #define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) -#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 ) -#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 ) #define SID_BASICIDE_CHOOSEMACRO ( SID_BASICIDE_START + 2 ) -#define SID_BASICIDE_CREATEMACRO ( SID_BASICIDE_START + 4 ) -#define SID_BASICIDE_DELETECURRENT ( SID_BASICIDE_START + 22 ) #define SID_BASICIDE_EDITMACRO ( SID_BASICIDE_START + 3 ) -#define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 ) -#define SID_BASICIDE_LIBLOADED ( SID_BASICIDE_START + 27 ) -#define SID_BASICIDE_LIBSELECTOR ( SID_BASICIDE_START + 19 ) -#define SID_BASICIDE_LIBSELECTED ( SID_BASICIDE_START + 18 ) -#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 ) -#define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 ) -#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 ) +#define SID_BASICIDE_CREATEMACRO ( SID_BASICIDE_START + 4 ) #define SID_BASICIDE_MODULEDLG ( SID_BASICIDE_START + 5 ) -#define SID_BASICIDE_NAMECHANGEDONTAB ( SID_BASICIDE_START + 11 ) -#define SID_BASICIDE_ARG_TABID ( SID_BASICIDE_START + 30 ) -#define SID_BASICIDE_ARG_MACROINFO ( SID_BASICIDE_START + 32 ) -#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 ) -#define SID_BASICIDE_ARG_SBX ( SID_BASICIDE_START + 31 ) -#define SID_BASICIDE_NEWMODULE ( SID_BASICIDE_START + 21 ) -#define SID_BASICIDE_NEWDIALOG ( SID_BASICIDE_START + 20 ) #define SID_BASICIDE_OBJCAT ( SID_BASICIDE_START + 6 ) #define SID_BASICIDE_REMOVEWATCH ( SID_BASICIDE_START + 7 ) +#define SID_BASICIDE_SHOWSBX ( SID_BASICIDE_START + 9 ) +#define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 ) +#define SID_BASICIDE_NAMECHANGEDONTAB ( SID_BASICIDE_START + 11 ) +#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 ) +#define SID_BASICIDE_STOREMODULESOURCE ( SID_BASICIDE_START + 13 ) +#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 ) +#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 ) +#define SID_BASICIDE_STOREALLMODULESOURCES ( SID_BASICIDE_START + 16 ) +#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 ) +#define SID_BASICIDE_LIBSELECTED ( SID_BASICIDE_START + 18 ) +#define SID_BASICIDE_LIBSELECTOR ( SID_BASICIDE_START + 19 ) +#define SID_BASICIDE_NEWDIALOG ( SID_BASICIDE_START + 20 ) +#define SID_BASICIDE_NEWMODULE ( SID_BASICIDE_START + 21 ) +#define SID_BASICIDE_DELETECURRENT ( SID_BASICIDE_START + 22 ) #define SID_BASICIDE_RENAMECURRENT ( SID_BASICIDE_START + 23 ) #define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 ) #define SID_BASICIDE_SBXINSERTED ( SID_BASICIDE_START + 25 ) #define SID_BASICIDE_SBXRENAMED ( SID_BASICIDE_START + 26 ) -#define SID_BASICIDE_SHOWSBX ( SID_BASICIDE_START + 9 ) +#define SID_BASICIDE_LIBLOADED ( SID_BASICIDE_START + 27 ) +#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 ) +#define SID_BASICIDE_ARG_TABID ( SID_BASICIDE_START + 30 ) +#define SID_BASICIDE_ARG_SBX ( SID_BASICIDE_START + 31 ) +#define SID_BASICIDE_ARG_MACROINFO ( SID_BASICIDE_START + 32 ) +#define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 ) +#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 ) +#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 ) #define SID_BASICIDE_STAT_POS ( SID_BASICIDE_START + 38 ) #define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 ) #define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 ) -#define SID_BASICIDE_STOREMODULESOURCE ( SID_BASICIDE_START + 13 ) -#define SID_BASICIDE_STOREALLMODULESOURCES ( SID_BASICIDE_START + 16 ) -#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 ) -#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 ) #define SID_BASICIDE_MANAGEBRKPNTS ( SID_BASICIDE_START + 42 ) #define SID_BASICIDE_TOGGLEBRKPNTENABLED ( SID_BASICIDE_START + 43 ) #define SID_BASICIDE_SHOWWINDOW ( SID_BASICIDE_START + 44 ) @@ -597,6 +597,7 @@ #define SID_BASICIDE_ARG_DOCUMENT_MODEL ( SID_BASICIDE_START + 51 ) #define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 ) #define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 ) +#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) // SlotIds for Apps -------------------------------------------------------- #define FN_PARAM (SID_SW_START + 1100) @@ -625,7 +626,6 @@ #define SID_MODIFIED (SID_SD_START+89) #define ID_VAL_DUMMY0 (SID_SD_START+230) -#define ID_VAL_ZOOM (SID_SD_START+234) #define SID_SIZE_OPTIMAL (SID_SD_START+99) #define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL) @@ -644,7 +644,6 @@ #define FN_LABEL (SID_SW_START + 1051 ) #define FN_BUSINESS_CARD (SID_SW_START + 1052) #define FN_XFORMS_INIT (SID_SW_START + 1053) -#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) #define SID_RESTORE_EDITING_VIEW (SID_SFX_START + 1663) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 07e808c37627..8ebc442ed764 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -96,47 +96,6 @@ class SvxLineItem; #define SID_EQUALIZEWIDTH (SID_SFX_START + 684) #define SID_EQUALIZEHEIGHT (SID_SFX_START + 685) -// basic IDE IDs - -#define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) -#define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) -#define SID_BASICIDE_CHOOSEMACRO ( SID_BASICIDE_START + 2 ) -#define SID_BASICIDE_EDITMACRO ( SID_BASICIDE_START + 3 ) -#define SID_BASICIDE_CREATEMACRO ( SID_BASICIDE_START + 4 ) -#define SID_BASICIDE_MODULEDLG ( SID_BASICIDE_START + 5 ) -#define SID_BASICIDE_OBJCAT ( SID_BASICIDE_START + 6 ) -#define SID_BASICIDE_REMOVEWATCH ( SID_BASICIDE_START + 7 ) -#define SID_BASICIDE_SHOWSBX ( SID_BASICIDE_START + 9 ) -#define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 ) -#define SID_BASICIDE_NAMECHANGEDONTAB ( SID_BASICIDE_START + 11 ) -#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 ) -#define SID_BASICIDE_STOREMODULESOURCE ( SID_BASICIDE_START + 13 ) -#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 ) -#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 ) -#define SID_BASICIDE_STOREALLMODULESOURCES ( SID_BASICIDE_START + 16 ) -#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 ) -#define SID_BASICIDE_LIBSELECTED ( SID_BASICIDE_START + 18 ) -#define SID_BASICIDE_LIBSELECTOR ( SID_BASICIDE_START + 19 ) -#define SID_BASICIDE_NEWDIALOG ( SID_BASICIDE_START + 20 ) -#define SID_BASICIDE_NEWMODULE ( SID_BASICIDE_START + 21 ) -#define SID_BASICIDE_DELETECURRENT ( SID_BASICIDE_START + 22 ) -#define SID_BASICIDE_RENAMECURRENT ( SID_BASICIDE_START + 23 ) -#define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 ) -#define SID_BASICIDE_SBXINSERTED ( SID_BASICIDE_START + 25 ) -#define SID_BASICIDE_SBXRENAMED ( SID_BASICIDE_START + 26 ) -#define SID_BASICIDE_LIBLOADED ( SID_BASICIDE_START + 27 ) -#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 ) -#define SID_BASICIDE_ARG_TABID ( SID_BASICIDE_START + 30 ) -#define SID_BASICIDE_ARG_SBX ( SID_BASICIDE_START + 31 ) -#define SID_BASICIDE_ARG_MACROINFO ( SID_BASICIDE_START + 32 ) -#define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 ) -#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 ) -#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 ) -#define SID_BASICIDE_STAT_POS ( SID_BASICIDE_START + 38 ) -#define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 ) -#define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 ) -#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) - // StarBase IDs #define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // data in fields |