openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1409799 - /incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx
Date Thu, 15 Nov 2012 14:19:45 GMT
Author: alg
Date: Thu Nov 15 14:19:44 2012
New Revision: 1409799

URL: http://svn.apache.org/viewvc?rev=1409799&view=rev
Log:
#121334# Adapted to aw080 for better resyncs

Modified:
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx?rev=1409799&r1=1409798&r2=1409799&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx Thu Nov 15 14:19:44
2012
@@ -646,8 +646,8 @@ bool View::InsertData( const Transferabl
 		    SdDrawDocument*	pWorkModel = (SdDrawDocument*) pOwnData->GetWorkDocument();
 		    SdPage*			pWorkPage = (SdPage*) pWorkModel->GetSdPage( 0, PK_STANDARD );
 
-			// #104148# Use SnapRect, not BoundRect
-			const basegfx::B2DVector aOffset(sdr::legacy::GetAllObjSnapRange(pWorkPage->getSdrObjectVector()).getRange());
+            // #120393# Clipboard data uses full object geometry range
+			const basegfx::B2DVector aOffset(sdr::legacy::GetAllObjBoundRange(pWorkPage->getSdrObjectVector()).getRange());
 			maDropPos = pOwnData->GetStartPos() + (aOffset * 0.5);
 
 		    // delete pages, that are not of any interest for us
@@ -794,8 +794,8 @@ bool View::InsertData( const Transferabl
 
 					if( pOwnData )
 					{
-						// #104148# Use SnapRect, not BoundRect
-						const basegfx::B2DVector aOffset(sdr::legacy::GetAllObjSnapRange(pWorkPage->getSdrObjectVector()).getRange());
+                        // #120393# Clipboard data uses full object geometry range
+						const basegfx::B2DVector aOffset(sdr::legacy::GetAllObjBoundRange(pWorkPage->getSdrObjectVector()).getRange());
 						maDropPos = pOwnData->GetStartPos() + (aOffset * 0.5);
 					}
 
@@ -859,8 +859,8 @@ bool View::InsertData( const Transferabl
 
 					if( pOwnData )
 					{
-						// #104148# Use SnapRect, not BoundRect
-						const basegfx::B2DVector aOffset(sdr::legacy::GetAllObjSnapRange(pWorkPage->getSdrObjectVector()).getRange());
+                        // #120393# Clipboard data uses full object geometry range
+						const basegfx::B2DVector aOffset(sdr::legacy::GetAllObjBoundRange(pWorkPage->getSdrObjectVector()).getRange());
 						maDropPos = pOwnData->GetStartPos() + (aOffset * 0.5);
 					}
 
@@ -1200,8 +1200,8 @@ bool View::InsertData( const Transferabl
                                                     pWorkModel->GetSdPage( 0, PK_STANDARD
) :
                                                     pWorkModel->GetPage( 0 ) );
 
-				// #104148# Use SnapRect, not BoundRect
-				const basegfx::B2DVector aRange(sdr::legacy::GetAllObjSnapRange(pWorkPage->getSdrObjectVector()).getRange());
+                // #120393# Clipboard data uses full object geometry range
+				const basegfx::B2DVector aRange(sdr::legacy::GetAllObjBoundRange(pWorkPage->getSdrObjectVector()).getRange());
 
 				aInsertPos = pOwnData->GetStartPos() + (aRange * 0.5);
 			}
@@ -1228,8 +1228,8 @@ bool View::InsertData( const Transferabl
                                                 pWorkModel->GetSdPage( 0, PK_STANDARD
) :
                                                 pWorkModel->GetPage( 0 ) );
 
-			// #104148# Use SnapRect, not BoundRect
-			const basegfx::B2DVector aRange(sdr::legacy::GetAllObjSnapRange(pWorkPage->getSdrObjectVector()).getRange());
+            // #120393# Clipboard data uses full object geometry range
+			const basegfx::B2DVector aRange(sdr::legacy::GetAllObjBoundRange(pWorkPage->getSdrObjectVector()).getRange());
 
 			aInsertPos = pOwnData->GetStartPos() + (aRange * 0.5);
 		}
@@ -1251,8 +1251,8 @@ bool View::InsertData( const Transferabl
                                                     pWorkModel->GetSdPage( 0, PK_STANDARD
) :
                                                     pWorkModel->GetPage( 0 ) );
 
-				// #104148# Use SnapRect, not BoundRect
-				const basegfx::B2DVector aSize(sdr::legacy::GetAllObjSnapRange(pWorkPage->getSdrObjectVector()).getRange());
+                // #120393# Clipboard data uses full object geometry range
+				const basegfx::B2DVector aSize(sdr::legacy::GetAllObjBoundRange(pWorkPage->getSdrObjectVector()).getRange());
 
 				aInsertPos = pOwnData->GetStartPos() + (aSize * 0.5);
 			}



Mime
View raw message