From 5fe7af21c223461f422b49d3fd5192e45d642fd9 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 25 Jun 2008 14:49:41 +0000 Subject: [PATCH] INTEGRATION: CWS impressmuc (1.64.28); FILE MERGED 2008/06/24 16:25:55 cl 1.64.28.1: #i87291# allow moving of shapes --- sd/source/ui/func/futext.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index a84461af530d..835d30459bb1 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -7,7 +7,11 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: futext.cxx,v $ - * $Revision: 1.64 $ +<<<<<<< futext.cxx + * $Revision: 1.65 $ +======= + * $Revision: 1.65 $ +>>>>>>> 1.63.50.1 * * This file is part of OpenOffice.org. * @@ -435,7 +439,8 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) } // we need to pick again since SdrEndTextEdit can rebuild the handles list - if( mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt) == SDRHIT_HANDLE ) + eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) ) { USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog);