diff options
author | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:48:31 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:48:31 +0000 |
commit | 1416a62b9367e0435c0b852b88d21ae4413d0209 (patch) | |
tree | 603e1eb64c5de0d7f26cd3536cfc70878002cb9c /sd/source | |
parent | a712f464749f2744efbc34f07a0c67b42f695ce3 (diff) |
INTEGRATION: CWS aw035 (1.36.112); FILE MERGED
2006/07/13 16:05:17 aw 1.36.112.1: #126320# SdrMark::GetObj() -> SdrMark::GetMarkedSdrObj() for isolating selection handling
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/view/drviews3.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 6a40e5d23e77..d4fe32061298 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews3.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: obo $ $Date: 2006-03-21 17:43:22 $ + * last change: $Author: rt $ $Date: 2006-07-25 11:48:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -473,7 +473,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (rMarkList.GetMarkCount() == 1) { SdrMark* pMark = rMarkList.GetMark(0); - SdrObject* pObj = pMark->GetObj(); + SdrObject* pObj = pMark->GetMarkedSdrObj(); UINT16 nSdrObjKind = pObj->GetObjIdentifier(); @@ -871,7 +871,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) { if( pDrView->IsTextEdit() ) { - SdrObject* pObj = pDrView->GetMarkedObjectList().GetMark( 0 )->GetObj(); + SdrObject* pObj = pDrView->GetMarkedObjectList().GetMark( 0 )->GetMarkedSdrObj(); if( pObj->GetObjInventor() == SdrInventor) { SfxItemSet aEditAttr( GetDoc()->GetPool() ); |