From 6022a17e79e2cc0a483122bf7f73fcb3e246caf6 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 26 Apr 2017 12:46:39 +0100
Subject: remove sc bitmaps from .src files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I351b67616b240e3c0c91ea31d8f14ecfa6de8b4a
Reviewed-on: https://gerrit.libreoffice.org/36991
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 sc/source/ui/navipi/content.cxx | 16 +++++++++-
 sc/source/ui/navipi/navipi.cxx  | 11 ++++---
 sc/source/ui/navipi/navipi.src  | 70 -----------------------------------------
 3 files changed, 21 insertions(+), 76 deletions(-)

(limited to 'sc/source/ui/navipi')

diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 2cf0cec52da3..8fd837c3c5b5 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -51,6 +51,7 @@
 #include "scres.hrc"
 #include "scresid.hxx"
 #include "globstr.hrc"
+#include "bitmaps.hlst"
 #include "arealink.hxx"
 #include "navicfg.hxx"
 #include "navsett.hxx"
@@ -77,6 +78,18 @@ static const ScContentId pTypeList[(int)ScContentId::LAST + 1] =
     ScContentId::DRAWING
 };
 
+static const OUStringLiteral aContentBmps[]=
+{
+    RID_BMP_CONTENT_TABLE,
+    RID_BMP_CONTENT_RANGENAME,
+    RID_BMP_CONTENT_DBAREA,
+    RID_BMP_CONTENT_GRAPHIC,
+    RID_BMP_CONTENT_OLEOBJECT,
+    RID_BMP_CONTENT_NOTE,
+    RID_BMP_CONTENT_AREALINK,
+    RID_BMP_CONTENT_DRAWING
+};
+
 bool ScContentTree::bIsInDrag = false;
 
 ScDocShell* ScContentTree::GetManualOrCurrent()
@@ -224,7 +237,8 @@ void ScContentTree::InitRoot( ScContentId nType )
         return;
     }
 
-    Image aImage(BitmapEx(ScResId(RID_BMP_CONTENT_ROOT + (int)nType)));
+    BitmapEx aBitmap(aContentBmps[(int)nType - 1]);
+    Image aImage(aBitmap);
     OUString aName(ScResId(SCSTR_CONTENT_ROOT + (int)nType));
     // wieder an die richtige Position:
     sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 87b3cf6c401a..a3f07db46431 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -38,6 +38,7 @@
 #include "rangenam.hxx"
 #include "rangeutl.hxx"
 #include "scres.hrc"
+#include "bitmaps.hlst"
 #include "scresid.hxx"
 #include "scmod.hxx"
 #include "navicfg.hxx"
@@ -409,20 +410,20 @@ void ScNavigatorDlg::UpdateButtons()
         aTbxCmd->CheckItem(nChangeRootId, bRootSet);
     }
 
-    sal_uInt16 nImageId = 0;
+    OUString sImageId;
     switch (nDropMode)
     {
         case SC_DROPMODE_URL:
-            nImageId = RID_BMP_DROP_URL;
+            sImageId = RID_BMP_DROP_URL;
             break;
         case SC_DROPMODE_LINK:
-            nImageId = RID_BMP_DROP_LINK;
+            sImageId = RID_BMP_DROP_LINK;
             break;
         case SC_DROPMODE_COPY:
-            nImageId = RID_BMP_DROP_COPY;
+            sImageId = RID_BMP_DROP_COPY;
             break;
     }
-    aTbxCmd->SetItemImage(nDragModeId, Image(BitmapEx(ScResId(nImageId))));
+    aTbxCmd->SetItemImage(nDragModeId, Image(BitmapEx(sImageId)));
 }
 
 ScNavigatorSettings::ScNavigatorSettings()
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index 4da7b17d911b..1838bb535788 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -19,76 +19,6 @@
 
 #include "scres.hrc"
 
-Bitmap RID_BMP_CONTENT_TABLE
-{
-    File = "nc01.png";
-};
-
-Bitmap RID_BMP_CONTENT_RANGENAME
-{
-    File = "nc02.png";
-};
-
-Bitmap RID_BMP_CONTENT_DBAREA
-{
-    File = "nc03.png";
-};
-
-Bitmap RID_BMP_CONTENT_GRAPHIC
-{
-    File = "nc04.png";
-};
-
-Bitmap RID_BMP_CONTENT_OLEOBJECT
-{
-    File = "nc05.png";
-};
-
-Bitmap RID_BMP_CONTENT_NOTE
-{
-    File = "nc06.png";
-};
-
-Bitmap RID_BMP_CONTENT_AREALINK
-{
-    File = "nc07.png";
-};
-
-Bitmap RID_BMP_CONTENT_DRAWING
-{
-    File = "nc08.png";
-};
-
-Bitmap RID_BMP_DROP_URL
-{
-    File = "dropurl.png";
-};
-
-Bitmap RID_BMP_DROP_LINK
-{
-    File = "droplink.png";
-};
-
-Bitmap RID_BMP_DROP_COPY
-{
-    File = "dropcopy.png";
-};
-
-Bitmap RID_BMP_ELEMENT_DEFAULT
-{
-    File = "xml_element.png";
-};
-
-Bitmap RID_BMP_ELEMENT_REPEAT
-{
-    File = "xml_element_repeat.png";
-};
-
-Bitmap RID_BMP_ELEMENT_ATTRIBUTE
-{
-    File = "xml_attribute.png";
-};
-
 //  content description strings are also used in ScLinkTargetsObj
 
 String SCSTR_CONTENT_ROOT
-- 
cgit