mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i120393# Corrected paste position of objects...

Browse Source 
with geometry outside their logic definition

(cherry picked from commit 658c1d82654af635bfbd6790fab2da8664d163eb)

Conflicts:
	sd/source/ui/view/sdview3.cxx

Change-Id: I4451956ab71d50e2ffec63ca17e0051d85823669
This commit is contained in:
Armin Le Grand
2012-11-14 16:23:23 +00:00
committed by Caolán McNamara
parent bdfac6fdb5
commit c856a390ab
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sd/source/ui/view/sdview3.cxx
View File

@@ -616,8 +616,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// Use SnapRect, not BoundRect // #i120393# Clipboard data uses full object geometry range
Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 );
maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 );
@@ -780,8 +780,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( pOwnData ) if( pOwnData )
{ {
// Use SnapRect, not BoundRect // #i120393# Clipboard data uses full object geometry range
Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 );
maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 );
@@ -846,8 +846,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( pOwnData ) if( pOwnData )
{ {
// Use SnapRect, not BoundRect // #i120393# Clipboard data uses full object geometry range
Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 );
maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); maDropPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 );
@@ -1167,8 +1167,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// Use SnapRect, not BoundRect // #i120393# Clipboard data uses full object geometry range
Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 );
aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 );
@@ -1198,8 +1198,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// Use SnapRect, not BoundRect // #i120393# Clipboard data uses full object geometry range
Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 );
aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 );
@@ -1224,8 +1224,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// Use SnapRect, not BoundRect // #i120393# Clipboard data uses full object geometry range
Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 );
aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 );