tdf#144107: fix incorrect conditioning on bGrid...

introduced in 3092322bb83998397b09d3f34b6d04b5e5c1da50

The intention was to avoid the default line drawing in the original else
branches to be conditional on bMergeCover. The previous patch used
'bGrid' as a surrogate for the original 'else' case - which is wrong.

Change-Id: I7c6b49fa9c21064312273b1051ffc7f81de3fef3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126078
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>

1 files changed, 10 insertions, 31 deletions

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 0aa76721e54a..ae29550b0c08 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -289,7 +289,7 @@ void ScOutputData::SetSyntaxMode( bool bNewMode )
 void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool bPage, bool bMergeCover)
 {
     // bMergeCover : Draw lines in sheet bgcolor to cover lok client grid lines in merged cell areas.
-    // (Used when scNoGridBackground is set in lok mode.)
+    // When scNoGridBackground is set in lok mode, bMergeCover is set to true and bGrid to false.
 
     SCCOL nX;
     SCROW nY;
@@ -353,10 +353,7 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool
     long nLayoutSign = bLayoutRTL ? -1 : 1;
     long nSignedOneX = nOneX * nLayoutSign;
 
-    if (bGrid)
-        rRenderContext.SetLineColor(aGridColor);
-    else if (bMergeCover)
-        rRenderContext.SetLineColor(aSheetBGColor);
+    rRenderContext.SetLineColor(bMergeCover ? aSheetBGColor : aGridColor);
 
     ScGridMerger aGrid(&rRenderContext, nOneX, nOneY);
 
@@ -399,14 +396,9 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool
                                                         aPageColor );
                         bDashed = true;
                     }
-                    else if (bGrid)
-                    {
-                        rRenderContext.SetLineColor( aGridColor );
-                        bDashed = false;
-                    }
-                    else if (bMergeCover)
+                    else
                     {
-                        rRenderContext.SetLineColor(aSheetBGColor);
+                        rRenderContext.SetLineColor(bMergeCover ? aSheetBGColor : aGridColor);
                         bDashed = false;
                     }
 
@@ -464,18 +456,14 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool
                             }
                         }
 
-                        if (pThisRowInfo->bChanged && !bHOver && bGrid)
-                        {
-                            aGrid.AddVerLine(bWorksInPixels, nPosX-nSignedOneX, nPosY, nNextY-nOneY, bDashed);
-                        }
-                        else if (bHOver && bMergeCover)
+                        if ((pThisRowInfo->bChanged && !bHOver && !bMergeCover) || (bHOver && bMergeCover))
                         {
                             aGrid.AddVerLine(bWorksInPixels, nPosX-nSignedOneX, nPosY, nNextY-nOneY, bDashed);
                         }
                         nPosY = nNextY;
                     }
                 }
-                else if (bGrid)
+                else if (!bMergeCover)
                 {
                     aGrid.AddVerLine(bWorksInPixels, nPosX-nSignedOneX, nScrY, nScrY+nScrH-nOneY, bDashed);
                 }
@@ -525,14 +513,9 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool
                                                         aPageColor );
                         bDashed = true;
                     }
-                    else if (bGrid)
-                    {
-                        rRenderContext.SetLineColor( aGridColor );
-                        bDashed = false;
-                    }
-                    else if (bMergeCover)
+                    else
                     {
-                        rRenderContext.SetLineColor(aSheetBGColor);
+                        rRenderContext.SetLineColor(bMergeCover ? aSheetBGColor : aGridColor);
                         bDashed = false;
                     }
 
@@ -579,11 +562,7 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool
                                     //! nVisY from Array ??
                             }
 
-                            if (!bVOver && bGrid)
-                            {
-                                aGrid.AddHorLine(bWorksInPixels, nPosX, nNextX-nSignedOneX, nPosY-nOneY, bDashed);
-                            }
-                            else if (bVOver && bMergeCover)
+                            if ((!bVOver && !bMergeCover) || (bVOver && bMergeCover))
                             {
                                 aGrid.AddHorLine(bWorksInPixels, nPosX, nNextX-nSignedOneX, nPosY-nOneY, bDashed);
                             }
@@ -591,7 +570,7 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool
                         nPosX = nNextX;
                     }
                 }
-                else if (bGrid)
+                else if (!bMergeCover)
                 {
                     aGrid.AddHorLine(bWorksInPixels, nScrX, nScrX+nScrW-nOneX, nPosY-nOneY, bDashed);
                 }