sw/source/filter/ww8/rtfattributeoutput.cxx | 12 ++++++------ sw/source/filter/ww8/rtfattributeoutput.hxx | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 654c98064d3fd2bd1e13ae2bda5f84e8d51d0071 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri May 6 08:12:18 2016 +0200 sw: no need to copy these in rtfattributeoutput Change-Id: I6afbde0943cc5a0a760b873c17a08bb0f5a8c1c5 Reviewed-on: https://gerrit.libreoffice.org/24687 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 73bf757..9bc3579 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -958,7 +958,7 @@ void RtfAttributeOutput::TableRowEnd(sal_uInt32 /*nDepth*/) * Our private table methods. */ -void RtfAttributeOutput::InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) +void RtfAttributeOutput::InitTableHelper(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner) { const SwTable* pTable = pTableTextNodeInfoInner->getTable(); if (m_pTableWrt && pTable == m_pTableWrt->GetTable()) @@ -980,13 +980,13 @@ void RtfAttributeOutput::InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t p m_pTableWrt.reset(new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTableSz, false)); } -void RtfAttributeOutput::StartTable(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/) +void RtfAttributeOutput::StartTable(const ww8::WW8TableNodeInfoInner::Pointer_t& /*pTableTextNodeInfoInner*/) { // To trigger calling InitTableHelper() m_pTableWrt.reset(nullptr); } -void RtfAttributeOutput::StartTableRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) +void RtfAttributeOutput::StartTableRow(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner) { sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth(); SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", (depth is " << nCurrentDepth << ")"); @@ -1006,12 +1006,12 @@ void RtfAttributeOutput::StartTableRow(ww8::WW8TableNodeInfoInner::Pointer_t pTa m_rExport.Strm().WriteCharPtr(m_aRowDefs.makeStringAndClear().getStr()); } -void RtfAttributeOutput::StartTableCell(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/) +void RtfAttributeOutput::StartTableCell(const ww8::WW8TableNodeInfoInner::Pointer_t& /*pTableTextNodeInfoInner*/) { m_bTableCellOpen = true; } -void RtfAttributeOutput::TableCellProperties(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) +void RtfAttributeOutput::TableCellProperties(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner) { TableDefaultBorders(pTableTextNodeInfoInner); TableBackgrounds(pTableTextNodeInfoInner); @@ -1088,7 +1088,7 @@ void RtfAttributeOutput::EndTable() m_pTableWrt.reset(nullptr); } -void RtfAttributeOutput::FinishTableRowCell(ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool /*bForceEmptyParagraph*/) +void RtfAttributeOutput::FinishTableRowCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pInner, bool /*bForceEmptyParagraph*/) { if (pInner.get()) { diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 77e2303..1c3e32e 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -460,17 +460,17 @@ private: /* * Table methods. */ - void InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner); - void StartTable(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner); - void StartTableRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner); - void StartTableCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner); - void TableCellProperties(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner); + void InitTableHelper(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner); + void StartTable(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner); + void StartTableRow(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner); + void StartTableCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner); + void TableCellProperties(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner); void EndTableCell(); void EndTableRow(); void EndTable(); /// End cell, row, and even the entire table if necessary. - void FinishTableRowCell(ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph = false); + void FinishTableRowCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pInner, bool bForceEmptyParagraph = false); void WriteTextFootnoteNumStr(const SwFormatFootnote& rFootnote); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits