Kaydet (Commit) dfee8f56 authored tarafından Mike Kaganski's avatar Mike Kaganski

tdf#120703 (PVS): redundant nullptr checks

V668 There is no sense in testing the 'pClipDoc' pointer against null, as
     the memory was allocated using the 'new' operator. The exception will
     be generated in the case of memory allocation error.

V560 A part of conditional expression is always true: pDoc.

V560 A part of conditional expression is always true: pMergeFlagAttr.

V560 A part of conditional expression is always true: pMergeFlag.

Change-Id: Ief75a140cca58fe458dc3c1fd18a9bbaa1ea39cb
Reviewed-on: https://gerrit.libreoffice.org/62143
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 89aefcb8
...@@ -245,21 +245,17 @@ bool ScViewFunc::CopyToClipSingleRange( ScDocument* pClipDoc, const ScRangeList& ...@@ -245,21 +245,17 @@ bool ScViewFunc::CopyToClipSingleRange( ScDocument* pClipDoc, const ScRangeList&
} }
pDoc->CopyToClip( aClipParam, pClipDoc, &rMark, false, bIncludeObjects ); pDoc->CopyToClip( aClipParam, pClipDoc, &rMark, false, bIncludeObjects );
if ( pDoc && pClipDoc ) if (ScDrawLayer* pDrawLayer = pClipDoc->GetDrawLayer())
{ {
ScDrawLayer* pDrawLayer = pClipDoc->GetDrawLayer(); ScClipParam& rClipDocClipParam = pClipDoc->GetClipParam();
if ( pDrawLayer ) ScRangeListVector& rRangesVector = rClipDocClipParam.maProtectedChartRangesVector;
SCTAB nTabCount = pClipDoc->GetTableCount();
for ( SCTAB nTab = 0; nTab < nTabCount; ++nTab )
{ {
ScClipParam& rClipDocClipParam = pClipDoc->GetClipParam(); SdrPage* pPage = pDrawLayer->GetPage( static_cast< sal_uInt16 >( nTab ) );
ScRangeListVector& rRangesVector = rClipDocClipParam.maProtectedChartRangesVector; if ( pPage )
SCTAB nTabCount = pClipDoc->GetTableCount();
for ( SCTAB nTab = 0; nTab < nTabCount; ++nTab )
{ {
SdrPage* pPage = pDrawLayer->GetPage( static_cast< sal_uInt16 >( nTab ) ); ScChartHelper::FillProtectedChartRangesVector( rRangesVector, pDoc, pPage );
if ( pPage )
{
ScChartHelper::FillProtectedChartRangesVector( rRangesVector, pDoc, pPage );
}
} }
} }
} }
...@@ -1219,9 +1215,9 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, ...@@ -1219,9 +1215,9 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc,
SCROW nRow2 = -1; SCROW nRow2 = -1;
while ( ( pPattern = aIter.GetNext( nCol, nRow1, nRow2 ) ) != nullptr ) while ( ( pPattern = aIter.GetNext( nCol, nRow1, nRow2 ) ) != nullptr )
{ {
const ScMergeAttr* pMergeFlag = &pPattern->GetItem(ATTR_MERGE); const ScMergeAttr& rMergeFlag = pPattern->GetItem(ATTR_MERGE);
const ScMergeFlagAttr* pMergeFlagAttr = &pPattern->GetItem(ATTR_MERGE_FLAG); const ScMergeFlagAttr& rMergeFlagAttr = pPattern->GetItem(ATTR_MERGE_FLAG);
if( ( pMergeFlag && pMergeFlag->IsMerged() ) || ( pMergeFlagAttr && pMergeFlagAttr->IsOverlapped() ) ) if (rMergeFlag.IsMerged() || rMergeFlagAttr.IsOverlapped())
{ {
ScRange aRange(nCol, nRow1, nStartTab); ScRange aRange(nCol, nRow1, nStartTab);
pDoc->ExtendOverlapped(aRange); pDoc->ExtendOverlapped(aRange);
......
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