summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-26 09:35:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-26 10:02:55 +0100
commit7bd87eb30ca5df683fa3bd94ca5be9dbca362c03 (patch)
tree5f4497b7f274a0f6a2f86a88fc094c18eac934e1 /xmlsecurity
parent51270a2cc26c8714c62f983702dae58dad1e6bd8 (diff)
remove xmlsecurity bitmaps from .src files
Change-Id: I4a1e272f26711e2c3a3860f3b2553467b979405c
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/bitmaps.hlst17
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx3
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.src5
-rw-r--r--xmlsecurity/source/dialogs/dialogs.hrc4
4 files changed, 19 insertions, 10 deletions
diff --git a/xmlsecurity/inc/bitmaps.hlst b/xmlsecurity/inc/bitmaps.hlst
new file mode 100644
index 000000000000..0cfeb433bc1a
--- /dev/null
+++ b/xmlsecurity/inc/bitmaps.hlst
@@ -0,0 +1,17 @@
+/* -*- 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_XMLSECURITY_INC_BITMAPS_HRC
+#define INCLUDED_XMLSECURITY_INC_BITMAPS_HRC
+
+#define BMP_STATE_NOT_VALIDATED "xmlecurity/res/notcertificate_40x56.png"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 81f07defeef6..9aa192f47988 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -31,6 +31,7 @@
#include "dialogs.hrc"
#include "resourcemanager.hxx"
+#include "bitmaps.hlst"
#include <vcl/settings.hxx>
@@ -119,7 +120,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C
if ( !bCertValid )
{
- m_pCertImg->SetImage(Image(BitmapEx(XMLSEC_RES(BMP_STATE_NOT_VALIDATED))));
+ m_pCertImg->SetImage(Image(BitmapEx(BMP_STATE_NOT_VALIDATED)));
m_pHintNotTrustedFT->SetText( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) );
}
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 7259be1ed334..a3820fc59117 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -24,11 +24,6 @@ String STR_CERTIFICATE_NOT_VALIDATED
Text [ en-US ] = "The certificate could not be validated.";
};
-Bitmap BMP_STATE_NOT_VALIDATED
-{
- File = "notcertificate_40x56.png";
-};
-
String STR_HEADERBAR
{
Text [ en-US ] = "Field\tValue";
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index d81d923fc0ac..a0abefacb401 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -39,10 +39,6 @@
// --------- tab page Certificate viewer - General ---------
#define STR_CERTIFICATE_NOT_VALIDATED 269
-#define BMP_STATE_NOT_VALIDATED 270
-
-// --------- tab page Certificate viewer - Certification Path ---------
-
#endif