Skip to content

C
core
Kaydet (Commit) 658c1d82 authored tarafından Armin Le Grand's avatar Armin Le Grand
Dosyalara gözat
Seçenekler

#120393# Corrected paste position of objects with geometry outside their logic definition

üst c8d736bc
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
sd/source/ui/view/sdview3.cxx
Dosyayı görüntüle @ 658c1d82
...@@ -650,8 +650,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, ...@@ -650,8 +650,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// #104148# Use SnapRect, not BoundRect // #120393# 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 );
...@@ -803,8 +803,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, ...@@ -803,8 +803,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( pOwnData ) if( pOwnData )
{ {
// #104148# Use SnapRect, not BoundRect // #120393# 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 );
...@@ -869,8 +869,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, ...@@ -869,8 +869,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( pOwnData ) if( pOwnData )
{ {
// #104148# Use SnapRect, not BoundRect // #120393# 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 );
...@@ -1205,8 +1205,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, ...@@ -1205,8 +1205,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// #104148# Use SnapRect, not BoundRect // #120393# 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 );
...@@ -1236,8 +1236,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, ...@@ -1236,8 +1236,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// #104148# Use SnapRect, not BoundRect // #120393# 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 );
...@@ -1262,8 +1262,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, ...@@ -1262,8 +1262,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty(); pWorkPage->SetRectsDirty();
// #104148# Use SnapRect, not BoundRect // #120393# 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 );
......
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