diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-18 07:43:14 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-18 07:47:21 +0200 |
commit | e15eacb5ddeeed813c9455995ae8abb7772c9942 (patch) | |
tree | fd42af2829063a3bc962cb383e6915a87a9dcdfc /writerfilter/source | |
parent | 5f2f57ea644dc116c131dcc82ffb434da94c344b (diff) |
writerfilter: avoid manual realloc
Change-Id: I5ce8b00736fed6d4fb307c6384deca4718e770a3
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b0d4ca539066..6dd884b23282 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4722,9 +4722,9 @@ void DomainMapper_Impl::RegisterFrameConversion( ) { OSL_ENSURE( - !m_aFrameProperties.getLength() && !m_xFrameStartRange.is() && !m_xFrameEndRange.is(), + m_aFrameProperties.empty() && !m_xFrameStartRange.is() && !m_xFrameEndRange.is(), "frame properties not removed"); - m_aFrameProperties = aFrameProperties; + m_aFrameProperties = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(aFrameProperties); m_xFrameStartRange = xFrameStartRange; m_xFrameEndRange = xFrameEndRange; } @@ -4742,7 +4742,7 @@ bool DomainMapper_Impl::ExecuteFrameConversion() xTextAppendAndConvert->convertToTextFrame( m_xFrameStartRange, m_xFrameEndRange, - m_aFrameProperties ); + comphelper::containerToSequence(m_aFrameProperties) ); } catch( const uno::Exception& rEx) { @@ -4752,7 +4752,7 @@ bool DomainMapper_Impl::ExecuteFrameConversion() } m_xFrameStartRange = nullptr; m_xFrameEndRange = nullptr; - m_aFrameProperties.realloc( 0 ); + m_aFrameProperties.clear(); return bRet; } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index c7cca3dbef05..e13d92849d0a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -398,7 +398,7 @@ private: bool m_bIsCustomFtnMark; //registered frame properties - css::uno::Sequence<css::beans::PropertyValue> m_aFrameProperties; + std::vector<css::beans::PropertyValue> m_aFrameProperties; css::uno::Reference<css::text::XTextRange> m_xFrameStartRange; css::uno::Reference<css::text::XTextRange> m_xFrameEndRange; |