diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-02 12:41:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-03 16:04:17 +0100 |
| commit | e3308af401013713bbfe27b6df9952586c52f4aa (patch) | |
| tree | d498f4a3bfefef5a4c964986cf76d86201ba58e8 /sc/source/ui/view/output.cxx | |
| parent | a4fbb496ef001d62fce0ad3cdd7a829f99aa182e (diff) | |
TypedWhichId in sc
Change-Id: I43558191f65bfb07abfbc92970629d5dd561a04e
Reviewed-on: https://gerrit.libreoffice.org/49141
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/view/output.cxx')
| -rw-r--r-- | sc/source/ui/view/output.cxx | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 064bb14ce1a1..40beadf11610 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -456,12 +456,12 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool if (nVisX <= nX2) bHOver = pThisRowInfo->pCellInfo[nVisX+1].bHOverlapped; else - bHOver = static_cast<const ScMergeFlagAttr*>(mpDoc->GetAttr( - nVisX,pThisRowInfo->nRowNo,nTab,ATTR_MERGE_FLAG)) + bHOver = mpDoc->GetAttr( + nVisX,pThisRowInfo->nRowNo,nTab,ATTR_MERGE_FLAG) ->IsHorOverlapped(); if (bHOver) - bHOver = static_cast<const ScMergeFlagAttr*>(mpDoc->GetAttr( - nXplus1,pThisRowInfo->nRowNo,nTab,ATTR_MERGE_FLAG)) + bHOver = mpDoc->GetAttr( + nXplus1,pThisRowInfo->nRowNo,nTab,ATTR_MERGE_FLAG) ->IsHorOverlapped(); } } @@ -563,11 +563,11 @@ void ScOutputData::DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool bVOver = pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped; else { - bVOver = static_cast<const ScMergeFlagAttr*>(mpDoc->GetAttr( - i,nYplus1,nTab,ATTR_MERGE_FLAG)) + bVOver = mpDoc->GetAttr( + i,nYplus1,nTab,ATTR_MERGE_FLAG) ->IsVerOverlapped() - && static_cast<const ScMergeFlagAttr*>(mpDoc->GetAttr( - i,nVisY,nTab,ATTR_MERGE_FLAG)) + && mpDoc->GetAttr( + i,nVisY,nTab,ATTR_MERGE_FLAG) ->IsVerOverlapped(); //! nVisY from Array ?? } @@ -2351,15 +2351,15 @@ void ScOutputData::DrawClipMarks() long nStartPosX = nPosX; long nStartPosY = nPosY; - while ( nOverX > 0 && ( static_cast<const ScMergeFlagAttr*>(mpDoc->GetAttr( - nOverX, nOverY, nTab, ATTR_MERGE_FLAG ))->GetValue() & ScMF::Hor ) ) + while ( nOverX > 0 && ( mpDoc->GetAttr( + nOverX, nOverY, nTab, ATTR_MERGE_FLAG )->GetValue() & ScMF::Hor ) ) { --nOverX; nStartPosX -= nLayoutSign * static_cast<long>( mpDoc->GetColWidth(nOverX,nTab) * mnPPTX ); } - while ( nOverY > 0 && ( static_cast<const ScMergeFlagAttr*>(mpDoc->GetAttr( - nOverX, nOverY, nTab, ATTR_MERGE_FLAG ))->GetValue() & ScMF::Ver ) ) + while ( nOverY > 0 && ( mpDoc->GetAttr( + nOverX, nOverY, nTab, ATTR_MERGE_FLAG )->GetValue() & ScMF::Ver ) ) { --nOverY; nStartPosY -= nLayoutSign * static_cast<long>( mpDoc->GetRowHeight(nOverY,nTab) * mnPPTY ); @@ -2368,8 +2368,7 @@ void ScOutputData::DrawClipMarks() long nOutWidth = static_cast<long>( mpDoc->GetColWidth(nOverX,nTab) * mnPPTX ); long nOutHeight = static_cast<long>( mpDoc->GetRowHeight(nOverY,nTab) * mnPPTY ); - const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>( - mpDoc->GetAttr( nOverX, nOverY, nTab, ATTR_MERGE )); + const ScMergeAttr* pMerge = mpDoc->GetAttr( nOverX, nOverY, nTab, ATTR_MERGE ); SCCOL nCountX = pMerge->GetColMerge(); for (SCCOL i=1; i<nCountX; i++) nOutWidth += static_cast<long>( mpDoc->GetColWidth(nOverX+i,nTab) * mnPPTX ); |