diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-20 11:55:27 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-21 12:19:23 +0200 |
commit | 7e06ccad8f4d654585f3aa6dbdf2933370d60756 (patch) | |
tree | 50260d6e2d098679d9859cd8baa41314a0253f76 /editeng | |
parent | 72c64c769191a673c83ce7ea4a626128fa5c8558 (diff) |
editeng: sal_Bool->bool
Change-Id: I36cb765d87ddef1fba3447a3ea90e5285cbcd678
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/editview.cxx | 54 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 16 | ||||
-rw-r--r-- | editeng/source/editeng/textconv.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 16 |
6 files changed, 48 insertions, 48 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index ed8c54d87b6f..f5f9efc0565e 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -431,7 +431,7 @@ void EditEngine::SetPaperSize( const Size& rNewSize ) pImpEditEngine->UpdateViews( pImpEditEngine->GetActiveView() ); if ( pImpEditEngine->GetUpdateMode() && pImpEditEngine->GetActiveView() ) - pImpEditEngine->pActiveView->ShowCursor( sal_False, sal_False ); + pImpEditEngine->pActiveView->ShowCursor( false, false ); } } } @@ -1448,7 +1448,7 @@ void EditEngine::SetUpdateMode( sal_Bool bUpdate ) { pImpEditEngine->SetUpdateMode( bUpdate ); if ( pImpEditEngine->pActiveView ) - pImpEditEngine->pActiveView->ShowCursor( sal_False, sal_False ); + pImpEditEngine->pActiveView->ShowCursor( false, false ); } sal_Bool EditEngine::GetUpdateMode() const diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index fdedb5fff5df..cd1badd6ab64 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -193,12 +193,12 @@ void EditView::Invalidate() } } -void EditView::SetReadOnly( sal_Bool bReadOnly ) +void EditView::SetReadOnly( bool bReadOnly ) { pImpEditView->bReadOnly = bReadOnly; } -sal_Bool EditView::IsReadOnly() const +bool EditView::IsReadOnly() const { return pImpEditView->bReadOnly; } @@ -236,7 +236,7 @@ void EditView::SetSelection( const ESelection& rESel ) pImpEditView->DrawSelection(); pImpEditView->SetEditSelection( aNewSelection ); pImpEditView->DrawSelection(); - sal_Bool bGotoCursor = pImpEditView->DoAutoScroll(); + bool bGotoCursor = pImpEditView->DoAutoScroll(); ShowCursor( bGotoCursor ); } @@ -253,7 +253,7 @@ ESelection EditView::GetSelection() const return aSelection; } -sal_Bool EditView::HasSelection() const +bool EditView::HasSelection() const { return pImpEditView->HasSelection(); } @@ -331,7 +331,7 @@ Cursor* EditView::GetCursor() const return pImpEditView->pCursor; } -void EditView::InsertText( const OUString& rStr, sal_Bool bSelect ) +void EditView::InsertText( const OUString& rStr, bool bSelect ) { EditEngine* pEE = PIMPE; @@ -360,22 +360,22 @@ void EditView::InsertText( const OUString& rStr, sal_Bool bSelect ) pEE->FormatAndUpdate( this ); } -sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin ) +bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin ) { return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin ); } -sal_Bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent ) +bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent ) { return pImpEditView->MouseButtonUp( rMouseEvent ); } -sal_Bool EditView::MouseButtonDown( const MouseEvent& rMouseEvent ) +bool EditView::MouseButtonDown( const MouseEvent& rMouseEvent ) { return pImpEditView->MouseButtonDown( rMouseEvent ); } -sal_Bool EditView::MouseMove( const MouseEvent& rMouseEvent ) +bool EditView::MouseMove( const MouseEvent& rMouseEvent ) { return pImpEditView->MouseMove( rMouseEvent ); } @@ -385,14 +385,14 @@ void EditView::Command( const CommandEvent& rCEvt ) pImpEditView->Command( rCEvt ); } -void EditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor ) +void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor ) { if ( pImpEditView->pEditEngine->HasView( this ) ) { // The control word is more important: if ( !pImpEditView->DoAutoScroll() ) - bGotoCursor = sal_False; + bGotoCursor = false; pImpEditView->ShowCursor( bGotoCursor, bForceVisCursor ); } } @@ -421,7 +421,7 @@ void EditView::SetAttribs( const SfxItemSet& rSet ) PIMPE->FormatAndUpdate( this ); } -void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ) +void EditView::RemoveAttribsKeepLanguages( bool bRemoveParaAttribs ) { pImpEditView->DrawSelection(); @@ -441,7 +441,7 @@ void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ) PIMPE->FormatAndUpdate( this ); } -void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) +void EditView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich ) { pImpEditView->DrawSelection(); @@ -475,7 +475,7 @@ void EditView::Redo() PIMPE->Redo( this ); } -sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) +sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) { EditSelection aOldSel( pImpEditView->GetEditSelection() ); pImpEditView->DrawSelection(); @@ -490,7 +490,7 @@ sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextForm } pImpEditView->SetEditSelection( aNewSel ); - sal_Bool bGotoCursor = pImpEditView->DoAutoScroll(); + bool bGotoCursor = pImpEditView->DoAutoScroll(); ShowCursor( bGotoCursor ); return rInput.GetError(); @@ -600,7 +600,7 @@ void EditView::InsertText( const EditTextObject& rTextObject ) PIMPE->FormatAndUpdate( this ); } -void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, sal_Bool bUseSpecial ) +void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, bool bUseSpecial ) { PIMPE->UndoActionStart( EDITUNDO_INSERT ); pImpEditView->DeleteSelected(); @@ -613,7 +613,7 @@ void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::d PIMPE->FormatAndUpdate( this ); } -void EditView::SetEditEngineUpdateMode( sal_Bool bUpdate ) +void EditView::SetEditEngineUpdateMode( bool bUpdate ) { PIMPEE->SetUpdateMode( bUpdate, this ); } @@ -646,12 +646,12 @@ const SfxStyleSheet* EditView::GetStyleSheet() const return const_cast< EditView* >( this )->GetStyleSheet(); } -sal_Bool EditView::IsInsertMode() const +bool EditView::IsInsertMode() const { return pImpEditView->IsInsertMode(); } -void EditView::SetInsertMode( sal_Bool bInsert ) +void EditView::SetInsertMode( bool bInsert ) { pImpEditView->SetInsertMode( bInsert ); } @@ -692,7 +692,7 @@ void EditView::CompleteAutoCorrect( Window* pFrameWin ) } } -EESpellState EditView::StartSpeller( sal_Bool bMultipleDoc ) +EESpellState EditView::StartSpeller( bool bMultipleDoc ) { if ( !PIMPEE->GetSpeller().is() ) return EE_SPELL_NOSPELLER; @@ -711,7 +711,7 @@ EESpellState EditView::StartThesaurus() void EditView::StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, - sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ) + sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc ) { PIMPEE->Convert( this, nSrcLang, nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc ); } @@ -722,9 +722,9 @@ sal_Int32 EditView::StartSearchAndReplace( const SvxSearchItem& rSearchItem ) return PIMPEE->StartSearchAndReplace( this, rSearchItem ); } -sal_Bool EditView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong ) +bool EditView::IsCursorAtWrongSpelledWord( bool bMarkIfWrong ) { - sal_Bool bIsWrong = sal_False; + bool bIsWrong = false; if ( !HasSelection() ) { EditPaM aPaM = pImpEditView->GetEditSelection().Max(); @@ -733,7 +733,7 @@ sal_Bool EditView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong ) return bIsWrong; } -sal_Bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong ) +bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong ) { Point aPos ( pImpEditView->GetWindow()->PixelToLogic( rPosPixel ) ); aPos = pImpEditView->GetDocPos( aPos ); @@ -1021,15 +1021,15 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) } } -sal_Bool EditView::SelectCurrentWord( sal_Int16 nWordType ) +bool EditView::SelectCurrentWord( sal_Int16 nWordType ) { EditSelection aCurSel( pImpEditView->GetEditSelection() ); pImpEditView->DrawSelection(); aCurSel = PIMPE->SelectWord(aCurSel.Max(), nWordType); pImpEditView->SetEditSelection( aCurSel ); pImpEditView->DrawSelection(); - ShowCursor( sal_True, sal_False ); - return aCurSel.HasRange() ? sal_True : sal_False; + ShowCursor( true, false ); + return aCurSel.HasRange(); } void EditView::InsertField( const SvxFieldItem& rFld ) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 0c93fab9433f..7ab6412297a0 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -324,7 +324,7 @@ sal_Bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pVie pView->pImpEditView->DrawSelection(); pView->pImpEditView->SetEditSelection( aNewSelection ); pView->pImpEditView->DrawSelection(); - pView->ShowCursor( sal_True, sal_True ); + pView->ShowCursor( true, true ); } else if ( rMEvt.GetClicks() == 3 ) { @@ -337,7 +337,7 @@ sal_Bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pVie pView->pImpEditView->DrawSelection(); pView->pImpEditView->SetEditSelection( aNewSelection ); pView->pImpEditView->DrawSelection(); - pView->ShowCursor( sal_True, sal_True ); + pView->ShowCursor( true, true ); } } return sal_True; diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 71512d2b15f9..4c3dbd865147 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1490,7 +1490,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc ) aCurSel.Min() = aCurSel.Max(); pEditView->pImpEditView->SetEditSelection( aCurSel ); pEditView->pImpEditView->DrawSelection(); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); } EESpellState eState = pSpellInfo->eState; delete pSpellInfo; @@ -1615,7 +1615,7 @@ void ImpEditEngine::Convert( EditView* pEditView, aCurSel.Min() = aCurSel.Max(); pEditView->pImpEditView->SetEditSelection( aCurSel ); pEditView->pImpEditView->DrawSelection(); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); } delete pConvInfo; pConvInfo = 0; @@ -1817,7 +1817,7 @@ void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, pEditView->pImpEditView->DrawSelection(); pEditView->pImpEditView->SetEditSelection( aCurSel ); pEditView->pImpEditView->DrawSelection(); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); rConvTxt = aRes; if ( !rConvTxt.isEmpty() ) @@ -1887,7 +1887,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView ) pEditView->pImpEditView->DrawSelection(); pEditView->pImpEditView->SetEditSelection( aCurSel ); pEditView->pImpEditView->DrawSelection(); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); return xSpellAlt; } @@ -2490,7 +2490,7 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView ) pEditView->pImpEditView->SetEditSelection( aCurSel ); pEditView->pImpEditView->DrawSelection(); pEditView->InsertText( pDlg->GetWord() ); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); } delete pDlg; @@ -2555,7 +2555,7 @@ sal_Int32 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxSe else { pEditView->pImpEditView->DrawSelection(); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); } } return nFound; @@ -2582,14 +2582,14 @@ sal_Bool ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEdi { // First, set the minimum, so the whole word is in the visible range. pEditView->pImpEditView->SetEditSelection( aFoundSel.Min() ); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); pEditView->pImpEditView->SetEditSelection( aFoundSel ); } else pEditView->pImpEditView->SetEditSelection( aSel.Max() ); pEditView->pImpEditView->DrawSelection(); - pEditView->ShowCursor( sal_True, sal_False ); + pEditView->ShowCursor( true, false ); return bFound; } diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 515f1fe65821..e124f6fd8d58 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -548,7 +548,7 @@ void TextConvWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttri OUString aSelTxt1( m_pEditView->GetSelected() ); #endif // replace old text and select new text - m_pEditView->InsertText( rNewText, sal_True ); + m_pEditView->InsertText( rNewText, true ); #ifdef DEBUG OUString aSelTxt2( m_pEditView->GetSelected() ); #endif diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index e0e39ad3acbd..076a2aec6918 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -211,7 +211,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) ESelection aTmpSel(nTemp,0,nTemp,0); pEditView->SetSelection( aTmpSel ); } - pEditView->ShowCursor( sal_True, sal_True ); + pEditView->ShowCursor( true, true ); pOwner->UndoActionEnd( OLUNDO_INSERT ); bKeyProcessed = sal_True; } @@ -229,7 +229,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) // Position the cursor ESelection aTmpSel(nTemp,0,nTemp,0); pEditView->SetSelection( aTmpSel ); - pEditView->ShowCursor( sal_True, sal_True ); + pEditView->ShowCursor( true, true ); pOwner->UndoActionEnd( OLUNDO_INSERT ); bKeyProcessed = sal_True; } @@ -564,7 +564,7 @@ void OutlinerView::Indent( short nDiff ) if ( bUpdate ) { - pEditView->SetEditEngineUpdateMode( sal_True ); + pEditView->SetEditEngineUpdateMode( true ); pEditView->ShowCursor(); } @@ -660,11 +660,11 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj ) sal_uInt16 nSize = ImpInitPaste( nStart ); pEditView->InsertText( rParaObj.GetTextObject() ); ImpPasted( nStart, nParaCount, nSize); - pEditView->SetEditEngineUpdateMode( sal_True ); + pEditView->SetEditEngineUpdateMode( true ); pOwner->UndoActionEnd( OLUNDO_INSERT ); - pEditView->ShowCursor( sal_True, sal_True ); + pEditView->ShowCursor( true, true ); } @@ -698,9 +698,9 @@ void OutlinerView::PasteSpecial() pOwner->ImplSetLevelDependendStyleSheet( nPara ); } - pEditView->SetEditEngineUpdateMode( sal_True ); + pEditView->SetEditEngineUpdateMode( true ); pOwner->UndoActionEnd( OLUNDO_INSERT ); - pEditView->ShowCursor( sal_True, sal_True ); + pEditView->ShowCursor( true, true ); } } @@ -1509,7 +1509,7 @@ void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const OUStri // replace word ... rEditView.InsertText( rSynonmText ); - rEditView.ShowCursor( sal_True, sal_False ); + rEditView.ShowCursor( true, false ); } |