diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:48:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 10:48:59 +0000 |
| commit | e512a5bc3873d6ff649b1c7a8103ef2fffef53f4 (patch) | |
| tree | afc1a04ec54e6de6828df33a758fd8c96ab01fb9 /sd/source/ui/view/drviews6.cxx | |
| parent | 29cbeba0e360f661e131d7fc23c29cdd15223682 (diff) | |
INTEGRATION: CWS aw035 (1.21.182); FILE MERGED
2006/07/13 16:05:18 aw 1.21.182.1: #126320# SdrMark::GetObj() -> SdrMark::GetMarkedSdrObj() for isolating selection handling
Diffstat (limited to 'sd/source/ui/view/drviews6.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index e6aa1bbe347a..bb54a7fb69af 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews6.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2005-12-14 17:27:47 $ + * last change: $Author: rt $ $Date: 2006-07-25 11:48:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -186,7 +186,7 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq) GetChildWindow(nId)->GetWindow(); pDlg->CreateStdFormObj(*pDrView, *pDrView->GetPageViewPvNum(0), - rSet, *rMarkList.GetMark(0)->GetObj(), + rSet, *rMarkList.GetMark(0)->GetMarkedSdrObj(), ((const XFormTextStdFormItem*) pItem)-> GetValue()); @@ -219,7 +219,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) pDlg = (SvxFontWorkDialog*)(GetViewFrame()->GetChildWindow(nId)->GetWindow()); if ( rMarkList.GetMarkCount() == 1 ) - pObj = rMarkList.GetMark(0)->GetObj(); + pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); if ( pObj == NULL || !pObj->ISA(SdrTextObj) || !((SdrTextObj*) pObj)->HasText() ) @@ -350,7 +350,7 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) nValue = 3; else // 1 Objekt { - const SdrObject* pObj = rMarkList.GetMark( 0 )->GetObj(); + const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); UINT32 nInv = pObj->GetObjInventor(); UINT16 nId = pObj->GetObjIdentifier(); // 1 selektiertes Gruppenobjekt @@ -458,7 +458,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) case ( SID_BMPMASK_EXEC ) : { - SdrGrafObj* pObj = (SdrGrafObj*) pDrView->GetMarkedObjectList().GetMark(0)->GetObj(); + SdrGrafObj* pObj = (SdrGrafObj*) pDrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); if ( pObj && !pDrView->IsTextEdit() ) { @@ -535,7 +535,7 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) } if ( rMarkList.GetMarkCount() == 1 ) - pObj = rMarkList.GetMark(0)->GetObj(); + pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); // valid graphic object? if( pObj && pObj->ISA( SdrGrafObj ) && !( (SdrGrafObj*) pObj )->IsEPS() && !pDrView->IsTextEdit() ) |