Kaydet (Commit) 2649b3b1 authored tarafından Miklos Vajna's avatar Miklos Vajna

writerfilter: can use a plain instance for the row sequence here

Change-Id: Ic9211192310f6a5b36f4ee4637828d96d8f1f7b7
üst 4ff5a555
...@@ -1151,13 +1151,13 @@ void DomainMapperTableHandler::startRow(unsigned int nCells, ...@@ -1151,13 +1151,13 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
pProps->dumpXml(); pProps->dumpXml();
#endif #endif
m_pRowSeq = RowSequencePointer_t(new RowSequence_t(nCells)); m_aRowSeq = RowSequence_t(nCells);
m_nCellIndex = 0; m_nCellIndex = 0;
} }
void DomainMapperTableHandler::endRow() void DomainMapperTableHandler::endRow()
{ {
m_aTableSeq[m_nRowIndex] = *m_pRowSeq; m_aTableSeq[m_nRowIndex] = m_aRowSeq;
++m_nRowIndex; ++m_nRowIndex;
m_nCellIndex = 0; m_nCellIndex = 0;
#ifdef DEBUG_WRITERFILTER #ifdef DEBUG_WRITERFILTER
...@@ -1207,7 +1207,7 @@ void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTe ...@@ -1207,7 +1207,7 @@ void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTe
if (!end.get()) if (!end.get())
return; return;
(*m_pCellSeq)[1] = end->getEnd(); (*m_pCellSeq)[1] = end->getEnd();
(*m_pRowSeq)[m_nCellIndex] = *m_pCellSeq; m_aRowSeq[m_nCellIndex] = *m_pCellSeq;
++m_nCellIndex; ++m_nCellIndex;
} }
......
...@@ -31,7 +31,6 @@ namespace dmapper { ...@@ -31,7 +31,6 @@ namespace dmapper {
typedef css::uno::Sequence< css::uno::Reference< css::text::XTextRange > > CellSequence_t; typedef css::uno::Sequence< css::uno::Reference< css::text::XTextRange > > CellSequence_t;
typedef std::shared_ptr<CellSequence_t> CellSequencePointer_t; typedef std::shared_ptr<CellSequence_t> CellSequencePointer_t;
typedef css::uno::Sequence<CellSequence_t> RowSequence_t; typedef css::uno::Sequence<CellSequence_t> RowSequence_t;
typedef std::shared_ptr<RowSequence_t> RowSequencePointer_t;
typedef css::uno::Sequence<RowSequence_t> TableSequence_t; typedef css::uno::Sequence<RowSequence_t> TableSequence_t;
typedef css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValues> > CellPropertyValuesSeq_t; typedef css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValues> > CellPropertyValuesSeq_t;
...@@ -65,7 +64,7 @@ class DomainMapperTableHandler ...@@ -65,7 +64,7 @@ class DomainMapperTableHandler
css::uno::Reference<css::text::XTextAppendAndConvert> m_xText; css::uno::Reference<css::text::XTextAppendAndConvert> m_xText;
DomainMapper_Impl& m_rDMapper_Impl; DomainMapper_Impl& m_rDMapper_Impl;
CellSequencePointer_t m_pCellSeq; CellSequencePointer_t m_pCellSeq;
RowSequencePointer_t m_pRowSeq; RowSequence_t m_aRowSeq;
TableSequence_t m_aTableSeq; TableSequence_t m_aTableSeq;
css::uno::Reference< css::text::XTextRange > m_xTableRange; css::uno::Reference< css::text::XTextRange > m_xTableRange;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment