summaryrefslogtreecommitdiff
path: root/xmlsecurity/source
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx14
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.src25
-rw-r--r--xmlsecurity/source/dialogs/dialogs.hrc8
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx8
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.src15
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx3
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.src9
7 files changed, 2 insertions, 80 deletions
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 3b1b35d3f9a5..dac5e507d1f0 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -120,24 +120,18 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
,maKeyImg ( this, XMLSEC_RES( IMG_KEY ) )
,maHintCorrespPrivKeyFI ( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
{
- if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
- maKeyImg.SetImage( Image( XMLSEC_RES( IMG_KEY_HC ) ) );
-
//Verify the certificate
sal_Int32 certStatus = mpDlg->mxSecurityEnvironment->verifyCertificate(mpDlg->mxCert,
Sequence<Reference<css::security::XCertificate> >());
bool bCertValid = certStatus == css::security::CertificateValidity::VALID ? true : false;
- bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
if ( !bCertValid )
{
maCertImg.SetImage(
- Image( XMLSEC_RES( bHC ? IMG_STATE_NOT_VALIDATED_HC : IMG_STATE_NOT_VALIDATED ) ) );
+ Image( XMLSEC_RES( IMG_STATE_NOT_VALIDATED ) ) );
maHintNotTrustedFI.SetText( String( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) ) );
}
- else if ( bHC )
- maCertImg.SetImage( Image( XMLSEC_RES( IMG_STATE_CERIFICATED_HC ) ) );
FreeResource();
@@ -419,12 +413,6 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, Cert
,msCertNotValidated ( XMLSEC_RES( STR_PATH_CERT_NOT_VALIDATED ) )
{
- if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
- {
- maCertImage = Image( XMLSEC_RES( IMG_CERT_SMALL_HC ) );
- maCertNotValidatedImage = Image( XMLSEC_RES( IMG_CERT_NOTVALIDATED_SMALL_HC ) );
- }
-
FreeResource();
maCertPathLB.SetNodeDefaultImages();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 3a9466aeb9a8..dce89b221dbe 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -174,21 +174,6 @@ TabPage RID_XMLSECTP_GENERAL
ImageBitmap = Bitmap { File = "notcertificate_40x56.png"; };
MaskColor = STD_MASKCOLOR;
};
- Image IMG_STATE_CERIFICATED_HC
- {
- ImageBitmap = Bitmap { File = "certificate_40x56_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_STATE_NOT_VALIDATED_HC
- {
- ImageBitmap = Bitmap { File = "notcertificate_40x56_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_KEY_HC
- {
- ImageBitmap = Bitmap { File = "key_12_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
};
TabPage RID_XMLSECTP_DETAILS
@@ -321,21 +306,11 @@ TabPage RID_XMLSECTP_CERTPATH
ImageBitmap = Bitmap { File = "certificate_16.png"; };
MaskColor = STD_MASKCOLOR;
};
- Image IMG_CERT_SMALL_HC
- {
- ImageBitmap = Bitmap { File = "certificate_16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
Image IMG_CERT_NOTVALIDATED_SMALL
{
ImageBitmap = Bitmap { File = "notcertificate_16.png"; };
MaskColor = STD_MASKCOLOR;
};
- Image IMG_CERT_NOTVALIDATED_SMALL_HC
- {
- ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
String STR_PATH_CERT_OK
{
Text [ en-US ] = "The certificate is OK.";
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index b30eb9198e32..d315f7ccc020 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -82,9 +82,6 @@
#define FI_STATE_BROKEN 10
#define IMG_STATE_NOTVALIDATED 11
#define FI_STATE_NOTVALIDATED 12
-#define IMG_STATE_VALID_HC 13
-#define IMG_STATE_BROKEN_HC 14
-#define IMG_STATE_NOTVALIDATED_HC 15
#define FI_STATE_OLDSIGNATURE 16
//#define DS_WIDTH DLGS_WIDTH
@@ -175,9 +172,6 @@
#define FI_CORRPRIVKEY 14
#define STR_CERTIFICATE_NOT_VALIDATED 15
#define IMG_STATE_NOT_VALIDATED 16
-#define IMG_STATE_CERIFICATED_HC 17
-#define IMG_STATE_NOT_VALIDATED_HC 18
-#define IMG_KEY_HC 19
#define IMG1_WIDTH 33
#define IMG1_HEIGHT 22
@@ -237,9 +231,7 @@
#define FT_CERTSTATUS 2
#define ML_CERTSTATUS 3
#define IMG_CERT_SMALL 4
-#define IMG_CERT_SMALL_HC 5
#define IMG_CERT_NOTVALIDATED_SMALL 6
-#define IMG_CERT_NOTVALIDATED_SMALL_HC 7
#define STR_PATH_CERT_OK 8
#define STR_PATH_CERT_NOT_VALIDATED 9
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index a3c6d8516ea0..e816f397033b 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -221,14 +221,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
maSigsNotvalidatedFI.SetText( String( XMLSEC_RES( STR_NO_INFO_TO_VERIFY ) ) );
- if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
- {
- // high contrast mode needs other images
- maSigsValidImg.SetImage( Image( XMLSEC_RES( IMG_STATE_VALID_HC ) ) );
- maSigsInvalidImg.SetImage( Image( XMLSEC_RES( IMG_STATE_BROKEN_HC ) ) );
- maSigsNotvalidatedImg.SetImage( Image( XMLSEC_RES( IMG_STATE_NOTVALIDATED_HC ) ) );
- }
-
FreeResource();
mbVerifySignatures = true;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 87d2de520103..0a5da87ff8db 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -178,21 +178,6 @@ ModalDialog RID_XMLSECDLG_DIGSIG
Pos = MAP_APPFONT( 6, 171 );
Size = MAP_APPFONT( 50, 14 );
};
- Image IMG_STATE_VALID_HC
- {
- ImageBitmap = Bitmap { File = "signet_11x16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_STATE_BROKEN_HC
- {
- ImageBitmap = Bitmap { File = "caution_11x16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_STATE_NOTVALIDATED_HC
- {
- ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
};
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index a24d1f209d0c..06e6d33b392a 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -423,8 +423,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
FixedImage(pParent, rResId)
{
- sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
- SetImage( Image(XMLSEC_RES( bHighContrast ? RID_XMLSECTP_LOCK_HC : RID_XMLSECTP_LOCK )));
+ SetImage( Image(XMLSEC_RES( RID_XMLSECTP_LOCK )));
}
ReadOnlyImage::~ReadOnlyImage()
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
index 0683606f500c..58201cb4a099 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/xmlsecurity/source/dialogs/macrosecurity.src
@@ -229,12 +229,3 @@ Image RID_XMLSECTP_LOCK
};
MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
};
-Image RID_XMLSECTP_LOCK_HC
-{
- ImageBitmap = Bitmap
- {
- File = "lock_hc.bmp";
- };
- MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 20:17:03 +0000