From 2112d171224a0ae8676afa30292623461065d5b7 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 21 Jan 2016 09:12:02 +0100 Subject: writerfilter: can use a plain instance for the cell sequence here Change-Id: I47fee680b6022cc2402341bf523243c526bc8890 --- writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 11 +++++------ writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 0264f1f74998..95168fa0cacf 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -71,7 +71,7 @@ void DomainMapperTableHandler::startTable(unsigned int nRows, TablePropertyMapPtr pProps) { m_aTableProperties = pProps; - m_aTableSeq.realloc(nRows); + m_aTableSeq = TableSequence_t(nRows); m_nRowIndex = 0; #ifdef DEBUG_WRITERFILTER @@ -629,7 +629,6 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl PropertyMapVector2::const_iterator aLastRowIterator = m_aCellProperties.end() - 1; sal_Int32 nRow = 0; - //it's a uno::Sequence< beans::PropertyValues >* css::uno::Sequence* pCellProperties = aCellProperties.getArray(); PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin(); while( aRowOfCellsIterator != aRowOfCellsIteratorEnd ) @@ -1189,10 +1188,10 @@ void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::X #endif //add a new 'row' of properties - m_pCellSeq = CellSequencePointer_t(new CellSequence_t(2)); + m_aCellSeq = CellSequence_t(2); if (!start.get()) return; - (*m_pCellSeq)[0] = start->getStart(); + m_aCellSeq[0] = start->getStart(); } void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTextRange > & end) @@ -1206,8 +1205,8 @@ void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTe if (!end.get()) return; - (*m_pCellSeq)[1] = end->getEnd(); - m_aRowSeq[m_nCellIndex] = *m_pCellSeq; + m_aCellSeq[1] = end->getEnd(); + m_aRowSeq[m_nCellIndex] = m_aCellSeq; ++m_nCellIndex; } diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index 2d9a41eca86b..669ea30efa05 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -29,7 +29,6 @@ namespace writerfilter { namespace dmapper { typedef css::uno::Sequence< css::uno::Reference< css::text::XTextRange > > CellSequence_t; -typedef std::shared_ptr CellSequencePointer_t; typedef css::uno::Sequence RowSequence_t; typedef css::uno::Sequence TableSequence_t; @@ -63,7 +62,7 @@ class DomainMapperTableHandler { css::uno::Reference m_xText; DomainMapper_Impl& m_rDMapper_Impl; - CellSequencePointer_t m_pCellSeq; + CellSequence_t m_aCellSeq; RowSequence_t m_aRowSeq; TableSequence_t m_aTableSeq; -- cgit