diff options
| author | Armin Le Grand <alg@apache.org> | 2012-08-14 09:35:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-19 14:59:40 +0100 |
| commit | 8feb5a20b8d7c4c4484153215b2dd688a52cf50c (patch) | |
| tree | 9ceb5d4c341203f256fc2ec5955f71cc173ee3f6 /filter | |
| parent | abb6f47bd3941ec63a41a9b9fa4c7de620b5177d (diff) | |
Resolves: #i119443# Import lines from ppt as one point connectors
Patch by: Jianjuan Li
Review by: alg
(cherry picked from commit acd62709ad0d1d54764f00aabbd6c59ccb41a409)
Change-Id: I1978444641d5f7c053dfae815096e7f2bacce15a
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index dc726b1b243d..b8b92dbaa63a 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4143,7 +4143,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r 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())); @@ -4561,6 +4561,11 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r ((SdrEdgeObj*)pRet)->SetEdgeTrackPath( aPoly ); pRet->SetMergedItemSet( aSet ); } + if ( aObjData.eShapeType == mso_sptLine ) + { + pRet->SetMergedItemSet(aSet); + ((SdrObjCustomShape*)pRet)->MergeDefaultAttributes(); + } } } |