[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

 sc/source/ui/view/gridwin4.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 43507c9eb49fdc1de2e193eee32326fb226ff170
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Fri Jan 20 21:33:33 2012 -0500

    Grid lines should be immediately above or below the background.
    
    Especially grid lines should never be above cell borders.

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a760257..c7b258f 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