diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-12 14:27:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-12 14:27:46 +0000 |
| commit | 9242abeba55ce888baddae10b18d7796b2edab69 (patch) | |
| tree | 00227a559b5b727d92d2c9a6a1f8d6f01178f4c3 /sc | |
| parent | 7cf75645d0ccbd0e40bb871674c64749def2ef13 (diff) | |
INTEGRATION: CWS aw013 (1.12.4); FILE MERGED
2004/06/29 12:52:52 aw 1.12.4.2: RESYNC: (1.12-1.13); FILE MERGED
2004/06/24 09:30:41 aw 1.12.4.1: #i29181#
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh5.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 3077ef9f6edb..6420950e51a8 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh5.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2004-06-04 11:26:35 $ + * last change: $Author: rt $ $Date: 2004-07-12 15:27:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,7 @@ using namespace com::sun::star; void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink { ScDrawView* pView = pViewData->GetScDrawView(); - const SdrMarkList& rMarkList = pView->GetMarkList(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); ULONG nMarkCount = rMarkList.GetMarkCount(); // Hyperlink @@ -203,7 +203,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) if ( eMode == HLINK_DEFAULT || eMode == HLINK_BUTTON ) { ScDrawView* pView = pViewData->GetScDrawView(); - const SdrMarkList& rMarkList = pView->GetMarkList(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if ( rMarkList.GetMarkCount() == 1 ) { SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, rMarkList.GetMark(0)->GetObj()); @@ -306,7 +306,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) rBindings.Invalidate(SID_OBJECT_HEAVEN); rBindings.Invalidate(SID_OBJECT_HELL); // leave draw shell if nothing selected (layer may be locked) - if ( pView->GetMarkList().GetMarkCount() == 0 ) + if ( pView->GetMarkedObjectList().GetMarkCount() == 0 ) pViewData->GetViewShell()->SetDrawShell( FALSE ); break; @@ -508,7 +508,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) case SID_RENAME_OBJECT: { - const SdrMarkList& rMarkList = pView->GetMarkList(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if ( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetObj(); @@ -623,7 +623,7 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog ) void ScDrawShell::ExecFormText(SfxRequest& rReq) { ScDrawView* pDrView = pViewData->GetScDrawView(); - const SdrMarkList& rMarkList = pDrView->GetMarkList(); + const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() ) { |