diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-03 11:32:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-06 09:41:48 +0200 |
| commit | fad919eb0d30b2303193e1c00ba765514957652c (patch) | |
| tree | 10c6d6a8a326d18369148be45a6c4fc66206797d /sw/source/filter/ww8/rtfattributeoutput.cxx | |
| parent | 62159ea8cc806df327461275563e95dfdff25667 (diff) | |
make SwWriteTableRows be a vector of std::unique_ptr
and update o3tl::sorted_vector to handle that
Change-Id: I11a9ec3ec09f835cbd7e49ccda133b9f210d761e
Reviewed-on: https://gerrit.libreoffice.org/59931
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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 86bbb4201a2d..8fba8b326d63 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -653,7 +653,7 @@ void RtfAttributeOutput::TableDefinition( // The cell-dependent properties const double fWidthRatio = m_pTableWrt->GetAbsWidthRatio(); const SwWriteTableRows& aRows = m_pTableWrt->GetRows(); - SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()]; + SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()].get(); SwTwips nSz = 0; // Not using m_nTableDepth, which is not yet incremented here. @@ -687,7 +687,7 @@ void RtfAttributeOutput::TableDefaultBorders( */ const SwWriteTableRows& aRows = m_pTableWrt->GetRows(); - SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()]; + SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()].get(); const SwWriteTableCell* const pCell = pRow->GetCells()[pTableTextNodeInfoInner->getCell()].get(); const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat(); @@ -742,7 +742,7 @@ void RtfAttributeOutput::TableBackgrounds( aColor = pRowColorProp->GetColor(); const SwWriteTableRows& aRows = m_pTableWrt->GetRows(); - SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()]; + SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()].get(); const SwWriteTableCell* const pCell = pRow->GetCells()[pTableTextNodeInfoInner->getCell()].get(); const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat(); @@ -830,7 +830,7 @@ void RtfAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) { const SwWriteTableRows& aRows = m_pTableWrt->GetRows(); - SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()]; + SwWriteTableRow* pRow = aRows[pTableTextNodeInfoInner->getRow()].get(); const SwWriteTableCell* const pCell = pRow->GetCells()[pTableTextNodeInfoInner->getCell()].get(); const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat(); |