diff options
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/ToolBoxHelper.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index a889b2d15..f7046122b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -3608,7 +3608,7 @@ sal_Bool SbaTableQueryBrowser::isHiContrast() const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaTableQueryBrowser::isHiContrast" ); sal_Bool bRet = sal_False; if ( m_pTreeView ) - bRet = m_pTreeView->getListBox().GetBackground().GetColor().IsDark(); + bRet = m_pTreeView->getListBox().GetSettings().GetStyleSettings().GetHighContrastMode(); return bRet; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 52886cf3c..6ba84b597 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -568,7 +568,7 @@ namespace void lcl_insertMenuItemImages( Menu& _rMenu, IController& _rCommandController ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - const BOOL bHiContrast = rSettings.GetMenuColor().IsDark(); + const BOOL bHiContrast = rSettings.GetHighContrastMode(); uno::Reference< frame::XController > xController = _rCommandController.getXController(); uno::Reference< frame::XFrame> xFrame; if ( xController.is() ) diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 08d0ab144..143f375a5 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -342,7 +342,7 @@ DBG_NAME(DbaIndexDialog) //------------------------------------------------------------------ void DbaIndexDialog::fillIndexList() { - sal_Bool bHiContrast = GetBackground().GetColor().IsDark(); + sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); Image aPKeyIcon(ModuleRes( bHiContrast ? IMG_PKEYICON_SCH : IMG_PKEYICON)); // fill the list with the index names m_aIndexes.Clear(); diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 4d3497653..be7a105ae 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -79,10 +79,10 @@ namespace dbaui { sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); if ( nCurSymbolsSize != m_nSymbolsSize || - m_bIsHiContrast != m_pToolBox->GetBackground().GetColor().IsDark() ) + m_bIsHiContrast != m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode() ) { m_nSymbolsSize = nCurSymbolsSize; - m_bIsHiContrast = m_pToolBox->GetBackground().GetColor().IsDark(); + m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); m_pToolBox->SetImageList( getImageList(m_nSymbolsSize,m_bIsHiContrast) ); @@ -131,7 +131,7 @@ namespace dbaui m_pToolBox = _pTB; if ( m_pToolBox ) { - // m_bIsHiContrast = m_pToolBox->GetBackground().GetColor().IsDark(); + // m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); ConfigOptionsChanged(NULL); if ( bFirstTime ) adjustToolBoxSize(m_pToolBox); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index a2a6d4150..ee136d8d5 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1326,7 +1326,7 @@ sal_Bool isHiContrast(Window* _pWindow) else break; } - return pIter && pIter->GetBackground().GetColor().IsDark(); + return pIter && pIter->GetSettings().GetStyleSettings().GetHighContrastMode(); } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index fb8eb5eb0..4d9fc0269 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -505,7 +505,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) case COMMAND_CONTEXTMENU: { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - BOOL bHiContrast = rSettings.GetMenuColor().IsDark(); + BOOL bHiContrast = rSettings.GetHighContrastMode(); OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); uno::Reference<frame::XFrame> xFrame = rController.getFrame(); PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) ); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index de583cf0c..d38041d53 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -194,7 +194,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) void OStartMarker::changeImage() { Image* pImage = NULL; - if ( GetDisplayBackground().GetColor().IsDark() ) + if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC; else pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; @@ -212,7 +212,7 @@ void OStartMarker::initDefaultNodeImages() } Image* pImage = NULL; - if ( GetDisplayBackground().GetColor().IsDark() ) + if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) { pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC; } |