diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:18:47 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:18:47 +0000 |
commit | e9b4686c266610a96d4f3102d289d4e9c9a95b82 (patch) | |
tree | 9c4038575523331f7e4bec70b5137b19bd4cb05c /sw/source/ui/ribbar | |
parent | 434b73a9c193877e1914c915923338604802bcdb (diff) |
INTEGRATION: CWS aw024 (1.13.68); FILE MERGED
2006/09/22 02:23:48 aw 1.13.68.6: RESYNC: (1.15-1.16); FILE MERGED
2006/09/08 20:54:18 aw 1.13.68.5: RESYNC: (1.14-1.15); FILE MERGED
2006/07/27 15:52:24 aw 1.13.68.4: #114408# adaptions for SC
2005/09/17 22:46:29 aw 1.13.68.3: RESYNC: (1.13-1.14); FILE MERGED
2005/05/19 12:15:25 aw 1.13.68.2: #i39529#
2005/04/26 15:09:16 aw 1.13.68.1: #i39528#
Diffstat (limited to 'sw/source/ui/ribbar')
-rw-r--r-- | sw/source/ui/ribbar/drawbase.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index f8fc043dc6ea..735ede3067a2 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drawbase.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:11:14 $ + * last change: $Author: ihi $ $Date: 2006-11-14 15:18:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -187,7 +187,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) * Klebepunkt einfuegen ******************************************************************/ bNoInterrupt = TRUE; - bReturn = pSdrView->BegInsObjPoint(aStartPos, rMEvt.IsMod1(), NULL, 0); + bReturn = pSdrView->BegInsObjPoint(aStartPos, rMEvt.IsMod1()); pWin->SetDrawAction(TRUE); } else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1()) @@ -198,7 +198,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) if (!rMEvt.IsShift()) pSdrView->UnmarkAllPoints(); - bReturn = pSdrView->BegMarkPoints(aStartPos, (OutputDevice*) NULL); + bReturn = pSdrView->BegMarkPoints(aStartPos); pWin->SetDrawAction(TRUE); } else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2()) @@ -220,7 +220,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) if (!rMEvt.IsShift()) { pSdrView->UnmarkAllPoints(); - pHdl = pSdrView->HitHandle(aStartPos, *pWin); + pHdl = pSdrView->PickHandle(aStartPos); } else { @@ -231,7 +231,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) } else { - pHdl = pSdrView->HitHandle(aStartPos, *pWin); + pHdl = pSdrView->PickHandle(aStartPos); } } |