You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/11/14 18:23:24 UTC
svn commit: r1409264 -
/incubator/ooo/trunk/main/sd/source/ui/view/sdview3.cxx
Author: alg
Date: Wed Nov 14 17:23:23 2012
New Revision: 1409264
URL: http://svn.apache.org/viewvc?rev=1409264&view=rev
Log:
#120393# Corrected paste position of objects with geometry outside their logic definition
Modified:
incubator/ooo/trunk/main/sd/source/ui/view/sdview3.cxx
Modified: incubator/ooo/trunk/main/sd/source/ui/view/sdview3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/view/sdview3.cxx?rev=1409264&r1=1409263&r2=1409264&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/view/sdview3.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/view/sdview3.cxx Wed Nov 14 17:23:23 2012
@@ -650,8 +650,8 @@ sal_Bool View::InsertData( const Transfe
pWorkPage->SetRectsDirty();
- // #104148# Use SnapRect, not BoundRect
- Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() );
+ // #120393# 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 );
@@ -803,8 +803,8 @@ sal_Bool View::InsertData( const Transfe
if( pOwnData )
{
- // #104148# Use SnapRect, not BoundRect
- Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() );
+ // #120393# 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 );
@@ -869,8 +869,8 @@ sal_Bool View::InsertData( const Transfe
if( pOwnData )
{
- // #104148# Use SnapRect, not BoundRect
- Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() );
+ // #120393# 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 );
@@ -1205,8 +1205,8 @@ sal_Bool View::InsertData( const Transfe
pWorkPage->SetRectsDirty();
- // #104148# Use SnapRect, not BoundRect
- Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() );
+ // #120393# 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 );
@@ -1236,8 +1236,8 @@ sal_Bool View::InsertData( const Transfe
pWorkPage->SetRectsDirty();
- // #104148# Use SnapRect, not BoundRect
- Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() );
+ // #120393# 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 );
@@ -1262,8 +1262,8 @@ sal_Bool View::InsertData( const Transfe
pWorkPage->SetRectsDirty();
- // #104148# Use SnapRect, not BoundRect
- Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() );
+ // #120393# 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 );