diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-08-18 14:33:48 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-08-18 14:34:15 +0200 |
| commit | d40dce0f0f00b88dd645a0f334e3d7b2d6af6515 (patch) | |
| tree | 9803baff43eae4683216fa81347e5e1e8fc1414a /sw | |
| parent | 81ad146539b27391689aceb5770e8eaa382ba58b (diff) | |
Header/Footer: moved the decorator color to the options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/viewopt.hxx | 2 | ||||
| -rwxr-xr-x | sw/source/core/layout/paintfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/config/viewopt.cxx | 9 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 0dc92411d3a1..38590c796c4c 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -136,6 +136,7 @@ class SwViewOption static Color aPageBreakColor; static Color aScriptIndicatorColor; static Color aShadowColor; + static Color aHeaderFooterMarkColor; static sal_Int32 nAppearanceFlags; protected: @@ -569,6 +570,7 @@ public: static Color& GetFieldShadingsColor(); static Color& GetSectionBoundColor(); static Color& GetPageBreakColor(); + static Color& GetHeaderFooterMarkColor(); static sal_Bool IsAppearanceFlag(sal_Int32 nFlag); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 1d27d0eeb2d2..15cd791b5e35 100755 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3316,7 +3316,7 @@ drawinglayer::primitive2d::Primitive2DSequence lcl_CreateHeaderFooterSeparatorPr aText += rStyleName; // Colors - basegfx::BColor aLineColor( 3.0 / 255.0, 105.0 / 255.0, 163.0 / 255.0 ); + basegfx::BColor aLineColor = SwViewOption::GetHeaderFooterMarkColor().getBColor(); basegfx::BColor aHslLine = basegfx::tools::rgb2hsl( aLineColor ); aHslLine.setZ( aHslLine.getZ( ) * 2.5 ); basegfx::BColor aFillColor = basegfx::tools::hsl2rgb( aHslLine ); diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 581ed2a6bbe9..24065184ffa4 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -73,6 +73,7 @@ Color SwViewOption::aSectionBoundColor(COL_LIGHTGRAY); Color SwViewOption::aPageBreakColor(COL_BLUE); Color SwViewOption::aScriptIndicatorColor(COL_GREEN); Color SwViewOption::aShadowColor(COL_GRAY); +Color SwViewOption::aHeaderFooterMarkColor(COL_BLUE); sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES; sal_uInt16 SwViewOption::nPixelTwips = 0; // one pixel on the screen @@ -444,6 +445,11 @@ Color& SwViewOption::GetPageBreakColor() return aPageBreakColor; } +Color& SwViewOption::GetHeaderFooterMarkColor() +{ + return aHeaderFooterMarkColor; +} + void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig ) { aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor); @@ -509,6 +515,9 @@ void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig ) aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS); aPageBreakColor.SetColor(aValue.nColor); + aValue = rConfig.GetColorValue(svtools::WRITERHEADERFOOTERMARK); + aHeaderFooterMarkColor.SetColor(aValue.nColor); + aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor); } |