[Libreoffice-commits] core.git: sc/source

[Libreoffice Gerrit user]

 sc/source/ui/view/tabview2.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2e20c73082cce14b9af01d10ee8f1e07ade5be46
Author:     Zdibák Zoltán <zdibakzoltan at gmail.com>
AuthorDate: Tue Oct 30 20:07:12 2018 +0100
Commit:     Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Wed Oct 31 02:20:49 2018 +0100

    cppCheck RedundantAssignment variable pMergeAttr
    
    Change-Id: I5dc87ec04a7c79359c947ba2786bbe067770904c
    Reviewed-on: https://gerrit.libreoffice.org/62665
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 30868a8faee1..c47cc31501bb 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -502,7 +502,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
             SCROW nCurYOffset = 0;
             SCROW nBlockStartYOffset = 0;
             bool bBlockStartMerged = false;
-            const ScMergeAttr* pMergeAttr = nullptr;
             ScDocument* pDocument = aViewData.GetDocument();
 
             // The following block checks whether or not the "BlockStart" (anchor)
@@ -512,7 +511,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
             // selection is moving in the upperleft direction, the anchor cell will
             // move to the lower-right corner of the merged anchor cell, and so on.
 
-            pMergeAttr =
+            const ScMergeAttr* pMergeAttr =
                 pDocument->GetAttr( nBlockStartXOrig, nBlockStartYOrig, nTab, ATTR_MERGE );
             if ( pMergeAttr->IsMerged() )
             {