#i104678# use high contrast mode setting instead of IsDark (paradigm shift begun with issue i35482)

basctl/source/basicide/baside2b.cxx

@@ -944,6 +944,7 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) :
     pModulWindow = 0;
     nCurYOffset = 0;
     setBackgroundColor(GetSettings().GetStyleSettings().GetFieldColor());
+    m_bHighContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
     nMarkerPos = MARKER_NOMARKER;
 
     // nCurYOffset merken und nicht von EditEngine holen.
@@ -1161,6 +1162,7 @@ void BreakPointWindow::DataChanged(DataChangedEvent const & rDCEvt)
             != rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
         {
             setBackgroundColor(aColor);
+            m_bHighContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
             Invalidate();
         }
     }
@@ -1169,7 +1171,6 @@ void BreakPointWindow::DataChanged(DataChangedEvent const & rDCEvt)
 void BreakPointWindow::setBackgroundColor(Color aColor)
 {
     SetBackground(Wallpaper(aColor));
-    m_bHighContrastMode = aColor.IsDark();
 }
 
 

basctl/source/basicide/objdlg.cxx

@@ -300,7 +300,7 @@ void ObjectCatalogToolBox_Impl::DataChanged(DataChangedEvent const & rDCEvt)
 
 void ObjectCatalogToolBox_Impl::setImages()
 {
-    bool bHC = GetDisplayBackground().GetColor().IsDark();
+    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     if (bHC != m_bHighContrast)
     {
         SetImageList(bHC ? m_aImagesHighContrast : m_aImagesNormal);

basctl/source/basicide/tbxctl.cxx

@@ -186,7 +186,7 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState,
                 Image aImage = GetImage( m_xFrame,
                                          aSlotURL,
                                          hasBigImages(),
-                                         GetToolBox().GetDisplayBackground().GetColor().IsDark() );
+                                         GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
                 ToolBox& rBox = GetToolBox();
                 rBox.SetItemImage(GetId(), aImage);
                 nLastSlot = nLastEnum;

extensions/source/bibliography/toolbar.cxx

@@ -620,8 +620,8 @@ void BibToolBar::RebuildToolbar()
 void BibToolBar::ApplyImageList()
 {
     ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ?
-                       ( GetDisplayBackground().GetColor().IsDark() ? aImgLstHC : aImgLst ) :
-                       ( GetDisplayBackground().GetColor().IsDark() ? aBigImgLstHC : aBigImgLst );
+                       ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) :
+                       ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst );
 
     SetItemImage(TBC_BT_AUTOFILTER  , rList.GetImage(SID_FM_AUTOFILTER));
     SetItemImage(TBC_BT_FILTERCRIT  , rList.GetImage(SID_FM_FILTERCRIT));

extensions/source/dbpilots/commonpagesdbp.cxx

@@ -376,7 +376,7 @@ namespace dbp
         {
             ::svt::OLocalResourceAccess aLocalResAccess( ModuleRes( RID_PAGE_TABLESELECTION ), RSC_TABPAGE );
 
-            bool bIsHiContrast = m_aTable.GetBackground().GetColor().IsDark();
+            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 ) );
         }

extensions/source/propctrlr/taborder.cxx

@@ -114,7 +114,7 @@ namespace pcr
         aPB_OK.SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) );
         aPB_OK.Disable();
 
-        sal_Bool bIsHighContrast = GetDisplayBackground().GetColor().IsDark();
+        sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
         pImageList = new ImageList( PcrRes( bIsHighContrast ? RID_IL_FORMEXPLORER_HC : RID_IL_FORMEXPLORER ) );
 
 

forms/source/solar/control/navtoolbar.cxx

@@ -72,10 +72,6 @@ namespace frm
             sLabel += String::CreateFromAscii( " " );
             return sLabel;
         }
-        static bool lcl_isHighContrast( const Color& _rColor )
-        {
-            return _rColor.IsDark();
-        }
     }
 
     //=====================================================================
@@ -346,7 +342,7 @@ namespace frm
         {
             m_eImageSize = _eSize;
             ::std::auto_ptr< SfxImageManager > pImageManager( new SfxImageManager( NULL ) );
-            pImageManager->SetImagesForceSize( *m_pToolbar, lcl_isHighContrast( GetBackground().GetColor() ), m_eImageSize == eLarge );
+            pImageManager->SetImagesForceSize( *m_pToolbar, GetSettings().GetStyleSettings().GetHighContrastMode(), m_eImageSize == eLarge );
 
             // parts of our layout is dependent on the size of our icons
             Resize();

xmlsecurity/source/dialogs/certificateviewer.cxx

@@ -122,7 +122,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
     ,maKeyImg               ( this, XMLSEC_RES( IMG_KEY ) )
     ,maHintCorrespPrivKeyFI ( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
 {
-    if ( GetSettings().GetStyleSettings().GetWindowColor().IsDark() )
+    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
         maKeyImg.SetImage( Image( XMLSEC_RES( IMG_KEY_HC ) ) );
 
     //Verify the certificate
@@ -139,14 +139,14 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
     sal_Int32 certErrors = certStatus & mask;
     bool bCertValid = certErrors > 0 ? false : true;
 
-    bool bIsDark = ( GetSettings().GetStyleSettings().GetWindowColor().IsDark() != FALSE );
+    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     if ( !bCertValid )
     {
         maCertImg.SetImage(
-            Image( XMLSEC_RES( bIsDark ? IMG_STATE_NOT_VALIDATED_HC : IMG_STATE_NOT_VALIDATED ) ) );
+            Image( XMLSEC_RES( bHC ? IMG_STATE_NOT_VALIDATED_HC : IMG_STATE_NOT_VALIDATED ) ) );
         maHintNotTrustedFI.SetText( String( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) ) );
     }
-    else if ( bIsDark )
+    else if ( bHC )
         maCertImg.SetImage( Image( XMLSEC_RES( IMG_STATE_CERIFICATED_HC ) ) );
 
     FreeResource();
@@ -430,7 +430,7 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, Cert
     ,msCertNotValidated     ( XMLSEC_RES( STR_PATH_CERT_NOT_VALIDATED ) )
 
 {
-    if ( GetSettings().GetStyleSettings().GetWindowColor().IsDark() )
+    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
     {
         maCertImage = Image( XMLSEC_RES( IMG_CERT_SMALL_HC ) );
         maCertNotValidatedImage = Image( XMLSEC_RES( IMG_CERT_NOTVALIDATED_SMALL_HC ) );

xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx

@@ -216,7 +216,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
 
     maSigsNotvalidatedFI.SetText( String( XMLSEC_RES( STR_NO_INFO_TO_VERIFY ) ) );
 
-    if ( GetBackground().GetColor().IsDark() )
+    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
     {
         // high contrast mode needs other images
         maSigsValidImg.SetImage( Image( XMLSEC_RES( IMG_STATE_VALID_HC ) ) );

xmlsecurity/source/dialogs/macrosecurity.cxx

@@ -429,7 +429,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
 ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
             FixedImage(pParent, rResId)
 {
-    sal_Bool bHighContrast = pParent->GetDisplayBackground().GetColor().IsDark();
+    sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
     SetImage( Image(XMLSEC_RES( bHighContrast ? RID_XMLSECTP_LOCK_HC : RID_XMLSECTP_LOCK )));
 }