diff options
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 3 | ||||
| -rw-r--r-- | xmlsecurity/inc/bitmaps.hlst | 17 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 3 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.src | 5 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/dialogs.hrc | 4 |
5 files changed, 21 insertions, 11 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index dad9b1e1f0d0..6a51612653c6 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -62,7 +62,8 @@ $(packimages_DIR)/sourceimagelist.ilst : \ $(SRCDIR)/framework/inc/bitmaps.hlst \ $(SRCDIR)/reportdesign/inc/bitmaps.hlst \ $(SRCDIR)/sfx2/inc/bitmaps.hlst \ - $(SRCDIR)/vcl/inc/bitmaps.hlst + $(SRCDIR)/vcl/inc/bitmaps.hlst \ + $(SRCDIR)/xmlsecurity/inc/bitmaps.hlst grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ # commandimagelist.ilst and sorted.lst are phony to rebuild everything each time 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 |