summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-05-14 14:59:31 +0200
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-05-14 15:01:50 +0200
commit9ceda3013a6b7e60e0e56ba540e217fd36a34a0f (patch)
treedc4ae27124667dc10f83c631cacd617fc322a858 /writerfilter/source/dmapper
parentcaaeafa3ed01509989b4e742698e06c2d15add11 (diff)
fdo#64249: make sure we have matching start/end level for table in shapes
Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b5a5baab6599..c05750ce3d81 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1647,6 +1647,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 );
@@ -1705,10 +1709,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 )
{
@@ -1720,11 +1720,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 )