Kaydet (Commit) 2e20c730 authored tarafından Zdibák Zoltán's avatar Zdibák Zoltán Kaydeden (comit) Markus Mohrhard

cppCheck RedundantAssignment variable pMergeAttr

Change-Id: I5dc87ec04a7c79359c947ba2786bbe067770904c
Reviewed-on: https://gerrit.libreoffice.org/62665Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 8e037373
...@@ -502,7 +502,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -502,7 +502,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
SCROW nCurYOffset = 0; SCROW nCurYOffset = 0;
SCROW nBlockStartYOffset = 0; SCROW nBlockStartYOffset = 0;
bool bBlockStartMerged = false; bool bBlockStartMerged = false;
const ScMergeAttr* pMergeAttr = nullptr;
ScDocument* pDocument = aViewData.GetDocument(); ScDocument* pDocument = aViewData.GetDocument();
// The following block checks whether or not the "BlockStart" (anchor) // The following block checks whether or not the "BlockStart" (anchor)
...@@ -512,7 +511,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ...@@ -512,7 +511,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
// selection is moving in the upperleft direction, the anchor cell will // 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. // 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 ); pDocument->GetAttr( nBlockStartXOrig, nBlockStartYOrig, nTab, ATTR_MERGE );
if ( pMergeAttr->IsMerged() ) if ( pMergeAttr->IsMerged() )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment