incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1372832 - in /incubator/ooo/trunk/main: filter/source/msfilter/msdffimp.cxx svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
Date Tue, 14 Aug 2012 10:35:19 GMT
Author: alg
Date: Tue Aug 14 10:35:19 2012
New Revision: 1372832

URL: http://svn.apache.org/viewvc?rev=1372832&view=rev
Log:
#119443# Import lines from ppt as one poin connectors
Patch by: Jianjuan Li
Review by: alg

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
    incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1372832&r1=1372831&r2=1372832&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Tue Aug 14 10:35:19 2012
@@ -4342,7 +4342,7 @@ SdrObject* SvxMSDffManager::ImportShape(
 				ApplyAttributes( rSt, aSet, aObjData );
 				pRet->SetMergedItemSet(aSet);
 			}
-			else if ( aObjData.eShapeType == mso_sptLine )
+			else if ( aObjData.eShapeType == mso_sptLine && !( GetPropertyValue( DFF_Prop_fc3DLightFace
) & 8 ) )
 			{
 				basegfx::B2DPolygon aPoly;
 				aPoly.append(basegfx::B2DPoint(aObjData.aBoundRect.Left(), aObjData.aBoundRect.Top()));
@@ -4783,6 +4783,11 @@ SdrObject* SvxMSDffManager::ImportShape(
 						((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly );
 						pRet->SetMergedItemSet( aSet );
 					}
+					if ( aObjData.eShapeType == mso_sptLine )
+					{
+						pRet->SetMergedItemSet(aSet);
+						((SdrObjCustomShape*)pRet)->MergeDefaultAttributes();
+					}
 				}
 			}
 

Modified: incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx?rev=1372832&r1=1372831&r2=1372832&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx Tue Aug
14 10:35:19 2012
@@ -8249,6 +8249,7 @@ const mso_CustomShape* GetCustomShapeCon
 	switch( eSpType )
 	{
 		case mso_sptArc :						pCustomShape = &msoArc; break;
+		case mso_sptLine:						pCustomShape = &msoStraightConnector1; break;
 		case mso_sptRectangle :					pCustomShape = &msoRectangle; break;
 		case mso_sptParallelogram :				pCustomShape = &msoParallelogram; break;
 		case mso_sptTrapezoid :					pCustomShape = &msoTrapezoid; break;



Mime
View raw message