remove unused defines and convert some to OUStringLiteral

Also remove the associated links.txt entries

Change-Id: I5028fab2feb828875a0b772418fc29cbdfe4ce72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125773
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 78 insertions, 83 deletions

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 1fa444fc6da4..733ce7b26478 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -9,44 +9,44 @@
 
 #pragma once
 
-#define RID_SVXBMP_CELL_NONE            "svx/res/pr01.png"
-#define RID_SVXBMP_CELL_NONE_32         "svx/res/border_cell_none_32.png"
-#define RID_SVXBMP_CELL_ALL             "svx/res/pr02.png"
-#define RID_SVXBMP_CELL_ALL_32          "svx/res/border_cell_all_32.png"
-#define RID_SVXBMP_CELL_LR              "svx/res/pr03.png"
-#define RID_SVXBMP_CELL_LR_32           "svx/res/border_cell_lr_32.png"
-#define RID_SVXBMP_CELL_TB              "svx/res/pr04.png"
-#define RID_SVXBMP_CELL_TB_32           "svx/res/border_cell_tb_32.png"
-#define RID_SVXBMP_CELL_L               "svx/res/pr05.png"
-#define RID_SVXBMP_CELL_L_32            "svx/res/border_cell_l_32.png"
-#define RID_SVXBMP_CELL_DIAG            "svx/res/pr06.png"
-#define RID_SVXBMP_CELL_DIAG_32         "svx/res/border_cell_diag_32.png"
-#define RID_SVXBMP_HOR_NONE             "svx/res/pr07.png"
-#define RID_SVXBMP_HOR_OUTER            "svx/res/pr08.png"
-#define RID_SVXBMP_HOR_HOR              "svx/res/pr09.png"
-#define RID_SVXBMP_HOR_ALL              "svx/res/pr010.png"
-#define RID_SVXBMP_HOR_OUTER2           "svx/res/pr011.png"
-#define RID_SVXBMP_VER_NONE             "svx/res/pr012.png"
-#define RID_SVXBMP_VER_OUTER            "svx/res/pr013.png"
-#define RID_SVXBMP_VER_VER              "svx/res/pr014.png"
-#define RID_SVXBMP_VER_ALL              "svx/res/pr015.png"
-#define RID_SVXBMP_VER_OUTER2           "svx/res/pr016.png"
-#define RID_SVXBMP_TABLE_NONE           "svx/res/pr017.png"
-#define RID_SVXBMP_TABLE_OUTER          "svx/res/pr018.png"
-#define RID_SVXBMP_TABLE_OUTERH         "svx/res/pr019.png"
-#define RID_SVXBMP_TABLE_ALL            "svx/res/pr020.png"
-#define RID_SVXBMP_TABLE_OUTER2         "svx/res/pr021.png"
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_NONE = u"svx/res/pr01.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_NONE_32 = u"svx/res/border_cell_none_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_ALL = u"svx/res/pr02.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_ALL_32 = u"svx/res/border_cell_all_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_LR = u"svx/res/pr03.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_LR_32 = u"svx/res/border_cell_lr_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_TB = u"svx/res/pr04.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_TB_32 = u"svx/res/border_cell_tb_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_L  = u"svx/res/pr05.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_L_32 = u"svx/res/border_cell_l_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_DIAG = u"svx/res/pr06.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_DIAG_32 = u"svx/res/border_cell_diag_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_NONE = u"svx/res/pr07.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_OUTER = u"svx/res/pr08.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_HOR = u"svx/res/pr09.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_ALL = u"svx/res/pr010.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_OUTER2 = u"svx/res/pr011.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_NONE = u"svx/res/pr012.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_OUTER = u"svx/res/pr013.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_VER = u"svx/res/pr014.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_ALL = u"svx/res/pr015.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_OUTER2 = u"svx/res/pr016.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_NONE = u"svx/res/pr017.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTER = u"svx/res/pr018.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTERH = u"svx/res/pr019.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_ALL = u"svx/res/pr020.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTER2 = u"svx/res/pr021.png";
 
