strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw013 (1.20.30); FILE MERGED

Browse source 
2004/06/29 11:41:05 aw 1.20.30.2: RESYNC: (1.20-1.21); FILE MERGED
2004/06/24 09:33:18 aw 1.20.30.1: #i29181#
This commit is contained in:
Rüdiger Timm 2004-07-12 14:19:19 +00:00
parent 638e09cd30
commit 6da096ce85
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sd/source/ui/view/drviewsa.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drviewsa.cxx,v $
*
* $Revision: 1.23 $
* $Revision: 1.24 $
*
* last change: $Author: obo $ $Date: 2004-07-06 12:26:48 $
* last change: $Author: rt $ $Date: 2004-07-12 15:19:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -964,7 +964,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
SdrPageView* pPageView = pDrView->GetPageViewPvNum( 0 );
if( ( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) )
// || ( pDrView->GetMarkList().GetMarkCount() == 0 ) )
// || ( pDrView->GetMarkedObjectList().GetMarkCount() == 0 ) )
{
nZoomValues &= ~SVX_ZOOM_ENABLE_OPTIMAL;
}
@ -1004,7 +1004,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
}
else
{
if ( pDrView->HasMarkedObj() )
if ( pDrView->AreObjectsMarked() )
{
Rectangle aRect = pDrView->GetAllMarkedRect();
pDrView->GetPageViewPvNum(0)->LogicToPagePos(aRect);
@ -1046,7 +1046,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
SdrLayerID nLayer, nOldLayer;
SdrLayer* pLayer = NULL;
SdrObject* pObj = NULL;
const SdrMarkList& rMarkList = pDrView->GetMarkList();
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
ULONG nMarkCount = rMarkList.GetMarkCount();
FASTBOOL bOneLayer = TRUE;