diff options
Diffstat (limited to 'sw/source/ui/uiview/viewmdi.cxx')
-rw-r--r-- | sw/source/ui/uiview/viewmdi.cxx | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 9dfa8e79ecfa..84bce4002f11 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -83,7 +83,7 @@ #include <IDocumentSettingAccess.hxx> #include <PostItMgr.hxx> -USHORT SwView::nMoveType = NID_PGE; +sal_uInt16 SwView::nMoveType = NID_PGE; sal_Int32 SwView::nActMark = 0; @@ -92,16 +92,16 @@ sal_Int32 SwView::nActMark = 0; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; -void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, BOOL bViewOnly ) +void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly ) { _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly ); } void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, - short nFactor, BOOL bViewOnly ) + short nFactor, sal_Bool bViewOnly ) { - BOOL bUnLockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); + sal_Bool bUnLockView = !pWrtShell->IsViewLocked(); + pWrtShell->LockView( sal_True ); pWrtShell->LockPaint(); { @@ -109,7 +109,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, long nFac = nFactor; - BOOL bWeb = 0 != PTR_CAST(SwWebView, this); + sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this); SwMasterUsrPref *pUsrPref = (SwMasterUsrPref*)SW_MOD()->GetUsrPref(bWeb); const SwPageDesc &rDesc = pWrtShell->GetPageDesc( pWrtShell->GetCurPageDesc() ); @@ -182,19 +182,19 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, //MasterUsrPrefs updaten UND DANACH die ViewOptions der aktuellen //View updaten. if ( !bViewOnly && - (USHORT(nFac) != pUsrPref->GetZoom() || - BYTE (eZoomType) != pUsrPref->GetZoomType()) ) + (sal_uInt16(nFac) != pUsrPref->GetZoom() || + sal_uInt8 (eZoomType) != pUsrPref->GetZoomType()) ) { - pUsrPref->SetZoom ( USHORT(nFac) ); + pUsrPref->SetZoom ( sal_uInt16(nFac) ); pUsrPref->SetZoomType( eZoomType ); SW_MOD()->ApplyUsrPref( *pUsrPref, bViewOnly ? this: 0, bViewOnly ? VIEWOPT_DEST_VIEW_ONLY : 0 ); pUsrPref->SetModified(); } - if ( pOpt->GetZoom() != (USHORT) nFac ) + if ( pOpt->GetZoom() != (sal_uInt16) nFac ) { - aOpt.SetZoom ( USHORT(nFac) ); + aOpt.SetZoom ( sal_uInt16(nFac) ); aOpt.SetReadonly(pOpt->IsReadonly()); pWrtShell->ApplyViewOptions( aOpt ); } @@ -223,9 +223,9 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, ((SwViewOption*)pWrtShell->GetViewOptions())->SetZoomType( eZoomType ); CalcVisArea( rEditSize ); //fuer das Neuberechnen des sichtbaren Bereiches } - else if ( USHORT(nFac) != pOpt->GetZoom() ) + else if ( sal_uInt16(nFac) != pOpt->GetZoom() ) { - aOpt.SetZoom ( USHORT(nFac) ); + aOpt.SetZoom ( sal_uInt16(nFac) ); pWrtShell->ApplyViewOptions( aOpt ); } @@ -238,7 +238,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, } pWrtShell->UnlockPaint(); if( bUnLockView ) - pWrtShell->LockView( FALSE ); + pWrtShell->LockView( sal_False ); // if ( mpPostItMgr ) // { @@ -250,10 +250,10 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, // eZoom = eZoomType; } -void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly ) +void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewOnly ) { - const BOOL bUnLockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); + const sal_Bool bUnLockView = !pWrtShell->IsViewLocked(); + pWrtShell->LockView( sal_True ); pWrtShell->LockPaint(); { @@ -262,7 +262,7 @@ void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly ) if ( !GetViewFrame()->GetFrame().IsInPlace() && !bViewOnly ) { - const BOOL bWeb = 0 != PTR_CAST(SwWebView, this); + const sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this); SwMasterUsrPref *pUsrPref = (SwMasterUsrPref*)SW_MOD()->GetUsrPref(bWeb); //MasterUsrPrefs updaten UND DANACH die ViewOptions der aktuellen @@ -297,7 +297,7 @@ void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly ) pWrtShell->UnlockPaint(); if( bUnLockView ) - pWrtShell->LockView( FALSE ); + pWrtShell->LockView( sal_False ); SfxBindings& rBnd = GetViewFrame()->GetBindings(); rBnd.Invalidate( SID_ATTR_VIEWLAYOUT ); @@ -308,7 +308,7 @@ void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly ) * Scrollbar - Handler */ -int SwView::_CreateScrollbar( BOOL bHori ) +int SwView::_CreateScrollbar( sal_Bool bHori ) { Window *pMDI = &GetViewFrame()->GetWindow(); SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar; @@ -326,7 +326,7 @@ int SwView::_CreateScrollbar( BOOL bHori ) (*ppScrollbar)->SetScrollHdl( LINK( this, SwView, ScrollHdl )); (*ppScrollbar)->SetEndScrollHdl( LINK( this, SwView, EndScrollHdl )); - (*ppScrollbar)->EnableDrag( TRUE ); + (*ppScrollbar)->EnableDrag( sal_True ); if(GetWindow()) InvalidateBorder(); @@ -339,12 +339,12 @@ int SwView::_CreateScrollbar( BOOL bHori ) return 1; } -void SwView::CreatePageButtons(BOOL bShow) +void SwView::CreatePageButtons(sal_Bool bShow) { Window *pMDI = &GetViewFrame()->GetWindow(); - pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE ); + pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), sal_True ); pPageUpBtn->SetHelpId(HID_SCRL_PAGEUP); - pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE ); + pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), sal_False ); pPageDownBtn->SetHelpId(HID_SCRL_PAGEDOWN); Reference< XFrame > xFrame = GetViewFrame()->GetFrame().GetFrameInterface(); pNaviBtn = new SwNaviImageButton(pMDI, xFrame ); @@ -401,12 +401,12 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) case NID_GRF: case NID_OLE: { - USHORT eType = GOTOOBJ_FLY_FRM; + sal_uInt16 eType = GOTOOBJ_FLY_FRM; if(nMoveType == NID_GRF) eType = GOTOOBJ_FLY_GRF; else if(nMoveType == NID_OLE) eType = GOTOOBJ_FLY_OLE; - BOOL bSuccess = bNext ? + sal_Bool bSuccess = bNext ? rSh.GotoNextFly(eType) : rSh.GotoPrevFly(eType); if(bSuccess) @@ -502,7 +502,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) case NID_SRCH_REP: if(pSrchItem) { - BOOL bBackward = pSrchItem->GetBackward(); + sal_Bool bBackward = pSrchItem->GetBackward(); if(rSh.HasSelection() && !bNext == rSh.IsCrsrPtAtEnd()) rSh.SwapPam(); pSrchItem->SetBackward(!bNext); @@ -520,7 +520,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) break; case NID_TABLE_FORMULA_ERROR: - rSh.GotoNxtPrvTblFormula( bNext, TRUE ); + rSh.GotoNxtPrvTblFormula( bNext, sal_True ); break; } pThis->pEditWin->GrabFocus(); @@ -642,7 +642,7 @@ int SwView::KillVLineal() IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) { - USHORT nDefPage = 0; + sal_uInt16 nDefPage = 0; switch( pRuler->GetClickType() ) { case RULER_TYPE_DONTKNOW: @@ -669,7 +669,7 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) --------------------------------------------------*/ -USHORT SwView::GetMoveType() +sal_uInt16 SwView::GetMoveType() { return nMoveType; } @@ -677,11 +677,11 @@ USHORT SwView::GetMoveType() --------------------------------------------------*/ -void SwView::SetMoveType(USHORT nSet) +void SwView::SetMoveType(sal_uInt16 nSet) { - BOOL bLastPage = nMoveType == NID_PGE; + sal_Bool bLastPage = nMoveType == NID_PGE; nMoveType = nSet; - BOOL bNewPage = nMoveType == NID_PGE; + sal_Bool bNewPage = nMoveType == NID_PGE; if(bNewPage != bLastPage) { Color aColor(bNewPage ? COL_BLACK : VIEW_IMAGECOLOR); @@ -729,7 +729,7 @@ void SwView::ShowHScrollbar(sal_Bool bShow) sal_Bool SwView::IsHScrollbarVisible()const { DBG_ASSERT(pHScrollbar, "Scrollbar invalid"); - return pHScrollbar->IsVisible( FALSE ) || pHScrollbar->IsAuto(); + return pHScrollbar->IsVisible( sal_False ) || pHScrollbar->IsAuto(); } /* -----------------------------2002/06/26 13:57------------------------------ @@ -748,7 +748,7 @@ void SwView::ShowVScrollbar(sal_Bool bShow) sal_Bool SwView::IsVScrollbarVisible()const { DBG_ASSERT(pVScrollbar, "Scrollbar invalid"); - return pVScrollbar->IsVisible( FALSE ); + return pVScrollbar->IsVisible( sal_False ); } |