summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2015-01-13 18:50:04 -0500
committerKohei Yoshida <kohei.yoshida@collabora.com>2015-01-14 22:17:31 -0500
commit169b93971bb16058ad83603cc6849a35e22929d7 (patch)
treea939beef2577dd5f5a188ce3b32896014140f18c /sc
parent6a5f3ff796db42a616845323731bf796907797b8 (diff)
Set correct grid color.
Change-Id: Ie8ccf61f0b04b718c930b14374843e3858c6278b
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/gridwin4.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 54d9d0e7fbf7..fc9879b415c8 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -897,6 +897,17 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
ScOutputData aOutData(
&rDevice, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, 0, 0, nCol1, nRow1, nCol2, nRow2, fPPTX, fPPTY);
+
+ const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig();
+ Color aGridColor = rColorCfg.GetColorValue(svtools::CALCGRID, false).nColor;
+ if (aGridColor.GetColor() == COL_TRANSPARENT)
+ {
+ // use view options' grid color only if color config has "automatic" color
+ const ScViewOptions& rOpts = pViewData->GetOptions();
+ aGridColor = rOpts.GetGridColor();
+ }
+ aOutData.SetGridColor(aGridColor);
+
aOutData.DrawGrid(true, false);
aOutData.DrawShadow();