diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-09 11:45:13 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-09 11:45:13 +0200 |
| commit | e7c6e5d2c248cfb935c91882a3a1e64fea7550b4 (patch) | |
| tree | d2f45902cbd12ac6b651e486687130e01272d79f /svx/source/msfilter/eschesdo.cxx | |
| parent | 2484e4f7faa1f052ff48d2192ffb5931a71faa8f (diff) | |
| parent | d1886d07b439e7197f731c9d98c0b2ec31c62faa (diff) | |
merge commit to DEV300_m57
Diffstat (limited to 'svx/source/msfilter/eschesdo.cxx')
| -rw-r--r-- | svx/source/msfilter/eschesdo.cxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/svx/source/msfilter/eschesdo.cxx b/svx/source/msfilter/eschesdo.cxx index 8057eded6131..65157df81baa 100644 --- a/svx/source/msfilter/eschesdo.cxx +++ b/svx/source/msfilter/eschesdo.cxx @@ -736,16 +736,10 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, if( rObj.GetAngle() ) ImplFlipBoundingBox( rObj, aPropOpt ); - aPropOpt.Commit( mpEscherEx->GetStream() ); + mpEscherEx->Commit( aPropOpt, rObj.GetRect() ); if( mpEscherEx->GetGroupLevel() > 1 ) - { - mpEscherEx->AddAtom( 16, ESCHER_ChildAnchor ); - const Rectangle& rRect = rObj.GetRect(); - mpEscherEx->GetStream() << (INT32)rRect.Left() - << (INT32)rRect.Top() - << (INT32)rRect.Right() - << (INT32)rRect.Bottom(); - } + mpEscherEx->AddChildAnchor( rObj.GetRect() ); + if ( mpHostAppData ) { //! with AdditionalText the App has to control whether these are written or not mpHostAppData->WriteClientAnchor( *mpEscherEx, rObj.GetRect() ); @@ -839,15 +833,10 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj, rObj.GetRect() ); } rObj.SetAngle( nAngle ); - aPropOpt.Commit( mpEscherEx->GetStream() ); + mpEscherEx->Commit( aPropOpt, rObj.GetRect() ); // write the childanchor - mpEscherEx->AddAtom( 16, ESCHER_ChildAnchor ); - const Rectangle& rRect = rObj.GetRect(); - mpEscherEx->GetStream() << (INT32)rRect.Left() - << (INT32)rRect.Top() - << (INT32)rRect.Right() - << (INT32)rRect.Bottom(); + mpEscherEx->AddChildAnchor( rObj.GetRect() ); #if defined EES_WRITE_EPP // ClientAnchor |