-#define RID_SVXBMP_SHADOWNONE           "svx/res/sh01.png"
-#define RID_SVXBMP_SHADOWNONE_32        "svx/res/shadow_none_32.png"
-#define RID_SVXBMP_SHADOW_BOT_RIGHT     "svx/res/sh02.png"
-#define RID_SVXBMP_SHADOW_BOT_RIGHT_32  "svx/res/shadow_bottom_right_32.png"
-#define RID_SVXBMP_SHADOW_BOT_LEFT      "svx/res/sh03.png"
-#define RID_SVXBMP_SHADOW_BOT_LEFT_32   "svx/res/shadow_bottom_left_32.png"
-#define RID_SVXBMP_SHADOW_TOP_RIGHT     "svx/res/sh04.png"
-#define RID_SVXBMP_SHADOW_TOP_RIGHT_32  "svx/res/shadow_top_right_32.png"
-#define RID_SVXBMP_SHADOW_TOP_LEFT      "svx/res/sh05.png"
-#define RID_SVXBMP_SHADOW_TOP_LEFT_32   "svx/res/shadow_top_left_32.png"
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOWNONE = u"svx/res/sh01.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOWNONE_32 = u"svx/res/shadow_none_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_RIGHT = u"svx/res/sh02.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_RIGHT_32 = u"svx/res/shadow_bottom_right_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_LEFT = u"svx/res/sh03.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_LEFT_32 = u"svx/res/shadow_bottom_left_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_RIGHT = u"svx/res/sh04.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_RIGHT_32 = u"svx/res/shadow_top_right_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_LEFT = u"svx/res/sh05.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_LEFT_32 = u"svx/res/shadow_top_left_32.png";
 
 inline constexpr OUStringLiteral RID_SVXBMP_BOTTOMLOCK = u"svx/res/lo01.png";
 inline constexpr OUStringLiteral RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png";
@@ -62,14 +62,9 @@ inline constexpr OUStringLiteral RID_CUIBMP_HARDDISK = u"res/harddisk_16.png";
 inline constexpr OUStringLiteral RID_CUIBMP_LIB = u"res/im30820.png";
 inline constexpr OUStringLiteral RID_CUIBMP_MACRO = u"res/im30821.png";
 inline constexpr OUStringLiteral RID_CUIBMP_DOC = u"res/im30826.png";
-#define RID_CUIBMP_COLLAPSED            "res/plus.png"
-#define RID_CUIBMP_EXPANDED             "res/minus.png"
 
 inline constexpr OUStringLiteral RID_SVXBMP_SCRIPT = u"res/script.png";
 
