diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-28 14:29:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-28 14:47:18 +0100 |
| commit | 34b5da1c701144d2d957d523d79e2547cbf40ece (patch) | |
| tree | fb9a92e4ade328dcc78a30a46ff400bc9b678972 /sw/source/filter/ww8/rtfattributeoutput.cxx | |
| parent | tdf#94871: sw: fix a frame formatting regression that affects help (diff) | |
| download | core-34b5da1c701144d2d957d523d79e2547cbf40ece.tar.gz core-34b5da1c701144d2d957d523d79e2547cbf40ece.zip | |
sw: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I1d9aa200734d264e3bc65ea39f8c2a2d03782f7b
Diffstat (limited to 'sw/source/filter/ww8/rtfattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index ff7f7d6d767e..b60ad04ab81b 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -728,7 +728,7 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p m_aCells[nCurrentDepth] = pRow->GetCells().size(); for (sal_uInt32 i = 0; i < m_aCells[nCurrentDepth]; i++) { - const SwWriteTableCell* pCell = &pRow->GetCells()[ i ]; + const SwWriteTableCell *const pCell = pRow->GetCells()[ i ].get(); const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat(); pTableTextNodeInfoInner->setCell(i); @@ -756,7 +756,7 @@ void RtfAttributeOutput::TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer const SwWriteTableRows& aRows = m_pTableWrt->GetRows(); SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ]; - const SwWriteTableCell* pCell = &pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ]; + const SwWriteTableCell *const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get(); const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat(); const SfxPoolItem* pItem; if (pCellFormat->GetAttrSet().HasItem(RES_BOX, &pItem)) @@ -799,7 +799,7 @@ void RtfAttributeOutput::TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t { const SwWriteTableRows& aRows = m_pTableWrt->GetRows(); SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ]; - const SwWriteTableCell* pCell = &pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ]; + const SwWriteTableCell *const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get(); const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat(); const SfxPoolItem* pItem; if (pCellFormat->GetAttrSet().HasItem(RES_BACKGROUND, &pItem)) @@ -879,7 +879,7 @@ void RtfAttributeOutput::TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t { const SwWriteTableRows& aRows = m_pTableWrt->GetRows(); SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ]; - const SwWriteTableCell* pCell = &pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ]; + const SwWriteTableCell *const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get(); const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat(); const SfxPoolItem* pItem; |