diff options
18 files changed, 9 insertions, 143 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 8554dc52500f..8144380594ab 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -370,9 +370,8 @@ namespace dbp { ::svt::OLocalResourceAccess aLocalResAccess( ModuleRes( RID_PAGE_TABLESELECTION ), RSC_TABPAGE ); - bool bIsHiContrast = m_aTable.GetSettings().GetStyleSettings().GetHighContrastMode(); - aTableImage = Image( ModuleRes( bIsHiContrast ? IMG_TABLE_HC : IMG_TABLE ) ); - aQueryImage = Image( ModuleRes( bIsHiContrast ? IMG_QUERY_HC : IMG_QUERY ) ); + aTableImage = Image( ModuleRes( IMG_TABLE ) ); + aQueryImage = Image( ModuleRes( IMG_QUERY ) ); } lcl_fillEntries( m_aTable, aTableNames, aTableImage, CommandType::TABLE ); lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY ); diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src index 41d199a70209..4e6969b57619 100644 --- a/extensions/source/dbpilots/commonpagesdbp.src +++ b/extensions/source/dbpilots/commonpagesdbp.src @@ -96,24 +96,11 @@ TabPage RID_PAGE_TABLESELECTION MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - Image IMG_TABLE_HC - { - ImageBitmap = Bitmap { File = "sxh03188.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; - }; - Image IMG_QUERY { ImageBitmap = Bitmap { File = "sx03202.bmp"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - - Image IMG_QUERY_HC - { - ImageBitmap = Bitmap { File = "sxh03202.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; - }; - }; TabPage RID_PAGE_OPTION_DBFIELD diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index ecb424c5e3b7..4b5c1ec92d6d 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -210,9 +210,7 @@ // Image #define IMG_TABLE 1 -#define IMG_TABLE_HC 2 #define IMG_QUERY 3 -#define IMG_QUERY_HC 4 //======================================================================== // defines diff --git a/extensions/source/propctrlr/formlocalid.hrc b/extensions/source/propctrlr/formlocalid.hrc index dca59a024321..708a1dbc2211 100644 --- a/extensions/source/propctrlr/formlocalid.hrc +++ b/extensions/source/propctrlr/formlocalid.hrc @@ -33,7 +33,5 @@ #define IMG_PLUS 1 #define IMG_MINUS 2 -#define IMG_PLUS_HC 3 -#define IMG_MINUS_HC 4 #endif // _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index 0aeab5306da9..2ab294754a9d 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -308,7 +308,6 @@ // - ImageLists #define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 ) -#define RID_IL_FORMEXPLORER_HC ( RID_PROPCONTROLLER_START + 1 ) // ----------------------------------------------------------------------- // - untyped resources diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src index d547b52ed5ea..98f30c30a12d 100644 --- a/extensions/source/propctrlr/pcrmiscres.src +++ b/extensions/source/propctrlr/pcrmiscres.src @@ -48,14 +48,6 @@ Resource RID_RSC_BUTTON_IMAGES { ImageBitmap = Bitmap{ file = "buttonminus.png"; }; }; - Image IMG_PLUS_HC - { - ImageBitmap = Bitmap{ file = "buttonplus_hc.png"; }; - }; - Image IMG_MINUS_HC - { - ImageBitmap = Bitmap{ file = "buttonminus_hc.png"; }; - }; }; #define IMAGE_IDS \ @@ -100,13 +92,6 @@ ImageList RID_IL_FORMEXPLORER IMAGE_IDS; }; -ImageList RID_IL_FORMEXPLORER_HC -{ - Prefix = "sxh"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; - IMAGE_IDS; -}; - String RID_STR_PROPTITLE_PUSHBUTTON { Text [ en-US ] = "Button" ; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index c21539e43d13..2aa6896e5c31 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -106,9 +106,7 @@ namespace pcr aPB_OK.SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) ); aPB_OK.Disable(); - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - pImageList = new ImageList( PcrRes( bIsHighContrast ? RID_IL_FORMEXPLORER_HC : RID_IL_FORMEXPLORER ) ); - + pImageList = new ImageList( PcrRes( RID_IL_FORMEXPLORER ) ); if ( m_xModel.is() ) m_xTempModel = new OSimpleTabModel( m_xModel->getControlModels() ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 550705ee4a67..e43a1e6d13d4 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -311,17 +311,10 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) if ( pMBarWin ) nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight(); - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { - if ( nMBarHeight >= 35 ) - nResID = RID_UPDATE_AVAILABLE_26_HC; - else - nResID = RID_UPDATE_AVAILABLE_16_HC; - } else { - if ( nMBarHeight >= 35 ) - nResID = RID_UPDATE_AVAILABLE_26; - else - nResID = RID_UPDATE_AVAILABLE_16; - } + if ( nMBarHeight >= 35 ) + nResID = RID_UPDATE_AVAILABLE_26; + else + nResID = RID_UPDATE_AVAILABLE_16; return Image( ResId( nResID, *mpUpdResMgr ) ); } diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc index 3d92e4579f58..636cff231ada 100644 --- a/extensions/source/update/ui/updatecheckui.hrc +++ b/extensions/source/update/ui/updatecheckui.hrc @@ -31,6 +31,4 @@ #define RID_UPDATE_AVAILABLE_16 RID_UPDATECHECKUI_START + 1 #define RID_UPDATE_AVAILABLE_26 RID_UPDATECHECKUI_START + 2 - #define RID_UPDATE_AVAILABLE_16_HC RID_UPDATECHECKUI_START + 3 - #define RID_UPDATE_AVAILABLE_26_HC RID_UPDATECHECKUI_START + 4 diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src index 39b6f44dce4d..084b2f82149d 100644 --- a/extensions/source/update/ui/updatecheckui.src +++ b/extensions/source/update/ui/updatecheckui.src @@ -39,13 +39,3 @@ ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; }; STD_MASK_COLOR }; - Image RID_UPDATE_AVAILABLE_16_HC - { - ImageBitmap = Bitmap{ file = "onlineupdate_16_h.png"; }; - STD_MASK_COLOR - }; - Image RID_UPDATE_AVAILABLE_26_HC - { - ImageBitmap = Bitmap{ file = "onlineupdate_26_h.png"; }; - STD_MASK_COLOR - }; diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc index 57a9a95e88b3..5ec98db80b1e 100644 --- a/xmlsecurity/inc/xmlsecurity/global.hrc +++ b/xmlsecurity/inc/xmlsecurity/global.hrc @@ -42,7 +42,6 @@ #define RID_XMLSECTP_MACROWARN 1009 #define RID_XMLSECTP_READONLY_CONFIG_TIP 1010 #define RID_XMLSECTP_LOCK 1011 -#define RID_XMLSECTP_LOCK_HC 1012 #define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013 #endif 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; }; -}; - |