diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-09-27 13:21:50 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-09-27 13:21:50 +0900 |
commit | 30d33b126f47021a99fb8ca63d6c6be29407e9cc (patch) | |
tree | c91e19e666d77dabed9253ae0d2eb51c7b2d200b | |
parent | 43ac04763d60ae651dc8f1a592cc2f0d41387a7d (diff) |
sal_Bool to bool
Change-Id: Ic05d9f062e7419d192b8cf6e56c91b3f9d97bfe0
-rw-r--r-- | sw/inc/crsrsh.hxx | 16 | ||||
-rw-r--r-- | sw/inc/node.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 44 | ||||
-rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/trvltbl.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/docnode/node.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/editsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/edlingu.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/edit/ednumber.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/frmedt/fetab.cxx | 25 | ||||
-rw-r--r-- | sw/source/ui/dochdl/swdtflvr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/wrtsh.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewling.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/wrtsh/wrtsh1.cxx | 2 |
14 files changed, 67 insertions, 68 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 632b021015b4..4c7e48c008fa 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -137,7 +137,7 @@ struct SwContentAtPos nDist = 0; // #i23726# } - sal_Bool IsInProtectSect() const; + bool IsInProtectSect() const; bool IsInRTLText()const; }; @@ -295,9 +295,9 @@ protected: void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos, const xub_StrLen nOffset = 0 ); - sal_Bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false ); + bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false ); - bool SetInFrontOfLabel( sal_Bool bNew ); + bool SetInFrontOfLabel( bool bNew ); void RefreshBlockCursor(); @@ -321,7 +321,7 @@ public: SwPaM * CreateCrsr(); ///< delete the current cursor and make the following into the current - sal_Bool DestroyCrsr(); + bool DestroyCrsr(); ///< transform TableCursor to normal cursor, nullify Tablemode void TblCrsrToCursor(); ///< enter block mode, change normal cursor into block cursor @@ -525,7 +525,7 @@ public: // Check if selection is within one paragraph. //Should WaitPtr be activated for Clipboard. - sal_Bool ShouldWait() const; + bool ShouldWait() const; // Check if selection is within one paragraph. inline sal_Bool IsSelOnePara() const; @@ -728,11 +728,11 @@ public: sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; sal_Bool IsStartSentence() const; sal_Bool IsEndSentence() const; - sal_Bool IsSttPara() const; - sal_Bool IsEndPara() const; + bool IsSttPara() const; + bool IsEndPara() const; sal_Bool IsStartOfDoc() const; sal_Bool IsEndOfDoc() const; - sal_Bool IsInFrontOfLabel() const; + bool IsInFrontOfLabel() const; sal_Bool IsAtLeftMargin() const { return IsAtLRMargin( sal_True ); } sal_Bool IsAtRightMargin(sal_Bool bAPI = sal_False) const { return IsAtLRMargin( sal_False, bAPI ); } diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index a0fed7253ff1..9ac30455dcc2 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -268,7 +268,7 @@ public: /// Is node in the visible area of the Shell? sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const; /// Is node in an protected area? - sal_Bool IsInProtectSect() const; + bool IsInProtectSect() const; /** Is node in something that is protected (range, frame, table cells ... including anchor in case of frames or footnotes)? */ sal_Bool IsProtect() const; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 8a6a5bff4384..e026f9ba4e6c 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -150,23 +150,23 @@ SwPaM * SwCrsrShell::CreateCrsr() /** * Delete current Cursor, making the following one the current. * Note, this function does not delete anything if there is no other cursor. - * @return - returns sal_True if there was another cursor and we deleted one. + * @return - returns true if there was another cursor and we deleted one. */ -sal_Bool SwCrsrShell::DestroyCrsr() +bool SwCrsrShell::DestroyCrsr() { // don't delete Crsr within table selection OSL_ENSURE( !IsTableMode(), "in table Selection" ); // Is there a next one? Don't do anything if not. if(pCurCrsr->GetNext() == pCurCrsr) - return sal_False; + return false; SwCallLink aLk( *this ); // watch Crsr-Moves SwCursor* pNextCrsr = (SwCursor*)pCurCrsr->GetNext(); delete pCurCrsr; pCurCrsr = dynamic_cast<SwShellCrsr*>(pNextCrsr); UpdateCrsr(); - return sal_True; + return true; } @@ -365,7 +365,7 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMo SwShellCrsr* pShellCrsr = getShellCrsr( true ); if ( !bLeft && pShellCrsr->IsInFrontOfLabel() ) { - SetInFrontOfLabel( sal_False ); + SetInFrontOfLabel( false ); bRet = sal_True; } // 2. CASE: Cursor is at beginning of numbered paragraph. A move @@ -375,7 +375,7 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMo 0 != ( pTxtNd = pShellCrsr->GetNode()->GetTxtNode() ) && pTxtNd->HasVisibleNumberingOrBullet() ) { - SetInFrontOfLabel( sal_True ); + SetInFrontOfLabel( true ); bRet = sal_True; } // 3. CASE: Regular cursor move. Reset the bInFrontOfLabel flag: @@ -385,13 +385,13 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMo // #i107447# // To avoid loop the reset of <bInFrontOfLabel> flag is no longer // reflected in the return value <bRet>. - const bool bResetOfInFrontOfLabel = SetInFrontOfLabel( sal_False ); + const bool bResetOfInFrontOfLabel = SetInFrontOfLabel( false ); bRet = pShellCrsr->LeftRight( bLeft, nCnt, nMode, bVisualAllowed, bSkipHidden, !IsOverwriteCrsr() ); if ( !bRet && bLeft && bResetOfInFrontOfLabel ) { // undo reset of <bInFrontOfLabel> flag - SetInFrontOfLabel( sal_True ); + SetInFrontOfLabel( true ); } } @@ -429,7 +429,7 @@ void SwCrsrShell::UpdateMarkedListLevel() { if ( !pTxtNd->IsNumbered() ) { - pCurCrsr->_SetInFrontOfLabel( sal_False ); + pCurCrsr->_SetInFrontOfLabel( false ); MarkListLevel( String(), 0 ); } else if ( pCurCrsr->IsInFrontOfLabel() ) @@ -459,7 +459,7 @@ sal_Bool SwCrsrShell::UpDown( sal_Bool bUp, sal_uInt16 nCnt ) sal_Bool bRet = pTmpCrsr->UpDown( bUp, nCnt ); // #i40019# UpDown should always reset the bInFrontOfLabel flag: - bRet = SetInFrontOfLabel(sal_False) || bRet; + bRet = SetInFrontOfLabel(false) || bRet; if( pBlockCrsr ) pBlockCrsr->clearPoints(); @@ -500,11 +500,11 @@ sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool bAPI) { const SwTxtNode * pTxtNd = _GetCrsr()->GetNode()->GetTxtNode(); if ( pTxtNd && pTxtNd->HasVisibleNumberingOrBullet() ) - SetInFrontOfLabel( sal_True ); + SetInFrontOfLabel( true ); } else if ( !bLeft ) { - bRet = SetInFrontOfLabel( sal_False ) || bRet; + bRet = SetInFrontOfLabel( false ) || bRet; } if( bRet ) @@ -1005,20 +1005,20 @@ int SwCrsrShell::CompareCursor( CrsrCompareType eType ) const } -sal_Bool SwCrsrShell::IsSttPara() const -{ return( pCurCrsr->GetPoint()->nContent == 0 ? sal_True : sal_False ); } +bool SwCrsrShell::IsSttPara() const +{ return pCurCrsr->GetPoint()->nContent == 0; } -sal_Bool SwCrsrShell::IsEndPara() const -{ return( pCurCrsr->GetPoint()->nContent == pCurCrsr->GetCntntNode()->Len() ? sal_True : sal_False ); } +bool SwCrsrShell::IsEndPara() const +{ return pCurCrsr->GetPoint()->nContent == pCurCrsr->GetCntntNode()->Len(); } -sal_Bool SwCrsrShell::IsInFrontOfLabel() const +bool SwCrsrShell::IsInFrontOfLabel() const { return pCurCrsr->IsInFrontOfLabel(); } -bool SwCrsrShell::SetInFrontOfLabel( sal_Bool bNew ) +bool SwCrsrShell::SetInFrontOfLabel( bool bNew ) { if ( bNew != IsInFrontOfLabel() ) { @@ -2277,7 +2277,7 @@ sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt ) sal_Bool bRet = GetLayout()->GetCrsrOfst( &aPos, aPt /*, &aTmpState*/ ); - SetInFrontOfLabel( sal_False ); // #i27615# + SetInFrontOfLabel( false ); // #i27615# // show only in TextNodes SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode(); @@ -2645,13 +2645,13 @@ SwShellCrsr* SwCrsrShell::getShellCrsr( bool bBlock ) Wait for TableMode, multiple selections and more than x selected paragraphs. */ -sal_Bool SwCrsrShell::ShouldWait() const +bool SwCrsrShell::ShouldWait() const { if ( IsTableMode() || GetCrsrCnt() > 1 ) - return sal_True; + return true; if( HasDrawView() && GetDrawView()->GetMarkedObjectList().GetMarkCount() ) - return sal_True; + return true; SwPaM* pPam = GetCrsr(); return pPam->Start()->nNode.GetIndex() + 10 < diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 9579739cb0d2..50f44f9dfc87 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1538,7 +1538,7 @@ const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const } /// is the node in a protected section? -sal_Bool SwContentAtPos::IsInProtectSect() const +bool SwContentAtPos::IsInProtectSect() const { const SwTxtNode* pNd = 0; if( pFndTxtAttr ) diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index eb400e5c2a6f..1544c06749f4 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -137,12 +137,12 @@ const SwFrm* lcl_FindMostUpperCellFrm( const SwFrm* pFrm ) return pFrm; } -sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) +bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) { // check if the current cursor's SPoint/Mark are in a table SwFrm *pFrm = GetCurrFrm(); if( !pFrm->IsInTab() ) - return sal_False; + return false; const SwTabFrm* pTabFrm = pFrm->FindTabFrm(); const SwTabFrm* pMasterTabFrm = pTabFrm->IsFollow() ? pTabFrm->FindMaster( true ) : pTabFrm; @@ -166,7 +166,7 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) GetTblSel( *this, aBoxes, eType ); if( aBoxes.empty() ) - return sal_False; + return false; pStt = aBoxes[0]; pEnd = aBoxes.back(); @@ -178,7 +178,7 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) SwTable::SearchType eSearchType = bRow ? SwTable::SEARCH_ROW : SwTable::SEARCH_COL; pTable->CreateSelection( *pCrsr, aBoxes, eSearchType, bCheckProtected ); if( aBoxes.empty() ) - return sal_False; + return false; pStt = aBoxes[0]; pEnd = aBoxes.back(); @@ -197,7 +197,7 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) } if ( !pStartFrm || !pEndFrm ) - return sal_False; + return false; const bool bVert = pFrm->ImplFindTabFrm()->IsVertical(); @@ -214,7 +214,7 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) aBoxes, bSelectUp ? 0 : &aCells, eType ); if( aBoxes.empty() || ( !bSelectUp && 4 != aCells.size() ) ) - return sal_False; + return false; if ( bSelectUp ) { @@ -255,7 +255,7 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) : pMasterTabFrm->Frm().TopLeft(); UpdateCrsr(); - return sal_True; + return true; } sal_Bool SwCrsrShell::SelTbl() diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index c80bd0206b60..cc458280e5f4 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -448,7 +448,7 @@ sal_Bool SwNode::IsInVisibleArea( ViewShell* pSh ) const return bRet; } -sal_Bool SwNode::IsInProtectSect() const +bool SwNode::IsInProtectSect() const { const SwNode* pNd = ND_SECTIONNODE == nNodeType ? pStartOfSection : this; const SwSectionNode* pSectNd = pNd->FindSectionNode(); diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 5a989841dca3..bf454d788dfb 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -174,7 +174,7 @@ void SwEditShell::Insert2(const String &rStr, const bool bForceExpandHints ) } } - SetInFrontOfLabel( sal_False ); // #i27615# + SetInFrontOfLabel( false ); // #i27615# EndAllAction(); } diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 17feb3ec842c..03b45d2315df 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -351,7 +351,7 @@ uno::Any SwSpellIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) OSL_ENSURE( GetEnd(), "SwEditShell::SpellContinue() ohne Start?"); uno::Reference< uno::XInterface > xSpellRet; - sal_Bool bGoOn = sal_True; + bool bGoOn = true; do { SwPaM *pCrsr = pMySh->GetCrsr(); if ( !pCrsr->HasMark() ) @@ -365,7 +365,7 @@ uno::Any SwSpellIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) bGoOn = GetCrsrCnt() > 1; if( xSpellRet.is() ) { - bGoOn = sal_False; + bGoOn = false; SwPosition* pNewPoint = new SwPosition( *pCrsr->GetPoint() ); SwPosition* pNewMark = new SwPosition( *pCrsr->GetMark() ); SetCurr( pNewPoint ); @@ -425,7 +425,7 @@ uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) OSL_ENSURE( GetEnd(), "SwConvIter::Continue() ohne Start?"); rtl::OUString aConvText; - sal_Bool bGoOn = sal_True; + bool bGoOn = true; do { SwPaM *pCrsr = pMySh->GetCrsr(); if ( !pCrsr->HasMark() ) @@ -442,7 +442,7 @@ uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) bGoOn = GetCrsrCnt() > 1; if( !aConvText.isEmpty() ) { - bGoOn = sal_False; + bGoOn = false; SwPosition* pNewPoint = new SwPosition( *pCrsr->GetPoint() ); SwPosition* pNewMark = new SwPosition( *pCrsr->GetMark() ); @@ -548,7 +548,7 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) const sal_Bool bAuto = IsAuto(); uno::Reference< XHyphenatedWord > xHyphWord; - sal_Bool bGoOn = sal_False; + bool bGoOn = false; do { SwPaM *pCrsr; do { @@ -1514,7 +1514,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar uno::Reference< XSpellAlternatives > xSpellRet; linguistic2::ProofreadingResult aGrammarResult; - sal_Bool bGoOn = sal_True; + bool bGoOn = true; bool bGrammarErrorFound = false; do { SwPaM *pCrsr = pMySh->GetCrsr(); @@ -1538,7 +1538,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar bGrammarErrorFound = aGrammarResult.aErrors.getLength() > 0; if( xSpellRet.is() || bGrammarErrorFound ) { - bGoOn = sal_False; + bGoOn = false; SwPosition* pNewPoint = new SwPosition( *pCrsr->GetPoint() ); SwPosition* pNewMark = new SwPosition( *pCrsr->GetMark() ); diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 8ede603db45b..f2273e619a09 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -232,7 +232,7 @@ void SwEditShell::DelNumRules() // cursor can not be anymore in front of a label, // because numbering/bullet is deleted. - SetInFrontOfLabel( sal_False ); + SetInFrontOfLabel( false ); GetDoc()->SetModified(); EndAllAction(); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 0ce30625e20f..24d6dc55ae4c 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -75,8 +75,7 @@ using namespace ::com::sun::star; // also see swtable.cxx #define COLFUZZY 20L -inline sal_Bool IsSame( long nA, long nB ) { return Abs(nA-nB) <= COLFUZZY; } -inline sal_Bool IsNear( long nA, long nB, long nTolerance ) { return Abs( nA - nB ) <= nTolerance; } +inline bool IsSame( long nA, long nB ) { return Abs(nA-nB) <= COLFUZZY; } // table column cache SwTabCols *pLastCols = 0; @@ -102,7 +101,7 @@ public: TblWait::TblWait(size_t const nCnt, SwFrm *pFrm, SwDocShell &rDocShell, size_t const nCnt2): pWait( 0 ) { - sal_Bool bWait = 20 < nCnt || 20 < nCnt2 || (pFrm && + bool bWait = 20 < nCnt || 20 < nCnt2 || (pFrm && 20 < pFrm->ImplFindTabFrm()->GetTable()->GetTabLines().size()); if( bWait ) pWait = new SwWait( rDocShell, sal_True ); @@ -545,10 +544,10 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const const SwTabFrm *pTab = pBox->FindTabFrm(); if ( pLastCols ) { - sal_Bool bDel = sal_True; + bool bDel = true; if ( pColumnCacheLastTable == pTab->GetTable() ) { - bDel = sal_False; + bDel = false; SWRECTFN( pTab ) const SwPageFrm* pPage = pTab->FindPageFrm(); @@ -570,7 +569,7 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const pColumnCacheLastTabFrm = pTab; } else - bDel = sal_True; + bDel = true; } if ( !bDel && @@ -588,7 +587,7 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const rToFill = *pLastCols; } else - bDel = sal_True; + bDel = true; } if ( bDel ) DELETEZ(pLastCols); @@ -622,10 +621,10 @@ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const const SwTabFrm *pTab = pBox->FindTabFrm(); if ( pLastRows ) { - sal_Bool bDel = sal_True; + bool bDel = true; if ( pRowCacheLastTable == pTab->GetTable() ) { - bDel = sal_False; + bDel = false; SWRECTFN( pTab ) const SwPageFrm* pPage = pTab->FindPageFrm(); const long nLeftMin = ( bVert ? @@ -637,7 +636,7 @@ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const if ( pRowCacheLastTabFrm != pTab || pRowCacheLastCellFrm != pBox ) - bDel = sal_True; + bDel = true; if ( !bDel && pLastRows->GetLeftMin () == nLeftMin && @@ -648,7 +647,7 @@ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const rToFill = *pLastRows; } else - bDel = sal_True; + bDel = true; } if ( bDel ) DELETEZ(pLastRows); @@ -950,10 +949,10 @@ sal_Bool SwFEShell::HasBoxSelection() const return sal_True; SwPaM* pPam = GetCrsr(); // empty boxes are also selected as the absence of selection - sal_Bool bChg = sal_False; + bool bChg = false; if( pPam->GetPoint() == pPam->End()) { - bChg = sal_True; + bChg = true; pPam->Exchange(); } SwNode* pNd; diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 1c8aa4cf9b63..da2faf187eba 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -3130,7 +3130,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, sal_Bool bInWrd = sal_False; sal_Bool bEndWrd = sal_False; sal_Bool bSttWrd = sal_False; - sal_Bool bSttPara= sal_False; + bool bSttPara = false; sal_Bool bTblSel = sal_False; sal_Bool bFrmSel = sal_False; diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index f2e1e3cb3814..86b4b6e9a2eb 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -179,8 +179,8 @@ public: sal_Bool IsInWrd() { return IsInWord(); } sal_Bool IsSttWrd() { return IsStartWord(); } sal_Bool IsEndWrd(); - sal_Bool IsSttOfPara() const { return IsSttPara(); } - sal_Bool IsEndOfPara() const { return IsEndPara(); } + bool IsSttOfPara() const { return IsSttPara(); } + bool IsEndOfPara() const { return IsEndPara(); } // select word / sentense sal_Bool SelNearestWrd(); diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index f98f78e031fd..1c8fd6eb4eec 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -472,7 +472,7 @@ void SwView::HyphenateDocument() pWrtShell->GetCrsr() != pWrtShell->GetCrsr()->GetNext(); sal_Bool bOther = pWrtShell->HasOtherCnt() && bHyphSpecial && !bSelection; sal_Bool bStart = bSelection || ( !bOther && pWrtShell->IsStartOfDoc() ); - sal_Bool bStop = sal_False; + bool bStop = false; if( !bOther && !(pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY) && !bSelection ) // kein Sonderbereich eingeschaltet { @@ -489,7 +489,7 @@ void SwView::HyphenateDocument() } } else - bStop = sal_True; // Nein Es wird nicht getrennt + bStop = true; // Nein Es wird nicht getrennt } if( !bStop ) diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 813a9f566801..6af983eca410 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -1392,7 +1392,7 @@ void SwWrtShell::NumOrBulletOff() // #126346# - Cursor can not be anymore in front of // a label, because numbering/bullet is switched off. - SetInFrontOfLabel( sal_False ); + SetInFrontOfLabel( false ); } } // <- #i29560# |