summaryrefslogtreecommitdiffstats
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/bitmaps.hlst46
-rw-r--r--sw/inc/helpids.h42
2 files changed, 21 insertions, 67 deletions
diff --git a/sw/inc/bitmaps.hlst b/sw/inc/bitmaps.hlst
index f2b9f5ab6f9b..93b787fafd7a 100644
--- a/sw/inc/bitmaps.hlst
+++ b/sw/inc/bitmaps.hlst
@@ -29,8 +29,6 @@ inline constexpr OUStringLiteral BMP_REDLINE_FMTCOLLSET = u"sw/res/redline_fmtco
inline constexpr OUStringLiteral BMP_REDLINE_MOVED_INSERTION = u"cmd/sc_paste.png";
inline constexpr OUStringLiteral BMP_REDLINE_MOVED_DELETION = u"cmd/sc_cut.png";
-#define RID_BMP_COLLAPSE "res/sx18002.png"
-#define RID_BMP_EXPAND "res/sx18003.png"
inline constexpr OUStringLiteral RID_BMP_DB = u"sw/res/sx01.png";
inline constexpr OUStringLiteral RID_BMP_DBTABLE = u"sw/res/sx02.png";
inline constexpr OUStringLiteral RID_BMP_DBQUERY = u"sw/res/sx03.png";
@@ -53,29 +51,27 @@ inline constexpr OUStringLiteral RID_BMP_PROT_NO_HIDE = u"sw/res/re04.png";
inline constexpr OUStringLiteral BMP_INFO_16 = u"res/info_16.png";
-#define RID_BMP_RIBBAR_NEXT "sw/res/sr20000.png"
-#define RID_BMP_RIBBAR_PREV "sw/res/sr20001.png"
-#define RID_BMP_RIBBAR_TBL "sw/res/sr20002.png"
-#define RID_BMP_RIBBAR_FRM "sw/res/sr20003.png"
-#define RID_BMP_RIBBAR_PGE "sw/res/sr20004.png"
-#define RID_BMP_RIBBAR_DRW "sw/res/sr20005.png"
-#define RID_BMP_RIBBAR_CTRL "sw/res/sr20006.png"
-#define RID_BMP_RIBBAR_REG "sw/res/sr20007.png"
-#define RID_BMP_RIBBAR_BKM "sw/res/sr20008.png"
-#define RID_BMP_RIBBAR_GRF "sw/res/sr20009.png"
-#define RID_BMP_RIBBAR_OLE "sw/res/sr20010.png"
-#define RID_BMP_RIBBAR_OUTL "sw/res/sr20011.png"
-#define RID_BMP_RIBBAR_SEL "sw/res/sr20012.png"
-#define RID_BMP_RIBBAR_FTN "sw/res/sr20013.png"
-#define RID_BMP_RIBBAR_MARK "sw/res/sr20014.png"
-#define RID_BMP_RIBBAR_POSTIT "sw/res/sr20015.png"
-#define RID_BMP_RIBBAR_REP "sw/res/sr20016.png"
-#define RID_BMP_RIBBAR_ENTRY "sw/res/sr20017.png"
-#define RID_BMP_RIBBAR_FORMULA "sw/res/sr20018.png"
-#define RID_BMP_RIBBAR_ERROR "sw/res/sr20019.png"
-#define RID_BMP_RIBBAR_RECENCY "sw/res/sc20244.png"
-#define RID_BMP_RIBBAR_FIELD "sw/res/sc20244.png"
-#define RID_BMP_RIBBAR_FIELD_BYTYPE "sw/res/sc20244.png"
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_TBL = u"sw/res/sr20002.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_FRM = u"sw/res/sr20003.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_PGE = u"sw/res/sr20004.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_DRW = u"sw/res/sr20005.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_CTRL = u"sw/res/sr20006.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_REG = u"sw/res/sr20007.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_BKM = u"sw/res/sr20008.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_GRF = u"sw/res/sr20009.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_OLE = u"sw/res/sr20010.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_OUTL = u"sw/res/sr20011.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_SEL = u"sw/res/sr20012.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_FTN = u"sw/res/sr20013.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_MARK = u"sw/res/sr20014.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_POSTIT = u"sw/res/sr20015.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_REP = u"sw/res/sr20016.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_ENTRY = u"sw/res/sr20017.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_FORMULA = u"sw/res/sr20018.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_ERROR = u"sw/res/sr20019.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_RECENCY = u"sw/res/sc20244.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_FIELD = u"sw/res/sc20244.png";
+inline constexpr OUStringLiteral RID_BMP_RIBBAR_FIELD_BYTYPE = u"sw/res/sc20244.png";
inline constexpr OUStringLiteral RID_BMP_NAVI_OUTLINE = u"sw/res/nc20000.png";
inline constexpr OUStringLiteral RID_BMP_NAVI_TABLE = u"sw/res/nc20001.png";
diff --git a/sw/inc/helpids.h b/sw/inc/helpids.h
index 779de6628c30..c5fa052b817a 100644
--- a/sw/inc/helpids.h
+++ b/sw/inc/helpids.h
@@ -24,12 +24,6 @@
inline constexpr OStringLiteral HID_EDIT_WIN = "SW_HID_EDIT_WIN";
-#define HID_NAVI_DRAG_HYP "SW_HID_NAVI_DRAG_HYP"
-#define HID_NAVI_DRAG_LINK "SW_HID_NAVI_DRAG_LINK"
-#define HID_NAVI_DRAG_COPY "SW_HID_NAVI_DRAG_COPY"
-#define HID_NAVI_OUTLINES "SW_HID_NAVI_OUTLINES"
-
-
inline constexpr OStringLiteral HID_PAGEPREVIEW = "SW_HID_PAGEPREVIEW";
inline constexpr OStringLiteral HID_SOURCE_EDITWIN = "SW_HID_SOURCE_EDITWIN";
@@ -38,24 +32,8 @@ inline constexpr OStringLiteral HID_SOURCE_EDITWIN = "SW_HID_SOURCE_EDITWIN";
inline constexpr OStringLiteral HID_NAVIGATOR_TREELIST = "SW_HID_NAVIGATOR_TREELIST";
inline constexpr OStringLiteral HID_NAVIGATOR_TOOLBOX = "SW_HID_NAVIGATOR_TOOLBOX";
inline constexpr OStringLiteral HID_NAVIGATOR_LISTBOX = "SW_HID_NAVIGATOR_LISTBOX";
-#define HID_NAVI_VS "SW_HID_NAVI_VS"
inline constexpr OStringLiteral HID_NAVIGATOR_GLOBAL_TOOLBOX = "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX";
inline constexpr OStringLiteral HID_NAVIGATOR_GLOB_TREELIST = "SW_HID_NAVIGATOR_GLOB_TREELIST";
-#define HID_GLBLTREE_UPDATE "SW_HID_GLBLTREE_UPDATE"
-#define HID_GLBLTREE_INSERT "SW_HID_GLBLTREE_INSERT"
-#define HID_GLBLTREE_EDIT "SW_HID_GLBLTREE_EDIT"
-#define HID_GLBLTREE_DEL "SW_HID_GLBLTREE_DEL"
-#define HID_GLBLTREE_INS_IDX "SW_HID_GLBLTREE_INS_IDX"
-#define HID_GLBLTREE_INS_FILE "SW_HID_GLBLTREE_INS_FILE"
-#define HID_GLBLTREE_INS_NEW_FILE "SW_HID_GLBLTREE_INS_NEW_FILE"
-#define HID_GLBLTREE_INS_TEXT "SW_HID_GLBLTREE_INS_TEXT"
-#define HID_GLBLTREE_UPD_SEL "SW_HID_GLBLTREE_UPD_SEL"
-#define HID_GLBLTREE_UPD_IDX "SW_HID_GLBLTREE_UPD_IDX"
-#define HID_GLBLTREE_UPD_LINK "SW_HID_GLBLTREE_UPD_LINK"
-#define HID_GLBLTREEUPD_ALL "SW_HID_GLBLTREEUPD_ALL"
-
-#define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK"
-
// TabPage Help-IDs
@@ -124,26 +102,6 @@ inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_TYPE = "SW_HID_BUSINESS_FM
inline constexpr OStringLiteral HID_PVIEW_ZOOM_LB = "SW_HID_PVIEW_ZOOM_LB";
-#define HID_NID_TBL "SW_HID_NID_TBL"
-#define HID_NID_FRM "SW_HID_NID_FRM"
-#define HID_NID_GRF "SW_HID_NID_GRF"
-#define HID_NID_OLE "SW_HID_NID_OLE"
-#define HID_NID_PGE "SW_HID_NID_PGE"
-#define HID_NID_OUTL "SW_HID_NID_OUTL"
-#define HID_NID_MARK "SW_HID_NID_MARK"
-#define HID_NID_DRW "SW_HID_NID_DRW"
-#define HID_NID_CTRL "SW_HID_NID_CTRL"
-#define HID_NID_PREV "SW_HID_NID_PREV"
-#define HID_NID_REG "SW_HID_NID_REG"
-#define HID_NID_BKM "SW_HID_NID_BKM"
-#define HID_NID_SEL "SW_HID_NID_SEL"
-#define HID_NID_FTN "SW_HID_NID_FTN"
-#define HID_NID_POSTIT "SW_HID_NID_POSTIT"
-#define HID_NID_SRCH_REP "SW_HID_NID_SRCH_REP"
-#define HID_NID_INDEX_ENTRY "SW_HID_NID_INDEX_ENTRY"
-#define HID_NID_TABLE_FORMULA "SW_HID_NID_TABLE_FORMULA"
-#define HID_NID_TABLE_FORMULA_ERROR "SW_HID_NID_TABLE_FORMULA_ERROR"
-#define HID_NID_NEXT "SW_HID_NID_NEXT"
inline constexpr OStringLiteral HID_MM_NEXT_PAGE = "SW_HID_MM_NEXT_PAGE";
inline constexpr OStringLiteral HID_MM_PREV_PAGE = "SW_HID_MM_PREV_PAGE";
inline constexpr OStringLiteral HID_MM_ADDBLOCK_ELEMENTS = "SW_HID_MM_ADDBLOCK_ELEMENTS";