incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1360632 - /incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx
Date Thu, 12 Jul 2012 11:19:38 GMT
Author: af
Date: Thu Jul 12 11:19:38 2012
New Revision: 1360632

URL: http://svn.apache.org/viewvc?rev=1360632&view=rev
Log:
#i119493# Fixed import of tables with connectors.

          Reported by: liupingtan
          Patch by: SunYing
          Review by: Andre Fischer

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx?rev=1360632&r1=1360631&r2=1360632&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Thu Jul 12 11:19:38 2012
@@ -7829,6 +7829,13 @@ SdrObject* SdrPowerPointImport::CreateTa
 							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 in AOO, the connector is connected to the whole group table,so the connector
obj is a group table when export by AOO.
+						//should process this situation when import.
+						if ( pPtr->pAObj == pGroup )
+							pPtr->pAObj = pTable;
+						if ( pPtr->pBObj == pGroup )
+							pPtr->pBObj = pTable;
 					}
 				}
 				pTable->uno_unlock();



Mime
View raw message