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

#100689#: don't allow zooming while UIActive

Browse source
This commit is contained in:
Kai Ahrens 2002-08-20 12:03:50 +00:00
parent 08da86e9ca
commit a1722e1e9f
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sd/source/ui/view/viewshel.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewshel.cxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: af $ $Date: 2002-07-25 10:07:40 $
* last change: $Author: ka $ $Date: 2002-08-20 13:03:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -704,17 +704,20 @@ void SdViewShell::Command(const CommandEvent& rCEvt, SdWindow* pWin)
if( pData && pData->IsMod1() )
{
const long nOldZoom = pWindow->GetZoom();
long nNewZoom;
if( !pDocSh->IsUIActive() )
{
const long nOldZoom = pWindow->GetZoom();
long nNewZoom;
if( pData->GetDelta() < 0L )
nNewZoom = Max( (long) pWin->GetMinZoom(), (long)(nOldZoom - DELTA_ZOOM) );
else
nNewZoom = Min( (long) pWin->GetMaxZoom(), (long)(nOldZoom + DELTA_ZOOM) );
if( pData->GetDelta() < 0L )
nNewZoom = Max( (long) pWin->GetMinZoom(), (long)(nOldZoom - DELTA_ZOOM) );
else
nNewZoom = Min( (long) pWin->GetMaxZoom(), (long)(nOldZoom + DELTA_ZOOM) );
SetZoom( nNewZoom );
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
bDone = TRUE;
SetZoom( nNewZoom );
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
bDone = TRUE;
}
}
else
{