[Libreoffice-commits] core.git: filter/source

[Andre Fischer]

 filter/source/msfilter/svdfppt.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 3db0865845c79d9ea4ae854aa82a239329ba542c
Author: Andre Fischer <af at apache.org>
Date:   Thu Jul 12 10:19:38 2012 +0000

    Resolves: #i119493# Fixed import of tables with connectors.
    
    Reported by: liupingtan
    Patch by: SunYing
    Review by: Andre Fischer
    (cherry picked from commit 8be0972c9b38efbb43a0b8fc3658028ede58378c)
    
    Change-Id: Ic9a1325ccc9bc9c9a4501269df9de0f7e29a8e1d

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index f9323ed..8b7ea08 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7592,6 +7592,16 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                             if ( pPtr->pBObj == pPartObj )
                                 pPtr->pBObj = NULL;
                         }
+                        //In MS, the one_row_one_col table is made up of five
+                        //shape,the connector is connected to some part of a
+                        //table.  But for us, the connector is connected to the
+                        //whole group table,so the connector obj is a group
+                        //table when export by us. We should process this
+                        //situation when importing.
+                        if ( pPtr->pAObj == pGroup )
+                            pPtr->pAObj = pTable;
+                        if ( pPtr->pBObj == pGroup )
+                            pPtr->pBObj = pTable;
                     }
                 }
                 pTable->uno_unlock();