diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-05-14 14:59:31 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2013-05-23 17:11:34 +0200 |
commit | bbc86883542897e15d226cea9bdad29d1f8fb584 (patch) | |
tree | 039e7da4e883901ae026765a4e3b075885c3a38e /writerfilter | |
parent | a9050d447ecff8cf3124a08eba6bd5cf4ab656e4 (diff) |
fdo#64249: make sure we have matching start/end level for table in shapes
Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
(cherry picked from commit 9ceda3013a6b7e60e0e56ba540e217fd36a34a0f)
Reviewed-on: https://gerrit.libreoffice.org/3907
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 94a535fea675..39f1977b01e4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1650,6 +1650,10 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape if (m_aTextAppendStack.empty()) return; uno::Reference<text::XTextAppend> xTextAppend = m_aTextAppendStack.top().xTextAppend; + + appendTableManager( ); + appendTableHandler( ); + getTableManager().startLevel(); try { uno::Reference< lang::XServiceInfo > xSInfo( xShape, uno::UNO_QUERY_THROW ); @@ -1708,10 +1712,6 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape xProps->setPropertyValue( rPropNameSupplier.GetName( PROP_ANCHOR_TYPE ), bIsGraphic ? uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) : uno::makeAny( text::TextContentAnchorType_AT_PARAGRAPH ) ); } } - - appendTableManager( ); - appendTableHandler( ); - getTableManager().startLevel(); } catch ( const uno::Exception& e ) { @@ -1723,11 +1723,10 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape void DomainMapper_Impl::PopShapeContext() { + getTableManager().endLevel(); + popTableManager(); if ( m_aAnchoredStack.size() > 0 ) { - getTableManager().endLevel(); - popTableManager(); - // For OLE object replacement shape, the text append context was already removed // or the OLE object couldn't be inserted. if ( !m_aAnchoredStack.top().bToRemove ) |