diff options
author | Kurt Zenker <kz@openoffice.org> | 2011-04-12 16:50:12 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2011-04-12 16:50:12 +0200 |
commit | 57c7aaf539ce639faaee922f2af185a8802d9dd3 (patch) | |
tree | e7261985f35880ea683a3c4130afc0f2820a0426 /sd | |
parent | a095da08d2f018c9354767543239d0d0962fe590 (diff) | |
parent | 6034371ee9ca34b3926e174b5cfb207e747446f1 (diff) |
CWS-TOOLING: integrate CWS aw084_OOO340
Diffstat (limited to 'sd')
-rwxr-xr-x | sd/source/ui/app/sdxfer.cxx | 4 | ||||
-rwxr-xr-x | sd/source/ui/view/sdview2.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 48a1f35436e9..cf59df42c85b 100755 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -345,7 +345,9 @@ void SdTransferable::CreateData() if( 1 == mpSdDrawDocumentIntern->GetPageCount() ) { - Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect() ).TopLeft() ); + // #112978# need to use GetAllMarkedBoundRect instead of GetAllMarkedRect to get + // fat lines correctly + Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedBoundRect() ).TopLeft() ); Size aVector( -aOrigin.X(), -aOrigin.Y() ); for( sal_uLong nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ ) diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 73f48323312f..0236af7d5fcf 100755 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -136,7 +136,9 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent pTransferable->SetWorkDocument( (SdDrawDocument*) GetAllMarkedModel() ); mpDoc->CreatingDataObj( NULL ); - const Rectangle aMarkRect( GetAllMarkedRect() ); + // #112978# need to use GetAllMarkedBoundRect instead of GetAllMarkedRect to get + // fat lines correctly + const Rectangle aMarkRect( GetAllMarkedBoundRect() ); TransferableObjectDescriptor aObjDesc; String aDisplayName; SdrOle2Obj* pSdrOleObj = NULL; |