diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-07-12 14:28:32 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-07-12 14:28:32 +0000 |
commit | ead528c5d359ee9633a1cf94dd1df623f932bf49 (patch) | |
tree | 3a9dc3ec57b140d7a361b2defb162c8dc868494d /sc/source/ui/drawfunc/fuconstr.cxx | |
parent | f6e81657f1a7ff00a52e37f63d67d660a97c215e (diff) |
INTEGRATION: CWS aw013 (1.4.468); FILE MERGED
2004/06/24 09:30:41 aw 1.4.468.1: #i29181#
Diffstat (limited to 'sc/source/ui/drawfunc/fuconstr.cxx')
-rw-r--r-- | sc/source/ui/drawfunc/fuconstr.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 2552624146d7..b329cadf20c4 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuconstr.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2002-07-18 09:53:04 $ + * last change: $Author: rt $ $Date: 2004-07-12 15:28:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -307,7 +307,7 @@ BOOL __EXPORT FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, 1); bReturn = TRUE; } - else if ( pView->HasMarkedObj() ) + else if ( pView->AreObjectsMarked() ) { pView->UnmarkAll(); bReturn = TRUE; @@ -384,9 +384,9 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) USHORT nClicks = rMEvt.GetClicks(); if ( nClicks == 2 && rMEvt.IsLeft() ) { - if ( pView->HasMarkedObj() ) + if ( pView->AreObjectsMarked() ) { - const SdrMarkList& rMarkList = pView->GetMarkList(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if (rMarkList.GetMarkCount() == 1) { SdrMark* pMark = rMarkList.GetMark(0); @@ -446,12 +446,12 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) { pWindow->ReleaseMouse(); - if ( !pView->HasMarkedObj() && rMEvt.GetClicks() < 2 ) + if ( !pView->AreObjectsMarked() && rMEvt.GetClicks() < 2 ) { pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1()); SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher(); - if ( pView->HasMarkedObj() ) + if ( pView->AreObjectsMarked() ) rDisp.Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); else rDisp.Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); |