diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 13:12:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 13:12:14 +0000 |
| commit | f2536d80624e71bc0f71211a065359a4bb08ae23 (patch) | |
| tree | 763815464afc790f52561b06045eac0678ce6208 /sd/source/ui/func/futext.cxx | |
| parent | 8a6b590210c03132be9751adbac8d99bc0f55cd1 (diff) | |
INTEGRATION: CWS impress150 (1.65.26); FILE MERGED
2008/07/28 09:30:42 cl 1.65.26.1: fixed a merge conflict
Diffstat (limited to 'sd/source/ui/func/futext.cxx')
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 835d30459bb1..cf0cbd1b21d6 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -8,9 +8,9 @@ * * $RCSfile: futext.cxx,v $ <<<<<<< futext.cxx - * $Revision: 1.65 $ + * $Revision: 1.66 $ ======= - * $Revision: 1.65 $ + * $Revision: 1.66 $ >>>>>>> 1.63.50.1 * * This file is part of OpenOffice.org. @@ -438,13 +438,18 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) aDragTimer.Start(); } - // we need to pick again since SdrEndTextEdit can rebuild the handles list - eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); - if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) ) + + if ( ! rMEvt.IsRight()) { - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); + // we need to pick again since SdrEndTextEdit can rebuild the handles list + 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); + } } + bReturn = true; } } else if ( nSlotId != SID_TEXTEDIT && |