Index: filter/source/msfilter/msdffimp.cxx
===================================================================
--- filter/source/msfilter/msdffimp.cxx	(revision 1367919)
+++ filter/source/msfilter/msdffimp.cxx	(working copy)
@@ -4342,7 +4342,7 @@
 				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()));
@@ -4775,6 +4775,11 @@
 						((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly );
 						pRet->SetMergedItemSet( aSet );
 					}
+					if ( aObjData.eShapeType == mso_sptLine )
+					{
+						pRet->SetMergedItemSet(aSet);
+						((SdrObjCustomShape*)pRet)->MergeDefaultAttributes();
+					}
 				}
 			}
 
Index: svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
===================================================================
--- svx/source/customshapes/EnhancedCustomShapeGeometry.cxx	(revision 1371220)
+++ svx/source/customshapes/EnhancedCustomShapeGeometry.cxx	(working copy)
@@ -8249,6 +8249,7 @@
 	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;