#98820# use colors from configuration

5 files changed, 24 insertions, 21 deletions

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 286dd7c51e41..a8d0639dcd02 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: formatsh.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: dr $ $Date: 2002-04-05 10:53:22 $
+ *  last change: $Author: nn $ $Date: 2002-05-03 11:58:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,6 +108,7 @@
 #include <svx/colritem.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/scripttypeitem.hxx>
+#include <svx/colorcfg.hxx>
 
 #include "formatsh.hxx"
 #include "sc.hrc"
@@ -1503,7 +1504,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
             {
                 Color aColor;
                 if ( nTrans == 255 )
-                    aColor = Application::GetSettings().GetStyleSettings().GetWindowColor();
+                    aColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor );
                 else
                     aColor = rBrushItem.GetColor();
                 rSet.Put( SvxColorItem( aColor, SID_BACKGROUND_COLOR ) );
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 5f37bf259fac..4029243b2b68 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridwin4.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: nn $ $Date: 2002-04-29 18:43:37 $
+ *  last change: $Author: nn $ $Date: 2002-05-03 11:58:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -742,9 +742,10 @@ void ScGridWindow::Draw( USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2, ScUpdat
             }
         }
 
+        Color aRefColor( rColorCfg.GetColorValue(svx::CALCREFERENCE).nColor );
         aOutputData.DrawRefMark( pViewData->GetRefStartX(), pViewData->GetRefStartY(),
                                  pViewData->GetRefEndX(), pViewData->GetRefEndY(),
-                                 Color(COL_LIGHTRED), FALSE );
+                                 aRefColor, FALSE );
     }
 
         //  Range-Finder
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 95b2007cd290..e7ccb4b66767 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: output.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: nn $ $Date: 2002-04-29 18:43:37 $
+ *  last change: $Author: nn $ $Date: 2002-05-03 11:58:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -790,8 +790,8 @@ void ScOutputData::DrawBackground()
 {
     FindRotated();              //! von aussen ?
 
-    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    Color aBgColor = rStyleSettings.GetWindowColor();
+    // used only if bSolidBackground is set (only for ScGridWindow):
+    Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor );
 
     Rectangle aRect;
     Size aOnePixel = pDev->PixelToLogic(Size(1,1));
@@ -1115,9 +1115,8 @@ void ScOutputData::DrawClear()
     long nOneX = aOnePixel.Width();
     long nOneY = aOnePixel.Height();
 
-    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    Color aBgColor = rStyleSettings.GetWindowColor();
-
+    // (called only for ScGridWindow)
+    Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor );
 
     if (bMetaFile)
         nOneX = nOneY = 0;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index c89943dffdd7..81e43363b5c8 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: printfun.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: nn $ $Date: 2002-04-24 14:45:47 $
+ *  last change: $Author: nn $ $Date: 2002-05-03 11:58:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,7 @@
 #include <svx/adjitem.hxx>
 #include <svx/boxitem.hxx>
 #include <svx/brshitem.hxx>
+#include <svx/colorcfg.hxx>
 #include <svx/editstat.hxx>     // EE_CNTRL_RTFSTYLESHEETS
 #include <svx/fmview.hxx>
 #include <svx/lrspitem.hxx>
@@ -128,6 +129,7 @@
 #include "pagedata.hxx"
 #include "printopt.hxx"
 #include "prevloc.hxx"
+#include "scmod.hxx"
 
 #define _PRINTFUN_CXX
 #include "printfun.hxx"
@@ -1911,7 +1913,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
 
         Color aBackgroundColor( COL_WHITE );
         if ( bUseStyleColor )
-            aBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor();
+            aBackgroundColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor );
 
         pDev->SetMapMode(aOffsetMode);
         pDev->SetLineColor();
@@ -1974,7 +1976,7 @@ void ScPrintFunc::PrintPage( long nPageNo, USHORT nX1, USHORT nY1, USHORT nX2, U
 
         Color aBackgroundColor( COL_WHITE );
         if ( bUseStyleColor )
-            aBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor();
+            aBackgroundColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor );
 
         pDev->SetMapMode(aOffsetMode);
         pDev->SetLineColor();
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index b71ccf6f1336..91a295ccf34c 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewdata.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: nn $ $Date: 2002-04-05 19:17:19 $
+ *  last change: $Author: nn $ $Date: 2002-05-03 11:58:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,6 +74,7 @@
 #include <svx/adjitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/brshitem.hxx>
+#include <svx/colorcfg.hxx>
 #include <svx/editview.hxx>
 #include <svx/editstat.hxx>
 #include <svx/outliner.hxx>
@@ -954,8 +955,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
     Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor();
     if ( aBackCol.GetTransparency() > 0 || IsSyntaxMode())
     {
-        const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-        aBackCol = rStyleSettings.GetWindowColor();
+        aBackCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svx::DOCCOLOR).nColor );
     }
     pEditView[eWhich]->SetBackgroundColor( aBackCol );