diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-28 11:42:24 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-28 11:42:24 +0100 |
| commit | ba1d2677af955e95d7aa673c21d8be961b88389a (patch) | |
| tree | a828ce9796601aac1c600dfee92ca0035adb2693 /sc/source/ui/view/output.cxx | |
| parent | 27dcfc03c1f9f08111102e54191ecd8aacd6b09f (diff) | |
cid#738785 Uninitialized pointer field
Change-Id: I2256682639084c8889d1137f087e34f7b0dab6e7
Diffstat (limited to 'sc/source/ui/view/output.cxx')
| -rw-r--r-- | sc/source/ui/view/output.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 03048ad750a2..6fc29bb75369 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -736,16 +736,16 @@ static bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, for ( nX=nX1; nX<=nX2; nX++ ) { - const Color* pCol1 = rFirst.pCellInfo[nX+1].pColorScale; - const Color* pCol2 = rOther.pCellInfo[nX+1].pColorScale; + const Color* pCol1 = rFirst.pCellInfo[nX+1].pColorScale.get(); + const Color* pCol2 = rOther.pCellInfo[nX+1].pColorScale.get(); if( (pCol1 && !pCol2) || (!pCol1 && pCol2) ) return false; if (pCol1 && (*pCol1 != *pCol2)) return false; - const ScDataBarInfo* pInfo1 = rFirst.pCellInfo[nX+1].pDataBar; - const ScDataBarInfo* pInfo2 = rOther.pCellInfo[nX+1].pDataBar; + const ScDataBarInfo* pInfo1 = rFirst.pCellInfo[nX+1].pDataBar.get(); + const ScDataBarInfo* pInfo2 = rOther.pCellInfo[nX+1].pDataBar.get(); if( (pInfo1 && !pInfo2) || (!pInfo1 && pInfo2) ) return false; @@ -754,8 +754,8 @@ static bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, return false; // each cell with an icon set should be painted the same way - const ScIconSetInfo* pIconSet1 = rFirst.pCellInfo[nX+1].pIconSet; - const ScIconSetInfo* pIconSet2 = rOther.pCellInfo[nX+1].pIconSet; + const ScIconSetInfo* pIconSet1 = rFirst.pCellInfo[nX+1].pIconSet.get(); + const ScIconSetInfo* pIconSet2 = rOther.pCellInfo[nX+1].pIconSet.get(); if(pIconSet1 || pIconSet2) return false; @@ -1041,9 +1041,9 @@ void ScOutputData::DrawBackground() pBackground = lcl_FindBackground( mpDoc, nX, nY, nTab ); } - pColor = pInfo->pColorScale; - const ScDataBarInfo* pDataBarInfo = pInfo->pDataBar; - const ScIconSetInfo* pIconSetInfo = pInfo->pIconSet; + pColor = pInfo->pColorScale.get(); + const ScDataBarInfo* pDataBarInfo = pInfo->pDataBar.get(); + const ScIconSetInfo* pIconSetInfo = pInfo->pIconSet.get(); drawCells( pColor, pBackground, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, mpDev, pDataBarInfo, pOldDataBarInfo, pIconSetInfo, pOldIconSetInfo ); nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign; @@ -1631,7 +1631,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) else { Polygon aPoly( 4, aPoints ); - const Color* pColor = pInfo->pColorScale; + const Color* pColor = pInfo->pColorScale.get(); // ohne Pen wird bei DrawPolygon rechts und unten // ein Pixel weggelassen... |