diff options
Diffstat (limited to 'sw/source/ui/dialog/SwSpellDialogChildWindow.cxx')
-rw-r--r-- | sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index 2b2ebc3ee7cd..ac8128e1a118 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -80,7 +80,7 @@ struct SpellState bool m_bLostFocus; //restart and progress information - USHORT m_SpellStartPosition; + sal_uInt16 m_SpellStartPosition; bool m_bBodySpelled; //body already spelled bool m_bOtherSpelled; //frames, footnotes, headers and footers spelled bool m_bStartedInOther; //started the spelling insided of the _other_ area @@ -151,7 +151,7 @@ void lcl_LeaveDrawText(SwWrtShell& rSh) { if(rSh.GetDrawView()) { - rSh.GetDrawView()->SdrEndTextEdit( TRUE ); + rSh.GetDrawView()->SdrEndTextEdit( sal_True ); Point aPt(LONG_MIN, LONG_MIN); //go out of the frame rSh.SelectObj(aPt, SW_LEAVE_FRAME); @@ -164,7 +164,7 @@ void lcl_LeaveDrawText(SwWrtShell& rSh) -----------------------------------------------------------------------*/ SwSpellDialogChildWindow::SwSpellDialogChildWindow ( Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : svx::SpellDialogChildWindow ( @@ -192,7 +192,7 @@ SwSpellDialogChildWindow::~SwSpellDialogChildWindow () SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const { SfxChildWinInfo aInfo = svx::SpellDialogChildWindow::GetInfo(); - aInfo.bVisible = FALSE; + aInfo.bVisible = sal_False; return aInfo; } @@ -255,7 +255,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck) { m_pSpellState->pOtherCursor = new SwPaM(*pWrtShell->GetCrsr()->GetPoint()); m_pSpellState->m_bStartedInOther = true; - pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, FALSE ); + pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_CURR, sal_False ); } else { @@ -268,7 +268,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck) *pWrtShell->GetDoc(), *pCrsr->Start(), pCrsr->End()); } - pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, FALSE ); + pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END, DOCPOS_CURR, sal_False ); } } else @@ -313,7 +313,7 @@ The code below would only be part of the solution. //if there's any that has not been spelled yet if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt()) { - pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, FALSE ); + pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False ); if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn)) { pWrtShell->SpellEnd(); @@ -325,7 +325,7 @@ The code below would only be part of the solution. //if no result has been found try at the body text - completely if(!m_pSpellState->m_bBodySpelled && !aRet.size()) { - pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, FALSE ); + pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False ); if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn)) { m_pSpellState->m_bBodySpelled = true; @@ -354,7 +354,7 @@ The code below would only be part of the solution. pWrtShell->SpellEnd(); delete m_pSpellState->pOtherCursor; m_pSpellState->pOtherCursor = 0; - pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, FALSE ); + pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR, DOCPOS_OTHERSTART, sal_False ); pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn); } if(!aRet.size()) @@ -367,7 +367,7 @@ The code below would only be part of the solution. //has the body been spelled? if(!m_pSpellState->m_bBodySpelled) { - pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, FALSE ); + pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END, DOCPOS_START, sal_False ); if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn)) { m_pSpellState->m_bBodySpelled = true; @@ -380,7 +380,7 @@ The code below would only be part of the solution. m_pSpellState->m_bBodySpelled = true; if(!m_pSpellState->m_bOtherSpelled && pWrtShell->HasOtherCnt()) { - pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, FALSE ); + pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False ); if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn)) { pWrtShell->SpellEnd(); @@ -415,7 +415,7 @@ The code below would only be part of the solution. if(m_pSpellState->m_xStartRange.is()) { LockFocusNotification( true ); - USHORT nRet = QueryBox( GetWindow(), SW_RES(RID_QB_SPELL_CONTINUE)).Execute(); + sal_uInt16 nRet = QueryBox( GetWindow(), SW_RES(RID_QB_SPELL_CONTINUE)).Execute(); if(RET_YES == nRet) { SwUnoInternalPaM aPam(*pWrtShell->GetDoc()); @@ -583,8 +583,8 @@ void SwSpellDialogChildWindow::GetFocus() case SHELL_MODE_TABLE_LIST_TEXT: { SwPaM* pCursor = pWrtShell->GetCrsr(); - if(m_pSpellState->m_pPointNode != pCursor->GetNode(TRUE) || - m_pSpellState->m_pMarkNode != pCursor->GetNode(FALSE)|| + if(m_pSpellState->m_pPointNode != pCursor->GetNode(sal_True) || + m_pSpellState->m_pMarkNode != pCursor->GetNode(sal_False)|| m_pSpellState->m_nPointPos != pCursor->GetPoint()->nContent.GetIndex()|| m_pSpellState->m_nMarkPos != pCursor->GetMark()->nContent.GetIndex()) bInvalidate = true; @@ -642,8 +642,8 @@ void SwSpellDialogChildWindow::LoseFocus() { //store a node pointer and a pam-position to be able to check on next GetFocus(); SwPaM* pCursor = pWrtShell->GetCrsr(); - m_pSpellState->m_pPointNode = pCursor->GetNode(TRUE); - m_pSpellState->m_pMarkNode = pCursor->GetNode(FALSE); + m_pSpellState->m_pPointNode = pCursor->GetNode(sal_True); + m_pSpellState->m_pMarkNode = pCursor->GetNode(sal_False); m_pSpellState->m_nPointPos = pCursor->GetPoint()->nContent.GetIndex(); m_pSpellState->m_nMarkPos = pCursor->GetMark()->nContent.GetIndex(); @@ -689,7 +689,7 @@ SwWrtShell* SwSpellDialogChildWindow::GetWrtShell_Impl() SwView* pView = 0; if(pDispatch) { - USHORT nShellIdx = 0; + sal_uInt16 nShellIdx = 0; SfxShell* pShell; while(0 != (pShell = pDispatch->GetShell(nShellIdx++))) if(pShell->ISA(SwView)) @@ -843,13 +843,13 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh) { //now the current one has to be deselected if(pCurrentTextObj) - pDrView->SdrEndTextEdit( TRUE ); + pDrView->SdrEndTextEdit( sal_True ); //and the found one should be activated rSh.MakeVisible(pTextObj->GetLogicRect()); Point aTmp( 0,0 ); rSh.SelectObj( aTmp, 0, pTextObj ); SdrPageView* pPV = pDrView->GetSdrPageView(); - rView.BeginTextEdit( pTextObj, pPV, &rView.GetEditWin(), FALSE, TRUE ); + rView.BeginTextEdit( pTextObj, pPV, &rView.GetEditWin(), sal_False, sal_True ); rView.AttrChangedNotify(&rSh); bNextDoc = true; } |