summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-05-17 18:40:59 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2017-05-18 00:28:17 +0300
commit3f738f81398095377ac736c2363be84141e25b9a (patch)
treebfc657e9443bdc63e8666bd5f162454501280ef8 /include
parent33900a71ab7955d9d2d6009e58c5b5b149c1ce0f (diff)
SID_ADDONS sdi slot is unused
We only need a label in officecfg, and an icon in icon-themes. Change-Id: I88482f85b282742c5d6dc7f6ec7ba6442c09a639
Diffstat (limited to 'include')
-rw-r--r--include/framework/menuconfiguration.hxx9
-rw-r--r--include/sfx2/sfxsids.hrc1
2 files changed, 1 insertions, 9 deletions
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 15cb3c768fe0..ef266b454ac0 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -36,19 +36,12 @@
#include <vcl/menu.hxx>
#include <vcl/toolbox.hxx>
-// Prepare for inclusion by framework and sfx
-// Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS)
-#define FWK_SID_SFX_START 5000
-#define FWK_SID_ADDONS (FWK_SID_SFX_START+1678)
-#define FWK_SID_ADDONHELP (FWK_SID_SFX_START+1684)
-
const sal_uInt16 START_ITEMID_PICKLIST = 4500;
const sal_uInt16 END_ITEMID_PICKLIST = 4599;
const sal_uInt16 MAX_ITEMCOUNT_PICKLIST = 99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed!
const sal_uInt16 START_ITEMID_WINDOWLIST = 4600;
const sal_uInt16 END_ITEMID_WINDOWLIST = 4699;
-const sal_uInt16 ITEMID_ADDONLIST = FWK_SID_ADDONS;
-const sal_uInt16 ITEMID_ADDONHELP = FWK_SID_ADDONHELP;
+const sal_uInt16 ITEMID_ADDONLIST = 6678; // used to be a SID in sfx2, now just a unique id...
namespace framework
{
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index e425071874a8..f061b163428a 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -194,7 +194,6 @@
#define SID_STOP_RECORDING (SID_SFX_START + 1671)
#define SID_INTERACTIONHANDLER (SID_SFX_START + 1675)
#define SID_OPENHYPERLINK (SID_SFX_START + 1676)
-#define SID_ADDONS (SID_SFX_START + 1678)
#define SID_CONTENT (SID_SFX_START + 1679)
#define SID_SHOW_IME_STATUS_WINDOW (SID_SFX_START + 1680)
#define SID_VIEWONLY (SID_SFX_START + 1682)