summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-01-20 09:30:13 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-01-20 09:36:06 +0100
commit2649b3b16fca0c1a1ab7ea2f39db16916875a616 (patch)
tree16a16c7ad37a058d048858c24e4479844d01b772 /writerfilter
parent4ff5a5558472beee85eb1234dcc2aa2ed9000f6c (diff)
writerfilter: can use a plain instance for the row sequence here
Change-Id: Ic9211192310f6a5b36f4ee4637828d96d8f1f7b7
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.hxx3
2 files changed, 4 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3249a88f6728..0264f1f74998 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1151,13 +1151,13 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
pProps->dumpXml();
#endif
- m_pRowSeq = RowSequencePointer_t(new RowSequence_t(nCells));
+ m_aRowSeq = RowSequence_t(nCells);
m_nCellIndex = 0;
}
void DomainMapperTableHandler::endRow()
{
- m_aTableSeq[m_nRowIndex] = *m_pRowSeq;
+ m_aTableSeq[m_nRowIndex] = m_aRowSeq;
++m_nRowIndex;
m_nCellIndex = 0;
#ifdef DEBUG_WRITERFILTER
@@ -1207,7 +1207,7 @@ void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTe
if (!end.get())
return;
(*m_pCellSeq)[1] = end->getEnd();
- (*m_pRowSeq)[m_nCellIndex] = *m_pCellSeq;
+ m_aRowSeq[m_nCellIndex] = *m_pCellSeq;
++m_nCellIndex;
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index e323ad941dac..2d9a41eca86b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -31,7 +31,6 @@ namespace dmapper {
typedef css::uno::Sequence< css::uno::Reference< css::text::XTextRange > > CellSequence_t;
typedef std::shared_ptr<CellSequence_t> CellSequencePointer_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< css::uno::Sequence<css::beans::PropertyValues> > CellPropertyValuesSeq_t;
@@ -65,7 +64,7 @@ class DomainMapperTableHandler
css::uno::Reference<css::text::XTextAppendAndConvert> m_xText;
DomainMapper_Impl& m_rDMapper_Impl;
CellSequencePointer_t m_pCellSeq;
- RowSequencePointer_t m_pRowSeq;
+ RowSequence_t m_aRowSeq;
TableSequence_t m_aTableSeq;
css::uno::Reference< css::text::XTextRange > m_xTableRange;