summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-25 16:18:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-25 21:53:12 +0200
commit0c26dc5d5a3711ceb2a4fdb07c5882a575083330 (patch)
treeb839391992df4ebcc68401a284bab4e4191e3828 /desktop/inc
parentfea8976c0152632919587dd4e3225d6283e6691f (diff)
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>
Diffstat (limited to 'desktop/inc')
-rw-r--r--desktop/inc/bitmaps.hlst21
-rw-r--r--desktop/inc/dp_gui.hrc6
2 files changed, 21 insertions, 6 deletions
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)