diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:48:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:48:45 +0000 |
| commit | 29cbeba0e360f661e131d7fc23c29cdd15223682 (patch) | |
| tree | 411c5d508df60c1c9c14ecf95f6950e3a9989e08 /sd/source/ui/view/drviews4.cxx | |
| parent | INTEGRATION: CWS aw035 (1.36.112); FILE MERGED (diff) | |
| download | core-29cbeba0e360f661e131d7fc23c29cdd15223682.tar.gz core-29cbeba0e360f661e131d7fc23c29cdd15223682.zip | |
INTEGRATION: CWS aw035 (1.31.148); FILE MERGED
2006/07/13 16:05:17 aw 1.31.148.1: #126320# SdrMark::GetObj() -> SdrMark::GetMarkedSdrObj() for isolating selection handling
Diffstat (limited to 'sd/source/ui/view/drviews4.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews4.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 8a58ba1705da..4e85fe5e6a62 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews4.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: rt $ $Date: 2006-02-07 10:13:46 $ + * last change: $Author: rt $ $Date: 2006-07-25 11:48:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -244,7 +244,7 @@ BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) SdrMark* pMark = rMarkList.GetMark(0); // remember which object was the text in edit mode - SdrObject* pOldObj = pMark->GetObj(); + SdrObject* pOldObj = pMark->GetMarkedSdrObj(); // end text edit now GetView()->EndTextEdit(); @@ -683,7 +683,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if (pDrView->AreObjectsMarked() && pDrView->GetMarkedObjectList().GetMarkCount() == 1 ) { - SdrObject* pObj = pDrView->GetMarkedObjectList().GetMark(0)->GetObj(); + SdrObject* pObj = pDrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); if( HasCurrentFunction(SID_BEZIER_EDIT) && pObj->ISA(SdrPathObj) ) { @@ -827,7 +827,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) else if (pDrView->AreObjectsMarked() && pDrView->GetMarkedObjectList().GetMarkCount() > 1 ) { - // SdrObject* pObj = pDrView->GetMarkedObjectList().GetMark(0)->GetObj(); + // SdrObject* pObj = pDrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); nSdResId = bGraphicShell ? RID_GRAPHIC_MULTISELECTION_POPUP : RID_DRAW_MULTISELECTION_POPUP; |