#105984# New font color option

2 files changed, 13 insertions, 8 deletions

diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 14a385fcb62e..f9856a2d4ae2 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envlop1.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: gt $ $Date: 2002-07-23 08:19:39 $
+ *  last change: $Author: fme $ $Date: 2002-12-10 09:43:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,9 @@
 #ifndef _SWWAIT_HXX
 #include <swwait.hxx>
 #endif
+#ifndef _VIEWOPT_HXX
+#include <viewopt.hxx>
+#endif
 
 #include "wrtsh.hxx"
 #include "errhdl.hxx"
@@ -151,7 +154,7 @@ void SwEnvPreview::Paint(const Rectangle &)
           f  = 0.8 * ( fx < fy ? fx : fy );
 
     Color aBack = rSettings.GetWindowColor( );
-    Color aFront = rSettings.GetWindowTextColor();
+    Color aFront = SwViewOption::GetFontColor();
     Color aMedium = Color(  ( aBack.GetRed() + aFront.GetRed() ) / 2,
                             ( aBack.GetGreen() + aFront.GetGreen() ) / 2,
                             ( aBack.GetBlue() + aFront.GetBlue() ) / 2
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 718f7d894de3..9d6ed90ef719 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: labfmt.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2002-05-31 11:55:42 $
+ *  last change: $Author: fme $ $Date: 2002-12-10 09:43:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,9 @@
 #ifndef _SV_POLY_HXX //autogen
 #include <vcl/poly.hxx>
 #endif
-
+#ifndef _VIEWOPT_HXX
+#include <viewopt.hxx>
+#endif
 
 #include "swtypes.hxx"
 #include "cmdid.h"
@@ -153,7 +155,7 @@ void SwLabPreview::Paint(const Rectangle &rRect)
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     const Color& rWinColor = rStyleSettings.GetWindowColor();
-    const Color& rFieldTextColor = rStyleSettings.GetFieldTextColor();
+    const Color& rFieldTextColor = SwViewOption::GetFontColor();
 
     Font aFont = GetFont();
     aFont.SetFillColor( rWinColor );
@@ -315,7 +317,7 @@ void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, BOOL bArrow)
             aArr[2].Y() = rP2.Y();
         }
 
-        const Color& rFieldTextColor = GetSettings().GetStyleSettings().GetFieldTextColor();
+        const Color& rFieldTextColor = SwViewOption::GetFontColor();
         SetFillColor(rFieldTextColor);
         DrawPolygon(Polygon(3, aArr));
     }