summaryrefslogtreecommitdiffstats
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@suse.com>2012-01-20 21:33:33 -0500
committerKohei Yoshida <kohei.yoshida@suse.com>2012-01-20 21:36:24 -0500
commit54d7fc9eeeeae303112967c6ca9dd7c990babfa8 (patch)
treebd4ad81c579a5437efb9fd34097c027548f10c21 /sc
parentUse a smart pointer here instead (diff)
downloadcore-54d7fc9eeeeae303112967c6ca9dd7c990babfa8.tar.gz
core-54d7fc9eeeeae303112967c6ca9dd7c990babfa8.zip
Grid lines should be immediately above or below the background.
Especially grid lines should never be above cell borders.
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/gridwin4.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a7602570694d..c7b258f7528f 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -695,9 +695,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
pContentDev->SetMapMode(MAP_PIXEL);
aOutputData.DrawDocumentBackground();
+
if ( bGridFirst && ( bGrid || bPage ) )
aOutputData.DrawGrid( bGrid, bPage );
+
aOutputData.DrawBackground();
+
+ if ( !bGridFirst && ( bGrid || bPage ) )
+ aOutputData.DrawGrid( bGrid, bPage );
+
if ( bPageMode )
{
// DrawPagePreview draws complete lines/page numbers, must always be clipped
@@ -707,6 +713,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
pContentDev->SetClipRegion();
}
}
+
aOutputData.DrawShadow();
aOutputData.DrawFrame();
if ( !bLogicText )
@@ -730,10 +737,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
if ( rOpts.GetOption( VOPT_NOTES ) )
aOutputData.DrawNoteMarks();
- if ( !bGridFirst && ( bGrid || bPage ) )
- {
- aOutputData.DrawGrid( bGrid, bPage );
- }
aOutputData.DrawClipMarks();
// Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch bei !bGridFirst