INTEGRATION: CWS impress16 (1.5.40); FILE MERGED

2004/11/02 13:21:15 af 1.5.40.2: RESYNC: (1.5-1.6); FILE MERGED
2004/10/25 11:33:36 af 1.5.40.1: #i32465# PageUp/Down goes to previous/next page.
This commit is contained in:
Jens-Heiner Rechtien
2004-11-26 14:01:32 +00:00
parent 6ca3d0e94a
commit e578dc0f20

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: SlsSelectionFunction.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: pjunck $ $Date: 2004-10-28 13:29:56 $
* last change: $Author: hr $ $Date: 2004-11-26 15:01:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -600,19 +600,15 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent)
bResult = TRUE;
break;
// Scroll up but don't move the focus indicator.
// Go to previous page. No wrap around.
case KEY_PAGEUP:
ScrollStart();
pViewShell->ScrollLines (0, -10);
ScrollEnd();
GotoNextPage(-1);
bResult = TRUE;
break;
// Scroll down but don't move the focus indicator.
// Go to next page. No wrap around..
case KEY_PAGEDOWN:
ScrollStart();
pViewShell->ScrollLines (0, +10);
ScrollEnd();
GotoNextPage(+1);
bResult = TRUE;
break;
@@ -984,4 +980,21 @@ void SelectionFunction::SetCurrentPageAndSwitchView (
void SelectionFunction::GotoNextPage (int nOffset)
{
SdPage* pPage = mrController.GetViewShell().GetActualPage();
sal_Int32 nIndex = (pPage->GetPageNum()-1) / 2;
nIndex += nOffset;
USHORT nPageCount = mrController.GetModel().GetPageCount();
if (nIndex >= nPageCount)
nIndex = nPageCount - 1;
if (nIndex < 0)
nIndex = 0;
mrController.GetPageSelector().SetCurrentPage(nIndex);
}
} } } // end of namespace ::sd::slidesorter::controller