[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit df73fa5feb10df10c4ba036be5fac1ddb9b6915f
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Tue May 14 14:59:31 2013 +0200

    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 at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index deda4f1..48e40dea 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1627,6 +1627,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 );
@@ -1685,10 +1689,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 )
     {
@@ -1700,11 +1700,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 )