-#define RID_SVXBMP_COLLAPSEDNODE        "res/sx18002.png"
-#define RID_SVXBMP_EXPANDEDNODE         "res/sx18003.png"
-
 inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP1 = u"svx/res/legtyp1.png";
 inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP2 = u"svx/res/legtyp2.png";
 inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP3 = u"svx/res/legtyp3.png";
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ffe631eee007..64558279be60 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -336,81 +336,81 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
     , m_xRemoveAdjacentCellBordersCB(m_xBuilder->weld_check_button("rmadjcellborders"))
     , m_xRemoveAdjacentCellBordersFT(m_xBuilder->weld_label("rmadjcellbordersft"))
 {
-    static std::vector<std::u16string_view> aBorderImageIds;
+    static std::vector<OUString> aBorderImageIds;
 
     if (aBorderImageIds.empty())
     {
         if (comphelper::LibreOfficeKit::isActive())
         {
             aBorderImageIds.insert(aBorderImageIds.end(), {
-                u"" RID_SVXBMP_CELL_NONE_32,
-                u"" RID_SVXBMP_CELL_ALL_32,
-                u"" RID_SVXBMP_CELL_LR_32,
-                u"" RID_SVXBMP_CELL_TB_32,
-                u"" RID_SVXBMP_CELL_L_32,
-                u"" RID_SVXBMP_CELL_DIAG_32
+                RID_SVXBMP_CELL_NONE_32,
+                RID_SVXBMP_CELL_ALL_32,
+                RID_SVXBMP_CELL_LR_32,
+                RID_SVXBMP_CELL_TB_32,
+                RID_SVXBMP_CELL_L_32,
+                RID_SVXBMP_CELL_DIAG_32
             });
         }
         else
         {
             aBorderImageIds.insert(aBorderImageIds.end(), {
-                u"" RID_SVXBMP_CELL_NONE,
-                u"" RID_SVXBMP_CELL_ALL,
-                u"" RID_SVXBMP_CELL_LR,
-                u"" RID_SVXBMP_CELL_TB,
-                u"" RID_SVXBMP_CELL_L,
-                u"" RID_SVXBMP_CELL_DIAG
+                RID_SVXBMP_CELL_NONE,
+                RID_SVXBMP_CELL_ALL,
+                RID_SVXBMP_CELL_LR,
+                RID_SVXBMP_CELL_TB,
+                RID_SVXBMP_CELL_L,
+                RID_SVXBMP_CELL_DIAG
             });
         }
         aBorderImageIds.insert(aBorderImageIds.end(), {
-            u"" RID_SVXBMP_HOR_NONE,
-            u"" RID_SVXBMP_HOR_OUTER,
-            u"" RID_SVXBMP_HOR_HOR,
-            u"" RID_SVXBMP_HOR_ALL,
-            u"" RID_SVXBMP_HOR_OUTER2,
-            u"" RID_SVXBMP_VER_NONE,
-            u"" RID_SVXBMP_VER_OUTER,
-            u"" RID_SVXBMP_VER_VER,
-            u"" RID_SVXBMP_VER_ALL,
-            u"" RID_SVXBMP_VER_OUTER2,
-            u"" RID_SVXBMP_TABLE_NONE,
-            u"" RID_SVXBMP_TABLE_OUTER,
-            u"" RID_SVXBMP_TABLE_OUTERH,
-            u"" RID_SVXBMP_TABLE_ALL,
-            u"" RID_SVXBMP_TABLE_OUTER2
+            RID_SVXBMP_HOR_NONE,
+            RID_SVXBMP_HOR_OUTER,
+            RID_SVXBMP_HOR_HOR,
+            RID_SVXBMP_HOR_ALL,
+            RID_SVXBMP_HOR_OUTER2,
+            RID_SVXBMP_VER_NONE,
+            RID_SVXBMP_VER_OUTER,
+            RID_SVXBMP_VER_VER,
+            RID_SVXBMP_VER_ALL,
+            RID_SVXBMP_VER_OUTER2,
+            RID_SVXBMP_TABLE_NONE,
+            RID_SVXBMP_TABLE_OUTER,
+            RID_SVXBMP_TABLE_OUTERH,
+            RID_SVXBMP_TABLE_ALL,
+            RID_SVXBMP_TABLE_OUTER2
         });
     }
 
     for (auto const & rImageId : aBorderImageIds)
-        m_aBorderImgVec.emplace_back(StockImage::Yes, OUString(rImageId));
+        m_aBorderImgVec.emplace_back(StockImage::Yes, rImageId);
 
-    static std::vector<std::u16string_view> aShadowImageIds;
+    static std::vector<OUString> aShadowImageIds;
     if (aShadowImageIds.empty())
     {
         if (comphelper::LibreOfficeKit::isActive())
         {
             aShadowImageIds.insert(aShadowImageIds.end(), {
-                u"" RID_SVXBMP_SHADOWNONE_32,
-                u"" RID_SVXBMP_SHADOW_BOT_RIGHT_32,
-                u"" RID_SVXBMP_SHADOW_TOP_RIGHT_32,
-                u"" RID_SVXBMP_SHADOW_BOT_LEFT_32,
-                u"" RID_SVXBMP_SHADOW_TOP_LEFT_32
+                RID_SVXBMP_SHADOWNONE_32,
+                RID_SVXBMP_SHADOW_BOT_RIGHT_32,
+                RID_SVXBMP_SHADOW_TOP_RIGHT_32,
+                RID_SVXBMP_SHADOW_BOT_LEFT_32,
+                RID_SVXBMP_SHADOW_TOP_LEFT_32
             });
         }
         else
         {
             aShadowImageIds.insert(aShadowImageIds.end(), {
-                u"" RID_SVXBMP_SHADOWNONE,
-                u"" RID_SVXBMP_SHADOW_BOT_RIGHT,
-                u"" RID_SVXBMP_SHADOW_TOP_RIGHT,
-                u"" RID_SVXBMP_SHADOW_BOT_LEFT,
-                u"" RID_SVXBMP_SHADOW_TOP_LEFT
+                RID_SVXBMP_SHADOWNONE,
+                RID_SVXBMP_SHADOW_BOT_RIGHT,
+                RID_SVXBMP_SHADOW_TOP_RIGHT,
+                RID_SVXBMP_SHADOW_BOT_LEFT,
+                RID_SVXBMP_SHADOW_TOP_LEFT
             });
         }
     }
 
     for (auto const & rImageId : aShadowImageIds)
-        m_aShadowImgVec.emplace_back(StockImage::Yes, OUString(rImageId));
+        m_aShadowImgVec.emplace_back(StockImage::Yes, rImageId);
 
     assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT);