diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-07-12 14:16:41 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-07-12 14:16:41 +0000 |
commit | 98059e6f53c0bba850c93b1e645e53cf7668aa75 (patch) | |
tree | e8414dee7ab528d941e4d9b5061b6c7e2b3ff99e /sd/source/ui/view/drviews3.cxx | |
parent | INTEGRATION: CWS aw013 (1.29.34); FILE MERGED (diff) | |
download | core-98059e6f53c0bba850c93b1e645e53cf7668aa75.tar.gz core-98059e6f53c0bba850c93b1e645e53cf7668aa75.zip |
INTEGRATION: CWS aw013 (1.25.30); FILE MERGED
2004/06/24 09:33:16 aw 1.25.30.1: #i29181#
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
-rw-r--r-- | sd/source/ui/view/drviews3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index e30ff430411e..9e314500d693 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews3.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2004-05-13 16:33:22 $ + * last change: $Author: rt $ $Date: 2004-07-12 15:16:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -473,9 +473,9 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) (SfxRectangleItem&)rReq.GetArgs()->Get(SID_OBJECTRESIZE); Rectangle aRect( pWindow->PixelToLogic( rRect.GetValue() ) ); - if ( pDrView->HasMarkedObj() ) + if ( pDrView->AreObjectsMarked() ) { - const SdrMarkList& rMarkList = pDrView->GetMarkList(); + const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); if (rMarkList.GetMarkCount() == 1) { @@ -875,11 +875,11 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) const sal_Bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, bRTL)); - if( pDrView->HasMarkedObj() ) + if( pDrView->AreObjectsMarked() ) { if( pDrView->IsTextEdit() ) { - SdrObject* pObj = pDrView->GetMarkList().GetMark( 0 )->GetObj(); + SdrObject* pObj = pDrView->GetMarkedObjectList().GetMark( 0 )->GetObj(); if( pObj->GetObjInventor() == SdrInventor) { SfxItemSet aEditAttr( GetDoc()->GetPool() ); |