diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-05-15 15:17:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-15 15:18:19 +0100 |
commit | d6bebd18b3b25af0024ec3ae5bde17836b0085e3 (patch) | |
tree | 738ff86144cf782b5d830203da9b0c44b9c27f88 /sd | |
parent | d7c7624024f1da26165869921f340f53026a423d (diff) |
Revert "Resolves: #i119551# Avoid grouping shapes on import from PPT..."
This reverts commit 8c23e31acc61406103c1565960e4c5b391902754.
wrong one
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 57 |
1 files changed, 15 insertions, 42 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 65c5b33c4535..356ddfbdda5c 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2242,10 +2242,7 @@ void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSo void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber ) { - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // sal_uInt32 nGroupLevel = 0; - - sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer, nIndices, nOlePictureId; + sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer, nIndices, nGroupLevel = 0, nOlePictureId; sal_uInt16 nEffectCount; ::com::sun::star::awt::Point aTextRefPoint; @@ -2500,9 +2497,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)( mnAngle / 10 ) ); if ( ImplGetText() ) { - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->EnterGroup( 0,0 ); - // nGroupLevel = mpPptEscherEx->GetGroupLevel(); + mpPptEscherEx->EnterGroup( 0,0 ); + nGroupLevel = mpPptEscherEx->GetGroupLevel(); bNeedText = sal_False; bAdditionalText = sal_True; mnTextSize = 0; @@ -2697,8 +2693,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a aTextRefPoint = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() ); mnTextSize = 0; bAdditionalText = sal_True; - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->EnterGroup( &maRect,0 ); + mpPptEscherEx->EnterGroup( &maRect,0 ); } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); sal_uInt32 nFlags = 0xa00; // Flags: Connector | HasSpt @@ -2716,9 +2711,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( ImplGetText() ) { - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->EnterGroup( 0,0 ); - // nGroupLevel = mpPptEscherEx->GetGroupLevel(); + mpPptEscherEx->EnterGroup( 0,0 ); + nGroupLevel = mpPptEscherEx->GetGroupLevel(); bAdditionalText = sal_True; mnTextSize = 0; } @@ -2736,9 +2730,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( ImplGetText() ) { - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->EnterGroup( 0,0 ); - // nGroupLevel = mpPptEscherEx->GetGroupLevel(); + mpPptEscherEx->EnterGroup( 0,0 ); + nGroupLevel = mpPptEscherEx->GetGroupLevel(); bAdditionalText = sal_True; mnTextSize = 0; } @@ -2756,9 +2749,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( ImplGetText() ) { - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->EnterGroup( 0,0 ); - // nGroupLevel = mpPptEscherEx->GetGroupLevel(); + mpPptEscherEx->EnterGroup( 0,0 ); + nGroupLevel = mpPptEscherEx->GetGroupLevel(); bAdditionalText = sal_True; mnTextSize = 0; } @@ -2776,9 +2768,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( ImplGetText() ) { - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->EnterGroup( 0,0 ); - // nGroupLevel = mpPptEscherEx->GetGroupLevel(); + mpPptEscherEx->EnterGroup( 0,0 ); + nGroupLevel = mpPptEscherEx->GetGroupLevel(); bAdditionalText = sal_True; mnTextSize = 0; } @@ -2835,22 +2826,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else { ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - const Rectangle aOldRect100thmm(aRect100thmm); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "GraphicURL" ), sal_False, sal_True ) ) - { aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); - - if(aOldRect100thmm != aRect100thmm) - { - // #119536# graphic has been adapted (rotated) so that it can be saved without angle, - // adapt local values as needed - maPosition = ImplMapPoint( ::com::sun::star::awt::Point( aRect100thmm.Left(), aRect100thmm.Top() ) ); - maSize = ImplMapSize( ::com::sun::star::awt::Size ( aRect100thmm.GetWidth(), aRect100thmm.GetHeight() ) ); - maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) ); - mnAngle = 0; - } - } } } } @@ -3516,10 +3493,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mnAngle += 0x8000; mnAngle &=~0xffff; // round nAngle to full grad aPropOpt.AddOpt( ESCHER_Prop_Rotation, mnAngle ); - - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->SetGroupSnapRect( nGroupLevel, maRect ); - // mpPptEscherEx->SetGroupLogicRect( nGroupLevel, maRect ); + mpPptEscherEx->SetGroupSnapRect( nGroupLevel, maRect ); + mpPptEscherEx->SetGroupLogicRect( nGroupLevel, maRect ); } if ( !pClientTextBox ) pClientTextBox = new SvMemoryStream( 0x200, 0x200 ); @@ -3541,9 +3516,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a delete pClientTextBox, pClientTextBox = NULL; mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer - - // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) - // mpPptEscherEx->LeaveGroup(); + mpPptEscherEx->LeaveGroup(); } } ClearGroupTable(); // storing groups if any are still open, which should not be the case |