diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-26 11:01:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-27 12:30:29 +0200 |
commit | fdf284276fa3f6248702208239355d7734420833 (patch) | |
tree | 567dde3577eb1ed54bb0918715de8ee08920d585 /sw | |
parent | 27842247e5284242b0799588754174dc1dcb0ef6 (diff) |
editeng: sal_Bool->bool
Change-Id: Ice3b0a4ccf7a6d25311ff65a23efa9082cd501de
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/swacorr.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/edit/acorrect.cxx | 30 | ||||
-rw-r--r-- | sw/source/core/edit/autofmt.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/inc/acorrect.hxx | 14 | ||||
-rw-r--r-- | sw/source/core/sw3io/swacorr.cxx | 6 |
5 files changed, 30 insertions, 30 deletions
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index 95a7c46e3330..2072b39a2c7c 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -31,12 +31,12 @@ class SwAutoCorrect : public SvxAutoCorrect protected: // Return replacement text (only for SWG-format, all others can be obtained from wordlist!). // rShort is stream-name - encrypted! - virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, + virtual bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFileName, const OUString& rShort, OUString& rLong ); // Text with attributes (only SWG-format!). // rShort is stream-name - encrypted! - virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, + virtual bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ); public: diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 0f1c790070f9..b86cc1a52318 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -112,7 +112,7 @@ void SwAutoCorrDoc::DeleteSel( SwPaM& rDelPam ) } } -sal_Bool SwAutoCorrDoc::Delete( sal_Int32 nStt, sal_Int32 nEnd ) +bool SwAutoCorrDoc::Delete( sal_Int32 nStt, sal_Int32 nEnd ) { const SwNodeIndex& rNd = rCrsr.GetPoint()->nNode; SwPaM aSel( rNd, nStt, rNd, nEnd ); @@ -120,10 +120,10 @@ sal_Bool SwAutoCorrDoc::Delete( sal_Int32 nStt, sal_Int32 nEnd ) if( bUndoIdInitialized ) bUndoIdInitialized = true; - return sal_True; + return true; } -sal_Bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rTxt ) +bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rTxt ) { SwPaM aPam( rCrsr.GetPoint()->nNode.GetNode(), nPos ); rEditSh.GetDoc()->InsertString( aPam, rTxt ); @@ -136,15 +136,15 @@ sal_Bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rTxt ) ++m_nEndUndoCounter; } } - return sal_True; + return true; } -sal_Bool SwAutoCorrDoc::Replace( sal_Int32 nPos, const OUString& rTxt ) +bool SwAutoCorrDoc::Replace( sal_Int32 nPos, const OUString& rTxt ) { return ReplaceRange( nPos, rTxt.getLength(), rTxt ); } -sal_Bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rTxt ) +bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rTxt ) { SwPaM* pPam = &rCrsr; if( pPam->GetPoint()->nContent.GetIndex() != nPos ) @@ -156,7 +156,7 @@ sal_Bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, c SwTxtNode * const pNd = pPam->GetNode()->GetTxtNode(); if ( !pNd ) { - return sal_False; + return false; } // text attributes with dummy characters must not be replaced! @@ -224,10 +224,10 @@ sal_Bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, c if( pPam != &rCrsr ) delete pPam; - return sal_True; + return true; } -sal_Bool SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, +bool SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& rItem ) { const SwNodeIndex& rNd = rCrsr.GetPoint()->nNode; @@ -250,7 +250,7 @@ sal_Bool SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlo return 0 != nWhich; } -sal_Bool SwAutoCorrDoc::SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) +bool SwAutoCorrDoc::SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) { const SwNodeIndex& rNd = rCrsr.GetPoint()->nNode; SwPaM aPam( rNd, nStt, rNd, nEnd ); @@ -261,7 +261,7 @@ sal_Bool SwAutoCorrDoc::SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUStr rEditSh.GetDoc()->SetFmtItemByAutoFmt( aPam, aSet ); if( bUndoIdInitialized ) bUndoIdInitialized = true; - return sal_True; + return true; } /** Return the text of a previous paragraph @@ -310,7 +310,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, if( nEndPos == rSttPos ) return bRet; - LanguageType eLang = GetLanguage(nEndPos, sal_False); + LanguageType eLang = GetLanguage(nEndPos, false); if(LANGUAGE_SYSTEM == eLang) eLang = GetAppLanguage(); LanguageTag aLanguageTag( eLang); @@ -340,7 +340,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, } else { - SwTextBlocks aTBlks( rACorrect.GetAutoCorrFileName( aLanguageTag, sal_False, sal_True )); + SwTextBlocks aTBlks( rACorrect.GetAutoCorrFileName( aLanguageTag, false, true )); sal_uInt16 nPos = aTBlks.GetIndex( pFnd->GetShort() ); if( USHRT_MAX != nPos && aTBlks.BeginGetDoc( nPos ) ) { @@ -406,12 +406,12 @@ void SwAutoCorrDoc::SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, sal_Unicode cChar ) { sal_uLong nNode = pIdx ? pIdx->GetIndex() : rCrsr.GetPoint()->nNode.GetIndex(); - LanguageType eLang = GetLanguage(nPos, sal_False); + LanguageType eLang = GetLanguage(nPos, false); rEditSh.GetDoc()->SetAutoCorrExceptWord( new SwAutoCorrExceptWord( nFlag, nNode, nPos, rExceptWord, cChar, eLang )); } -LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos, sal_Bool bPrevPara ) const +LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos, bool bPrevPara ) const { LanguageType eRet = LANGUAGE_SYSTEM; diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 4d4c2f5eaa8a..60d454ed81c2 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1850,7 +1850,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos ) bool bSetHardBlank = false; OUString sReplace( pATst->GetQuote( aACorrDoc, - nPos, cChar, sal_True )); + nPos, cChar, true )); m_aDelPam.SetMark(); m_aDelPam.GetPoint()->nContent = nPos+1; @@ -1900,7 +1900,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos ) bool bSetHardBlank = false; m_aDelPam.GetPoint()->nContent = nPos; OUString sReplace( pATst->GetQuote( aACorrDoc, - nPos, cChar, sal_False )); + nPos, cChar, false )); if( 2 == sReplace.getLength() && ' ' == sReplace[ 0 ]) { @@ -2065,7 +2065,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos ) if( m_aFlags.bCptlSttSntnc && bFirst ) { SetRedlineTxt( STR_AUTOFMTREDL_CPTL_STT_SENT ); - pATst->FnCptlSttSntnc( aACorrDoc, *pTxt, sal_True, nSttPos, nPos, eLang); + pATst->FnCptlSttSntnc( aACorrDoc, *pTxt, true, nSttPos, nPos, eLang); bFirst = sal_False; } diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 4836319258f2..ed678567c145 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -57,15 +57,15 @@ public: SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam, sal_Unicode cIns = 0 ); ~SwAutoCorrDoc(); - virtual sal_Bool Delete( sal_Int32 nStt, sal_Int32 nEnd ); - virtual sal_Bool Insert( sal_Int32 nPos, const OUString& rTxt ); - virtual sal_Bool Replace( sal_Int32 nPos, const OUString& rTxt ); - virtual sal_Bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ); + virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ); + virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ); + virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ); + virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ); - virtual sal_Bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, + virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& ); - virtual sal_Bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ); + virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ); // return text of a previous paragraph // If it does not exist or if there is nothing before, return blank. @@ -84,7 +84,7 @@ public: // Afterwards the words can be added into exception list if needed. virtual void SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, const OUString& rExceptWord, sal_Unicode cChar ); - virtual LanguageType GetLanguage( sal_Int32 nPos, sal_Bool bPrevPara ) const; + virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const; }; class SwAutoCorrExceptWord diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx index 7b38daee9933..732c15f946f9 100644 --- a/sw/source/core/sw3io/swacorr.cxx +++ b/sw/source/core/sw3io/swacorr.cxx @@ -35,7 +35,7 @@ TYPEINIT1( SwAutoCorrect, SvxAutoCorrect ); // koennen aus der Wortliste herausgeholt werden!) // rShort ist der Stream-Name - gecryptet! -sal_Bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg, +bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg, const OUString& rFileName, const OUString& rShort, OUString& rLong ) { sal_uLong nRet = 0; @@ -53,12 +53,12 @@ sal_Bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& r // - Text mit Attributierung (kann nur der SWG - SWG-Format!) // rShort ist der Stream-Name - gecryptet! -sal_Bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, +bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, const OUString& rFileName, const OUString& rShort, SfxObjectShell& rObjSh, OUString& rLong ) { if( !rObjSh.IsA( TYPE(SwDocShell) ) ) - return sal_False; + return false; SwDocShell& rDShell = (SwDocShell&)rObjSh; sal_uLong nRet = 0; |