diff options
Diffstat (limited to 'sd/source/ui/view/drviewsd.cxx')
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/view/drviewsd.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 7e0dff5eeede..c8b5c1939133 100644..100755 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -70,13 +70,13 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) { CheckLineTo (rReq); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_NAVIGATOR_INIT: { - USHORT nId = SID_NAVIGATOR; + sal_uInt16 nId = SID_NAVIGATOR; SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId ); if( pWindow ) { @@ -124,7 +124,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) case PAGE_NEXT: { // Sprung zu naechster Seite - USHORT nSdPage = (mpActualPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (mpActualPage->GetPageNum() - 1) / 2; if (nSdPage < GetDoc()->GetSdPageCount(mpActualPage->GetPageKind()) - 1) { @@ -136,7 +136,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) case PAGE_PREVIOUS: { // Sprung zu vorheriger Seite - USHORT nSdPage = (mpActualPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (mpActualPage->GetPageNum() - 1) / 2; if (nSdPage > 0) { @@ -161,7 +161,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) SfxStringItem aReferer(SID_REFERER, GetDocSh()->GetMedium()->GetName()); SfxViewFrame* pFrame = GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem(SID_BROWSE, TRUE); + SfxBoolItem aBrowseItem(SID_BROWSE, sal_True); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); @@ -186,11 +186,11 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) { - UINT32 nState = NAVSTATE_NONE; - USHORT nCurrentPage = 0; - USHORT nFirstPage = 0; - USHORT nLastPage; - BOOL bEndless = FALSE; + sal_uInt32 nState = NAVSTATE_NONE; + sal_uInt16 nCurrentPage = 0; + sal_uInt16 nFirstPage = 0; + sal_uInt16 nLastPage; + sal_Bool bEndless = sal_False; String aPageName; rtl::Reference< SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); @@ -199,9 +199,9 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) // pen activated? nState |= xSlideshow->isDrawingPossible() ? NAVBTN_PEN_CHECKED : NAVBTN_PEN_UNCHECKED; - nCurrentPage = (USHORT)xSlideshow->getCurrentPageNumber(); - nFirstPage = (USHORT)xSlideshow->getFirstPageNumber(); - nLastPage = (USHORT)xSlideshow->getLastPageNumber(); + nCurrentPage = (sal_uInt16)xSlideshow->getCurrentPageNumber(); + nFirstPage = (sal_uInt16)xSlideshow->getFirstPageNumber(); + nLastPage = (sal_uInt16)xSlideshow->getLastPageNumber(); bEndless = xSlideshow->isEndless(); // Get the page for the current page number. |