remove desktop bitmaps from .src files

Change-Id: I32aefdf3407434564ed7efe2f6785a17c69199f2
Reviewed-on: https://gerrit.libreoffice.org/36956
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 28 insertions, 60 deletions

diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk
index b7b9d14c12a5..d5296e845a60 100644
--- a/desktop/AllLangResTarget_deploymentgui.mk
+++ b/desktop/AllLangResTarget_deploymentgui.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\
 ))
 
 $(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\
-    desktop/source/deployment/gui/dp_gui_dialog2.src \
     desktop/source/deployment/gui/dp_gui_dialog.src \
     desktop/source/deployment/gui/dp_gui_updatedialog.src \
     desktop/source/deployment/gui/dp_gui_updateinstalldialog.src \
diff --git a/desktop/inc/bitmaps.hlst b/desktop/inc/bitmaps.hlst
new file mode 100644
index 000000000000..d9dbc0cb47be
--- /dev/null
+++ b/desktop/inc/bitmaps.hlst
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_DESKTOP_INC_BITMAPS_HRC
+#define INCLUDED_DESKTOP_INC_BITMAPS_HRC
+
+#define RID_BMP_WARNING             "desktop/res/caution_16.png"
+#define RID_BMP_LOCKED              "desktop/res/lock_16.png"
+#define RID_BMP_SHARED              "desktop/res/shared_16.png"
+#define RID_BMP_EXTENSION           "desktop/res/extension_32.png"
+#define RID_DLG_UPDATE_NORMALALERT  "desktop/res/caution_12.png"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/desktop/inc/dp_gui.hrc b/desktop/inc/dp_gui.hrc
index 6e8662d08cd7..9bb961474743 100644
--- a/desktop/inc/dp_gui.hrc
+++ b/desktop/inc/dp_gui.hrc
@@ -31,7 +31,6 @@
 #define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 8)
 #define RID_STR_WARNING_INSTALL_EXTENSION                         (RID_DEPLOYMENT_GUI_START + 9)
 
-#define RID_DLG_UPDATE_NORMALALERT          (RID_DEPLOYMENT_GUI_START + 11)
 #define RID_DLG_UPDATE_NONE                 (RID_DEPLOYMENT_GUI_START + 13)
 #define RID_DLG_UPDATE_NOINSTALLABLE        (RID_DEPLOYMENT_GUI_START + 14)
 #define RID_DLG_UPDATE_FAILURE              (RID_DEPLOYMENT_GUI_START + 15)
@@ -56,11 +55,6 @@
 #define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43)
 #define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44)
 
-#define RID_BMP_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
-#define RID_BMP_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)
-#define RID_BMP_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
-#define RID_BMP_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
-
 #define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
 
 #define RID_CTX_ITEM_REMOVE                    (RID_DEPLOYMENT_GUI_START+80)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
deleted file mode 100644
index ce8ca18ddf54..000000000000
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svtools/controldims.hrc>
-#include "dp_gui.hrc"
-
-Bitmap RID_BMP_WARNING
-{
-    File = "caution_16.png";
-};
-
-Bitmap RID_BMP_LOCKED
-{
-    File = "lock_16.png";
-};
-
-Bitmap RID_BMP_SHARED
-{
-    File = "shared_16.png";
-};
-
-Bitmap RID_BMP_EXTENSION
-{
-    File = "extension_32.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e661ecc2fc89..4cd3d38587f6 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -24,6 +24,7 @@
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_dialog2.hxx"
 #include "dp_dependencies.hxx"
+#include "bitmaps.hlst"
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
@@ -181,10 +182,10 @@ ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) :
     m_nTopIndex( 0 ),
     m_nActiveHeight( 0 ),
     m_nExtraHeight( 2 ),
-    m_aSharedImage(BitmapEx(DialogHelper::getResId(RID_BMP_SHARED))),
-    m_aLockedImage(BitmapEx(DialogHelper::getResId(RID_BMP_LOCKED))),
-    m_aWarningImage(BitmapEx(DialogHelper::getResId(RID_BMP_WARNING))),
-    m_aDefaultImage(BitmapEx(DialogHelper::getResId(RID_BMP_EXTENSION))),
+    m_aSharedImage(BitmapEx(RID_BMP_SHARED)),
+    m_aLockedImage(BitmapEx(RID_BMP_LOCKED)),
+    m_aWarningImage(BitmapEx(RID_BMP_WARNING)),
+    m_aDefaultImage(BitmapEx(RID_BMP_EXTENSION)),
     m_pScrollBar( nullptr ),
     m_pManager( nullptr )
 {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 6e2c62621d41..9769a8b3b452 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -108,6 +108,7 @@
 
 #include "dp_gui.h"
 #include "dp_gui.hrc"
+#include "bitmaps.hlst"
 #include "dp_gui_updatedata.hxx"
 #include "dp_gui_updatedialog.hxx"
 #include "dp_gui_shared.hxx"
@@ -603,7 +604,7 @@ UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & d
     m_enableUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_ENABLE ) ),
     m_dialog(dialog)
 {
-    SetNormalStaticImage(Image(BitmapEx(DpGuiResId(RID_DLG_UPDATE_NORMALALERT))));
+    SetNormalStaticImage(Image(BitmapEx(RID_DLG_UPDATE_NORMALALERT)));
 }
 
 sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 57389e286bb7..7100eb4cfff2 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -21,11 +21,6 @@
 
 #include "dp_gui.hrc"
 
-Bitmap RID_DLG_UPDATE_NORMALALERT
-{
-    File = "caution_12.png";
-};
-
 String RID_DLG_UPDATE_NONE {
     Text[en-US] = "No new updates are available.";
 };