Skip to content

C
core
Kaydet (Commit) c856a390 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

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

with geometry outside their logic definition

(cherry picked from commit 658c1d82)

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

Change-Id: I4451956ab71d50e2ffec63ca17e0051d85823669
üst bdfac6fd
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
sd/source/ui/view/sdview3.cxx
Dosyayı görüntüle @ c856a390
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment