Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33BD4D3C0 for ; Thu, 15 Nov 2012 14:20:19 +0000 (UTC) Received: (qmail 47237 invoked by uid 500); 15 Nov 2012 14:20:19 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 46046 invoked by uid 500); 15 Nov 2012 14:20:11 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 45753 invoked by uid 500); 15 Nov 2012 14:20:10 -0000 Delivered-To: apmail-incubator-ooo-commits@incubator.apache.org Received: (qmail 45749 invoked by uid 99); 15 Nov 2012 14:20:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2012 14:20:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2012 14:20:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D4A7C238897F; Thu, 15 Nov 2012 14:19:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1409799 - /incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx Date: Thu, 15 Nov 2012 14:19:45 -0000 To: ooo-commits@incubator.apache.org From: alg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121115141945.D4A7C238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); }