diff options
| author | Armin Le Grand <alg@apache.org> | 2012-11-14 16:23:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-12 17:16:53 +0100 |
| commit | c856a390abbf278a6c4c80f36c8e64d15554a1ae (patch) | |
| tree | 942feddf3fa81e3bb2ddd6184ea1bf51f35735dd /sd | |
| parent | Corrected bitmap scaler to not create 24bit outputs for scaling masks/alphas (diff) | |
| download | core-c856a390abbf278a6c4c80f36c8e64d15554a1ae.tar.gz core-c856a390abbf278a6c4c80f36c8e64d15554a1ae.zip | |
Resolves: #i120393# Corrected paste position of objects...
with geometry outside their logic definition
(cherry picked from commit 658c1d82654af635bfbd6790fab2da8664d163eb)
Conflicts:
sd/source/ui/view/sdview3.cxx
Change-Id: I4451956ab71d50e2ffec63ca17e0051d85823669
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 38079c51e968..94b2abb82a41 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -616,8 +616,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // Use SnapRect, not BoundRect - Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); + // #i120393# Clipboard data uses full object geometry range + const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); @@ -780,8 +780,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData ) { - // Use SnapRect, not BoundRect - Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); + // #i120393# Clipboard data uses full object geometry range + const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); @@ -846,8 +846,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData ) { - // Use SnapRect, not BoundRect - Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); + // #i120393# Clipboard data uses full object geometry range + const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); @@ -1167,8 +1167,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // Use SnapRect, not BoundRect - Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); + // #i120393# Clipboard data uses full object geometry range + const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); @@ -1198,8 +1198,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // Use SnapRect, not BoundRect - Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); + // #i120393# Clipboard data uses full object geometry range + const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); @@ -1224,8 +1224,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // Use SnapRect, not BoundRect - Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); + // #i120393# Clipboard data uses full object geometry range + const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); |