mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RtfAttributeOutput::m_pTableWrt: use std::unique_ptr<>

Browse Source 
Change-Id: I188d00a3962205d958d5efe1d387e009372ec281
This commit is contained in:
Miklos Vajna
2015-04-29 09:07:22 +02:00
parent d7bd8f6f35
commit a2c02f3f0d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sw/source/filter/ww8/rtfattributeoutput.cxx
View File

@@ -859,15 +859,15 @@ void RtfAttributeOutput::InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t p
const SwHTMLTableLayout* pLayout = pTable->GetHTMLTableLayout(); const SwHTMLTableLayout* pLayout = pTable->GetHTMLTableLayout();
if (pLayout && pLayout->IsExportable()) if (pLayout && pLayout->IsExportable())
m_pTableWrt = new SwWriteTable(pTable, pLayout); m_pTableWrt.reset(new SwWriteTable(pTable, pLayout));
else else
m_pTableWrt = new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTblSz, false); m_pTableWrt.reset(new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTblSz, false));
} }
void RtfAttributeOutput::StartTable(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/) void RtfAttributeOutput::StartTable(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/)
{ {
// To trigger calling InitTableHelper() // To trigger calling InitTableHelper()
delete m_pTableWrt, m_pTableWrt = NULL; m_pTableWrt.reset(0);
} }
void RtfAttributeOutput::StartTableRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) void RtfAttributeOutput::StartTableRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner)
@@ -961,7 +961,7 @@ void RtfAttributeOutput::EndTable()
if (m_nTableDepth > 0) if (m_nTableDepth > 0)
{ {
m_nTableDepth--; m_nTableDepth--;
delete m_pTableWrt, m_pTableWrt = NULL; m_pTableWrt.reset(0);
} }
// We closed the table; if it is a nested table, the cell that contains it // We closed the table; if it is a nested table, the cell that contains it
@@ -969,7 +969,7 @@ void RtfAttributeOutput::EndTable()
m_bTableCellOpen = true; m_bTableCellOpen = true;
// Cleans the table helper // Cleans the table helper
delete m_pTableWrt, m_pTableWrt = NULL; m_pTableWrt.reset(0);
} }
void RtfAttributeOutput::FinishTableRowCell(ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool /*bForceEmptyParagraph*/) void RtfAttributeOutput::FinishTableRowCell(ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool /*bForceEmptyParagraph*/)
@@ -1650,8 +1650,7 @@ void RtfAttributeOutput::writeTextFrame(const sw::Frame& rFrame, bool bTextBox)
// Save table state, in case the inner text also contains a table. // Save table state, in case the inner text also contains a table.
ww8::WW8TableInfo::Pointer_t pTableInfoOrig = m_rExport.mpTableInfo; ww8::WW8TableInfo::Pointer_t pTableInfoOrig = m_rExport.mpTableInfo;
m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new ww8::WW8TableInfo()); m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new ww8::WW8TableInfo());
SwWriteTable* pTableWrt = m_pTableWrt; std::unique_ptr<SwWriteTable> pTableWrt(m_pTableWrt.release());
m_pTableWrt = 0;
sal_uInt32 nTableDepth = m_nTableDepth; sal_uInt32 nTableDepth = m_nTableDepth;
m_nTableDepth = 0; m_nTableDepth = 0;
@@ -1686,8 +1685,7 @@ void RtfAttributeOutput::writeTextFrame(const sw::Frame& rFrame, bool bTextBox)
// Restore table state. // Restore table state.
m_rExport.mpTableInfo = pTableInfoOrig; m_rExport.mpTableInfo = pTableInfoOrig;
delete m_pTableWrt; m_pTableWrt.reset(pTableWrt.release());
m_pTableWrt = pTableWrt;
m_nTableDepth = nTableDepth; m_nTableDepth = nTableDepth;
} }
@@ -3348,7 +3346,6 @@ RtfAttributeOutput::RtfAttributeOutput(RtfExport& rExport)
m_bStrikeDouble(false), m_bStrikeDouble(false),
m_nNextAnnotationMarkId(0), m_nNextAnnotationMarkId(0),
m_nCurrentAnnotationMarkId(-1), m_nCurrentAnnotationMarkId(-1),
m_pTableWrt(NULL),
m_bTableCellOpen(false), m_bTableCellOpen(false),
m_nTableDepth(0), m_nTableDepth(0),
m_bTblAfterCell(false), m_bTblAfterCell(false),

2
sw/source/filter/ww8/rtfattributeoutput.hxx
View File

@@ -520,7 +520,7 @@ private:
/* /*
* The current table helper. * The current table helper.
*/ */
SwWriteTable* m_pTableWrt; std::unique_ptr<SwWriteTable> m_pTableWrt;
/* /*
* Remember if we are in an open cell, or not. * Remember if we are in an open cell, or not.