diff options
| -rw-r--r-- | sd/source/ui/app/tbxww.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/PaneDockingWindow.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/LayoutMenu.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/TitleToolBox.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 63021a95e..b1e5d4391 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -311,7 +311,7 @@ void SdTbxControl::StateChanged( USHORT nSId, Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages(), - GetToolBox().GetDisplayBackground().GetColor().IsDark() ); + GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() ); // !-Operator prueft, ob Image nicht vorhanden ist if( !!aImage ) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 6f1ae1df2..d4ebe02ae 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -263,7 +263,7 @@ void PaneDockingWindow::InitializeTitleToolBox (void) Image aImage = Image (aBitmap, Color (COL_LIGHTMAGENTA)); Image aImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST)); mpTitleToolBox->InsertItem (1, - GetSettings().GetStyleSettings().GetMenuBarColor().IsDark() + GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageHC : aImage); mpTitleToolBox->ShowItem (1); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 8a51c44e1..9a2c8cd88 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -138,7 +138,7 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); - SetDrawMode( GetDisplayBackground().GetColor().IsDark() + SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); } @@ -601,7 +601,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) aVD.SetOutputSize( aObjSize ); const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); aVD.SetBackground( Wallpaper( rStyles.GetFieldColor() ) ); - aVD.SetDrawMode( GetDisplayBackground().GetColor().IsDark() + aVD.SetDrawMode( rStyles.GetHighContrastMode() ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); aVD.Erase(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index f3df24122..2ccba3b87 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -863,7 +863,7 @@ void SdNavigatorWin::SetDragImage() void SdNavigatorWin::ApplyImageList() { - const bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); maToolbox.SetImageList( bHighContrast ? maImageListH : maImageList ); diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 9a5dbe4ac..d537eb3ce 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -63,7 +63,7 @@ #include <vcl/image.hxx> #include <svtools/languageoptions.hxx> #include <sfx2/app.hxx> -#include "taskpane/TitledControl.hxx"
+#include "taskpane/TitledControl.hxx" #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <comphelper/processfactory.hxx> @@ -808,7 +808,7 @@ SfxRequest LayoutMenu::CreateRequest ( void LayoutMenu::Fill (void) { - const bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); SvtLanguageOptions aLanguageOptions; sal_Bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); SdDrawDocument* pDocument = mrBase.GetDocument(); diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx index 2c2c40f56..75704cb96 100644 --- a/sd/source/ui/toolpanel/TitleToolBox.cxx +++ b/sd/source/ui/toolpanel/TitleToolBox.cxx @@ -77,7 +77,7 @@ void TitleToolBox::AddItem (ToolBoxId aId) case TBID_DOCUMENT_CLOSE: InsertItem (TBID_DOCUMENT_CLOSE, - GetSettings().GetStyleSettings().GetMenuBarColor().IsDark() + GetSettings().GetStyleSettings().GetHighContrastMode() ? maImageHC : maImage, 0 ); break; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 8a8880d39..a74449fbe 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1014,7 +1014,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } case WID_PAGE_LDBITMAP: { - BOOL bHC = Application::GetSettings().GetStyleSettings().GetWindowColor().IsDark(); + BOOL bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) ); aAny <<= xBitmap; |