diff options
Diffstat (limited to 'sw/source/ui/docvw/edtwin2.cxx')
| -rw-r--r-- | sw/source/ui/docvw/edtwin2.cxx | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index f6134e03fd..83d9e7eea6 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -84,9 +84,9 @@ /*-------------------------------------------------------------------- Description: KeyEvents --------------------------------------------------------------------*/ -static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, BOOL bBalloon ) +static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, sal_Bool bBalloon ) { - USHORT nResId = 0; + sal_uInt16 nResId = 0; switch( rRedl.GetType() ) { case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERT; break; @@ -112,14 +112,14 @@ static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, BOOL bBall void SwEditWin::RequestHelp(const HelpEvent &rEvt) { SwWrtShell &rSh = rView.GetWrtShell(); - BOOL bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON )); + sal_Bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON )); if(bQuickBalloon && rSh.GetViewOptions()->IsPreventTips()) return; - BOOL bWeiter = TRUE; + sal_Bool bWeiter = sal_True; SET_CURR_SHELL(&rSh); String sTxt; Point aPos( PixelToLogic( ScreenToOutputPixel( rEvt.GetMousePosPixel() ) )); - BOOL bBalloon = static_cast< BOOL >(rEvt.GetMode() & HELPMODE_BALLOON); + sal_Bool bBalloon = static_cast< sal_Bool >(rEvt.GetMode() & HELPMODE_BALLOON); SdrView *pSdrView = rSh.GetDrawView(); @@ -149,9 +149,9 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) #endif SwContentAtPos::SW_TABLEBOXFML ); - if( rSh.GetContentAtPos( aPos, aCntntAtPos, FALSE, &aFldRect ) ) + if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) ) { - USHORT nStyle = 0; // style of quick help + sal_uInt16 nStyle = 0; // style of quick help switch( aCntntAtPos.eCntntAtPos ) { case SwContentAtPos::SW_TABLEBOXFML: @@ -224,7 +224,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) } } // #i80029# - BOOL bExecHyperlinks = rView.GetDocShell()->IsReadOnly(); + sal_Bool bExecHyperlinks = rView.GetDocShell()->IsReadOnly(); if ( !bExecHyperlinks ) { SvtSecurityOptions aSecOpts; @@ -301,10 +301,9 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) case RES_TABLEFLD: case RES_GETEXPFLD: { - USHORT nOldSubType = pFld->GetSubType(); + sal_uInt16 nOldSubType = pFld->GetSubType(); ((SwField*)pFld)->SetSubType(nsSwExtendedSubType::SUB_CMD); - sTxt = - pFld->ExpandField(rSh.GetDoc()->IsClipBoard()); + sTxt = pFld->ExpandField(true); ((SwField*)pFld)->SetSubType(nOldSubType); } break; @@ -314,14 +313,14 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) break; } case RES_INPUTFLD: // BubbleHelp, because the suggestion could be quite long - bBalloon = TRUE; + bBalloon = sal_True; /* no break */ case RES_JUMPEDITFLD: sTxt = pFld->GetPar2(); break; case RES_DBFLD: - sTxt = ((SwDBField*)pFld)->GetCntnt(TRUE); + sTxt = pFld->GetFieldName(); break; case RES_USERFLD: @@ -369,7 +368,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) if( !sTxt.Len() ) { aCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE; - if( rSh.GetContentAtPos( aPos, aCntntAtPos, FALSE, &aFldRect ) ) + if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) ) lcl_GetRedlineHelp( *aCntntAtPos.aFnd.pRedl, sTxt, bBalloon ); } @@ -393,12 +392,12 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) } } - bWeiter = FALSE; + bWeiter = sal_False; } if( bWeiter ) { - BYTE nTabCols = rSh.WhichMouseTabCol(aPos); - USHORT nTabRes = 0; + sal_uInt8 nTabCols = rSh.WhichMouseTabCol(aPos); + sal_uInt16 nTabRes = 0; switch(nTabCols) { case SW_TABCOL_HORI: @@ -432,7 +431,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) Rectangle aRect(rEvt.GetMousePosPixel(), aTxtSize); Help::ShowQuickHelp(this, aRect, sTxt); } - bWeiter = FALSE; + bWeiter = sal_False; } } @@ -451,7 +450,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) pObj = aVEvt.pObj; sTxt = pField->GetURL(); - bWeiter = FALSE; + bWeiter = sal_False; } } if (bWeiter && eHit == SDRHIT_TEXTEDIT) @@ -476,7 +475,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) if (pField ) { sTxt = ((const SvxURLField*) pField)->GetURL(); - bWeiter = FALSE; + bWeiter = sal_False; } } } @@ -515,7 +514,7 @@ void SwEditWin::Paint(const Rectangle& rRect) SwWrtShell* pWrtShell = GetView().GetWrtShellPtr(); if(!pWrtShell) return; - BOOL bPaintShadowCrsr = FALSE; + sal_Bool bPaintShadowCrsr = sal_False; if( pShadCrsr ) { Rectangle aRect( pShadCrsr->GetRect()); @@ -528,7 +527,7 @@ void SwEditWin::Paint(const Rectangle& rRect) // resides somewhat above, then everything is clipped outside // and we have to make the "inner part" at the end of the // Paint visible again. Otherwise Paint errors occur! - bPaintShadowCrsr = TRUE; + bPaintShadowCrsr = sal_True; } } |