diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 19:59:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:21 +0100 |
| commit | 8bc3751ea3ce1162137df2d0e10502cd24a3cb92 (patch) | |
| tree | 6e0a16a99e7e9c20bfdb97510da35df9af5256fa | |
| parent | 7dca2dd95b21df2b36c6a8e7e9edfb49dbd2acd1 (diff) | |
bool improvements
Change-Id: Ibeb658e73b588f90242c95d23149f2ef45a7a815
260 files changed, 1111 insertions, 1111 deletions
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx index 330b3934ad76..9230dd397cec 100644 --- a/sw/inc/IDocumentState.hxx +++ b/sw/inc/IDocumentState.hxx @@ -54,7 +54,7 @@ virtual void SetUpdateExpFldStat(bool b) = 0; - virtual void SetLoaded(bool b = sal_True) = 0; + virtual void SetLoaded(bool b = true) = 0; protected: virtual ~IDocumentState() {}; diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index 96dbddf2b883..7ad58f5144da 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -173,7 +173,7 @@ struct SwCrsrMoveState bRealWidth( sal_False ), b2Lines( sal_False ), bNoScroll( sal_False ), - bPosMatchesBounds( sal_False ), + bPosMatchesBounds( false ), bCntntCheck( sal_False ), // #i43742# bInFrontOfLabel( sal_False ), // #i27615# bInNumPortion(sal_False), // #i26726# @@ -194,7 +194,7 @@ struct SwCrsrMoveState bRealWidth( sal_False ), b2Lines( sal_False ), bNoScroll( sal_False ), - bPosMatchesBounds( sal_False ), + bPosMatchesBounds( false ), bCntntCheck( sal_False ), // #i43742# bInFrontOfLabel( sal_False ), // #i27615# bInNumPortion(sal_False), // #i23726# diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 025668d7053a..b4915e5aa935 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -2145,7 +2145,7 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet ) { mbOLEPrtNotifyPending = bSet; if( !bSet ) - mbAllOLENotify = sal_False; + mbAllOLENotify = false; } // namespace <docfunc> for functions and procedures working on a Writer document. diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index d973d3903619..f4e0d49b1ec4 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -34,13 +34,13 @@ protected: const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom, sal_uInt16 nFmtWhich ) : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich ) - { SetAuto( sal_False ); } + { SetAuto( false ); } SwFmtColl( SwAttrPool& rPool, const OUString &rFmtName, const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom, sal_uInt16 nFmtWhich ) : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich ) - { SetAuto( sal_False ); } + { SetAuto( false ); } private: diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index ad510d6083b8..bca043002a85 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -201,10 +201,10 @@ public: /** Go to next content-node that is not protected or hidden (Both set FALSE ==> GoNext/GoPrevious!!!). */ - SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = sal_True, - bool bSkipProtect = sal_True ) const; - SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = sal_True, - bool bSkipProtect = sal_True ) const; + SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = true, + bool bSkipProtect = true ) const; + SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = true, + bool bSkipProtect = true ) const; /** Create an empty section of Start- and EndNote. It may be called only if a new section with content is to be created, diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 87e7402fda21..a72d643f28fc 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -309,7 +309,7 @@ DECLARE_ODFIMPORT_TEST(testFdo68839, "fdo68839.odt") lcl_CheckShape(getShape(4), "graphicsXXX"); try { uno::Reference<drawing::XShape> xShape = getShape(5); - CPPUNIT_ASSERT(!"IndexOutOfBoundsException expected"); + CPPUNIT_FAIL("IndexOutOfBoundsException expected"); } catch (lang::IndexOutOfBoundsException const&) { } // check prev/next chain uno::Reference<beans::XPropertySet> xFrame1(getShape(1), uno::UNO_QUERY); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 6aa0ed81f24f..771c2c5ac8a2 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1701,12 +1701,12 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXGrabBag, "activex.docx") uno::Sequence<beans::PropertyValue> aGrabBag(0); xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty - bool bActiveX = sal_False; + bool bActiveX = false; for(int i = 0; i < aGrabBag.getLength(); ++i) { if (aGrabBag[i].Name == "OOXActiveX") { - bActiveX = sal_True; + bActiveX = true; uno::Reference<xml::dom::XDocument> aActiveXDom; uno::Sequence<uno::Reference<xml::dom::XDocument> > aActiveXDomList; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aActiveXDomList); // PropertyValue of proper type @@ -1729,12 +1729,12 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXBinGrabBag, "activexbin.docx") uno::Sequence<beans::PropertyValue> aGrabBag(0); xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty - bool bActiveX = sal_False; + bool bActiveX = false; for(int i = 0; i < aGrabBag.getLength(); ++i) { if (aGrabBag[i].Name == "OOXActiveXBin") { - bActiveX = sal_True; + bActiveX = true; uno::Reference<io::XInputStream> aActiveXBin; uno::Sequence<uno::Reference<io::XInputStream> > aActiveXBinList; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aActiveXBinList); // PropertyValue of proper type diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index aad81fed4b85..a692a1e9d093 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2824,7 +2824,7 @@ void SwAccessibleMap::InvalidateFocus() { if(GetShell()->IsPreview()) { - uno::Reference<XAccessible> xAcc = _GetDocumentView( sal_True ); + uno::Reference<XAccessible> xAcc = _GetDocumentView( true ); if (xAcc.get()) { SwAccessiblePreview *pAccPreview = static_cast<SwAccessiblePreview *>(xAcc.get()); diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx index bd2485db7460..064146c61514 100644 --- a/sw/source/core/access/accnotexthyperlink.cxx +++ b/sw/source/core/access/accnotexthyperlink.cxx @@ -138,17 +138,17 @@ Reference< XAccessibleKeyBinding > SAL_CALL if(nIndex < 0 || nIndex >= getAccessibleActionCount()) throw lang::IndexOutOfBoundsException(); - bool bIsValid = sal_False; + bool bIsValid = false; SwFmtURL aURL( GetFmt()->GetURL() ); ImageMap* pMap = aURL.GetMap(); if( pMap != NULL ) { IMapObject* pMapObj = pMap->GetIMapObject(nIndex); if (!pMapObj->GetURL().isEmpty()) - bIsValid = sal_True; + bIsValid = true; } else if (!aURL.GetURL().isEmpty()) - bIsValid = sal_True; + bIsValid = true; if(bIsValid) { diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index cda7b0f2e65c..e5d6b42068a5 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1643,7 +1643,7 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) case RES_JUMPEDITFLD: { sal_uInt16 nFormat= pField->GetFormat(); - sal_uInt16 nSize = aMgr.GetFormatCount(pField->GetTypeId(), sal_False); + sal_uInt16 nSize = aMgr.GetFormatCount(pField->GetTypeId(), false); if (nFormat < nSize) { sEntry = aMgr.GetFormatStr(pField->GetTypeId(), nFormat); @@ -1702,7 +1702,7 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) if (nWhich == RES_DOCINFOFLD) { strTypeName = sEntry; - sal_uInt32 nSize = aMgr.GetFormatCount(pField->GetTypeId(), sal_False); + sal_uInt32 nSize = aMgr.GetFormatCount(pField->GetTypeId(), false); sal_uInt16 nExSub = pField->GetSubType() & 0xff00; if (nSize > 0 && nExSub > 0) { @@ -2106,7 +2106,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( SfxItemSet aAutomaticParaStyleCharAttrs( pPaM->GetDoc()->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END -1, 0 ); - aAutomaticParaStyleCharAttrs.Put( *(pTxtNode->GetpSwAttrSet()), sal_False ); + aAutomaticParaStyleCharAttrs.Put( *(pTxtNode->GetpSwAttrSet()), false ); aSet.Put( aAutomaticParaStyleCharAttrs ); } } @@ -2115,7 +2115,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( SfxItemSet aCharAttrsAtPaM( pPaM->GetDoc()->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END -1, 0 ); - SwUnoCursorHelper::GetCrsrAttr(*pPaM, aCharAttrsAtPaM, sal_True, sal_True); + SwUnoCursorHelper::GetCrsrAttr(*pPaM, aCharAttrsAtPaM, true, true); aSet.Put( aCharAttrsAtPaM ); } @@ -2630,7 +2630,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" ); const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() ); SwCrsrMoveState aMoveState; - aMoveState.bPosMatchesBounds = sal_True; + aMoveState.bPosMatchesBounds = true; sal_Bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState ); SwIndex aCntntIdx = aPos.nContent; diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index a18ff554afa3..df5525b7d06c 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -114,7 +114,7 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem ) if( !pItem || RES_TABLEFML_UPDATE != pItem->Which() ) { // reset value flag - ChgValid( sal_False ); + ChgValid( false ); return ; } @@ -130,7 +130,7 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem ) { case TBL_CALC: // reset value flag - ChgValid( sal_False ); + ChgValid( false ); break; case TBL_BOXNAME: if( &pTblNd->GetTable() == pUpdtFld->pTbl ) diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index b3aae158315f..539fca13af87 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -121,7 +121,7 @@ SwMsgPoolItem::SwMsgPoolItem( sal_uInt16 nWhch ) bool SwMsgPoolItem::operator==( const SfxPoolItem& ) const { OSL_FAIL( "SwMsgPoolItem knows no ==" ); - return 0; + return false; } SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 4f49d27e116d..42586121178b 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -552,9 +552,9 @@ void _InitCore() aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] = new SfxStringItem( RES_PARATR_LIST_ID, OUString() ); aAttrTab[ RES_PARATR_LIST_LEVEL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_LEVEL, 0 ); - aAttrTab[ RES_PARATR_LIST_ISRESTART - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISRESTART, sal_False ); + aAttrTab[ RES_PARATR_LIST_ISRESTART - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISRESTART, false ); aAttrTab[ RES_PARATR_LIST_RESTARTVALUE - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_RESTARTVALUE, 1 ); - aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, sal_True ); + aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, true ); aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] = new SwFmtFillOrder; aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] = new SwFmtFrmSize; @@ -595,7 +595,7 @@ void _InitCore() // #i18732# aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] = new SwFmtFollowTextFlow(false); // collapsing borders #i29550# - aAttrTab[ RES_COLLAPSING_BORDERS - POOLATTR_BEGIN ] = new SfxBoolItem( RES_COLLAPSING_BORDERS, sal_False ); + aAttrTab[ RES_COLLAPSING_BORDERS - POOLATTR_BEGIN ] = new SfxBoolItem( RES_COLLAPSING_BORDERS, false ); // #i28701# // #i35017# - constant name has changed aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx index c98531043c5d..9375daa28fb2 100644 --- a/sw/source/core/bastyp/tabcol.cxx +++ b/sw/source/core/bastyp/tabcol.cxx @@ -87,7 +87,7 @@ bool SwTabCols::operator==( const SwTabCols& rCmp ) const SwTabColsEntry aEntry1 = aData[i]; SwTabColsEntry aEntry2 = rCmp.GetData()[i]; if ( aEntry1.nPos != aEntry2.nPos || aEntry1.bHidden != aEntry2.bHidden ) - return sal_False; + return false; } return true; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index d4e1987709a8..fc071f45b89d 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -195,7 +195,7 @@ SwPaM* SwCrsrShell::GetCrsr( sal_Bool bMakeTblCrsr ) const if( m_pTblCrsr->GetPoint()->nNode.GetIndex() && m_pTblCrsr->GetMark()->nNode.GetIndex() && 0 != ( pCNd = m_pTblCrsr->GetCntntNode() ) && pCNd->getLayoutFrm( GetLayout() ) && - 0 != ( pCNd = m_pTblCrsr->GetCntntNode(sal_False) ) && pCNd->getLayoutFrm( GetLayout() ) ) + 0 != ( pCNd = m_pTblCrsr->GetCntntNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) ) { SwShellTableCrsr* pTC = (SwShellTableCrsr*)m_pTblCrsr; GetLayout()->MakeTblCrsrs( *pTC ); @@ -472,7 +472,7 @@ bool SwCrsrShell::bColumnChange() if (pCurrFrm == NULL) { - return sal_False; + return false; } SwFrm* pCurrCol=((SwFrm*)pCurrFrm)->FindColFrm(); @@ -492,11 +492,11 @@ bool SwCrsrShell::bColumnChange() } if(m_oldColFrm == pCurrCol) - return sal_False; + return false; else { m_oldColFrm = pCurrCol; - return sal_True; + return true; } } @@ -1407,8 +1407,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) if( pTstCrsr->HasMark() && !m_pBlockCrsr && mpDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) && ( m_pTblCrsr || - pTstCrsr->GetNode( sal_True )->StartOfSectionNode() != - pTstCrsr->GetNode( sal_False )->StartOfSectionNode() ) && !mbSelectAll) + pTstCrsr->GetNode( true )->StartOfSectionNode() != + pTstCrsr->GetNode( false )->StartOfSectionNode() ) && !mbSelectAll) { SwShellCrsr* pITmpCrsr = getShellCrsr( true ); Point aTmpPt( pITmpCrsr->GetPtPos() ); @@ -1443,7 +1443,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) // Second check if mark is in repeated headline: if ( !bInRepeatedHeadline ) { - SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( sal_False )-> + SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( false )-> getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), sal_False ); OSL_ENSURE( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" ); @@ -2849,7 +2849,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText ) do { bContinue = false; while( 0 != ( pCNd = (rNds.*funcGoSection)( &rNdIdx, - sal_True, !IsReadOnlyAvailable() )) ) + true, !IsReadOnlyAvailable() )) ) { // moved inside a table -> check if it is protected if( pCNd->FindTableNode() ) diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 4e4be9d55539..3b04e760c388 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1318,7 +1318,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt, m_pCurCrsr->GetPoint()->nNode = *((SwTxtFtn*)pTxtAttr)->GetStartNode(); SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection( &m_pCurCrsr->GetPoint()->nNode, - sal_True, !IsReadOnlyAvailable() ); + true, !IsReadOnlyAvailable() ); if( pCNd ) { @@ -2025,7 +2025,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, sal_Bool bS SwNodeIndex* pIdx = &m_pCurCrsr->GetPoint()->nNode; if( !pIdx->GetNode().IsCntntNode() && 0 != ( pCNd = GetDoc()->GetNodes().GoNextSection( pIdx, - sal_True, IsReadOnlyAvailable() )) ) + true, IsReadOnlyAvailable() )) ) { if( *pIdx <= pFnd->End()->nNode ) m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, 0 ); @@ -2048,7 +2048,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, sal_Bool bS pIdx = &m_pCurCrsr->GetPoint()->nNode; if( !pIdx->GetNode().IsCntntNode() && 0 != ( pCNd = GetDoc()->GetNodes().GoPrevSection( pIdx, - sal_True, IsReadOnlyAvailable() )) ) + true, IsReadOnlyAvailable() )) ) { if( *pIdx >= m_pCurCrsr->GetMark()->nNode ) m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, pCNd->Len() ); diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 1aade536a9bf..38aac541ea18 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -220,7 +220,7 @@ SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, bool bFwd, bool bNoCollections ) : aCmpSet( *rSet.GetPool(), RES_CHRATR_BEGIN, RES_TXTATR_END-1 ) { - aCmpSet.Put( rSet, sal_False ); + aCmpSet.Put( rSet, false ); bNoColls = bNoCollections; bForward = bFwd; @@ -971,7 +971,7 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove, SwAttrCheckArr aCmpArr( rSet, bSrchForward, bNoColls ); SfxItemSet aOtherSet( GetDoc()->GetAttrPool(), RES_PARATR_BEGIN, RES_GRFATR_END-1 ); - aOtherSet.Put( rSet, sal_False ); // got all invalid items + aOtherSet.Put( rSet, false ); // got all invalid items FnSearchAttr fnSearch = bSrchForward ? (&::lcl_SearchForward) diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 135a2606202d..9b1a90793f04 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -647,8 +647,8 @@ OUString *ReplaceBackReferences( const SearchOptions& rSearchOpt, SwPaM* pPam ) if( pPam && pPam->HasMark() && SearchAlgorithms_REGEXP == rSearchOpt.algorithmType ) { - const SwCntntNode* pTxtNode = pPam->GetCntntNode( sal_True ); - if( pTxtNode && pTxtNode->IsTxtNode() && pTxtNode == pPam->GetCntntNode( sal_False ) ) + const SwCntntNode* pTxtNode = pPam->GetCntntNode( true ); + if( pTxtNode && pTxtNode->IsTxtNode() && pTxtNode == pPam->GetCntntNode( false ) ) { utl::TextSearch aSTxt( rSearchOpt ); const OUString& rStr = static_cast<const SwTxtNode*>(pTxtNode)->GetTxt(); diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index cb7831413734..59e2dbcf5c69 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -761,8 +761,8 @@ SwCntntNode* GetNode( SwPaM & rPam, sal_Bool& rbFirst, SwMoveFn fnMove, while( true ) { pNd = bSrchForward - ? rNodes.GoNextSection( &aPos.nNode, sal_True, !bInReadOnly ) - : rNodes.GoPrevSection( &aPos.nNode, sal_True, !bInReadOnly ); + ? rNodes.GoNextSection( &aPos.nNode, true, !bInReadOnly ) + : rNodes.GoPrevSection( &aPos.nNode, true, !bInReadOnly ); if( pNd ) { aPos.nContent.Assign( pNd, ::GetSttOrEnd( bSrchForward,*pNd )); diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index b0f1ff0f8b97..c25d93685645 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -485,8 +485,8 @@ sal_Bool SwCursor::IsSelOvr( int eFlags ) pMyNd->StartOfSectionNode()->IsSectionNode() ) ) { pMyNd = bSelTop - ? rNds.GoPrevSection( &GetPoint()->nNode,sal_True,sal_False ) - : rNds.GoNextSection( &GetPoint()->nNode,sal_True,sal_False ); + ? rNds.GoPrevSection( &GetPoint()->nNode,true,false ) + : rNds.GoNextSection( &GetPoint()->nNode,true,false ); /* #i12312# Handle failure of Go{Prev|Next}Section */ if ( 0 == pMyNd) @@ -1636,7 +1636,7 @@ sal_Bool SwCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, SwNodeIndex aNewIdx( *pTableBox->GetSttNd() ); rPtIdx = aNewIdx; - GetDoc()->GetNodes().GoNextSection( &rPtIdx, sal_False, sal_False ); + GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false ); SwCntntNode* pCntntNode = GetCntntNode(); if ( pCntntNode ) { @@ -1669,7 +1669,7 @@ sal_Bool SwCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, SwNodeIndex aNewIdx( *pTableBox->GetSttNd() ); rPtIdx = aNewIdx; - GetDoc()->GetNodes().GoNextSection( &rPtIdx, sal_False, sal_False ); + GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false ); SwCntntNode* pCntntNode = GetCntntNode(); if ( pCntntNode ) { @@ -1745,8 +1745,8 @@ sal_Bool SwCursor::UpDown( sal_Bool bUp, sal_uInt16 nCnt, // If the point/mark of the table cursor in the same box then set cursor to // beginning of the box - if( pTblCrsr && GetNode( sal_True )->StartOfSectionNode() == - GetNode( sal_False )->StartOfSectionNode() ) + if( pTblCrsr && GetNode( true )->StartOfSectionNode() == + GetNode( false )->StartOfSectionNode() ) { if ( End() != GetPoint() ) Exchange(); @@ -1785,7 +1785,7 @@ sal_Bool SwCursor::UpDown( sal_Bool bUp, sal_uInt16 nCnt, // than one paragraph. If we want to go down, we have to set the // point to the last frame in the table box. This is only necessary // if we do not already have a table selection - const SwStartNode* pTblNd = GetNode( sal_True )->FindTableBoxStartNode(); + const SwStartNode* pTblNd = GetNode( true )->FindTableBoxStartNode(); OSL_ENSURE( pTblNd, "pTblCrsr without SwTableNode?" ); if ( pTblNd ) // safety first @@ -1944,7 +1944,7 @@ sal_Bool SwCursor::GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt ) ++rPtIdx; if( !rPtIdx.GetNode().IsCntntNode() ) - GetDoc()->GetNodes().GoNextSection( &rPtIdx, sal_True, sal_False ); + GetDoc()->GetNodes().GoNextSection( &rPtIdx, true, false ); GetPoint()->nContent.Assign( GetCntntNode(), 0 ); return !IsInProtectTable( sal_True ); @@ -2149,7 +2149,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr ) SwNodeIndex aIdx( *pSttNd, 1 ); const SwNode* pNd = &aIdx.GetNode(); if( !pNd->IsCntntNode() ) - pNd = rNds.GoNextSection( &aIdx, sal_True, sal_False ); + pNd = rNds.GoNextSection( &aIdx, true, false ); SwPosition* pPos = pCur->GetMark(); if( pNd != &pPos->nNode.GetNode() ) @@ -2158,7 +2158,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr ) aIdx.Assign( *pSttNd->EndOfSectionNode(), - 1 ); if( !( pNd = &aIdx.GetNode())->IsCntntNode() ) - pNd = rNds.GoPrevSection( &aIdx, sal_True, sal_False ); + pNd = rNds.GoPrevSection( &aIdx, true, false ); pPos = pCur->GetPoint(); if( pNd != &pPos->nNode.GetNode() ) @@ -2191,7 +2191,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr ) break; const SwNode* pNd = &aIdx.GetNode(); if( !pNd->IsCntntNode() ) - pNd = rNds.GoNextSection( &aIdx, sal_True, sal_False ); + pNd = rNds.GoNextSection( &aIdx, true, false ); SwPaM *const pNew = (pAktCrsr->GetNext() == pAktCrsr && !pAktCrsr->HasMark()) ? pAktCrsr @@ -2203,7 +2203,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr ) SwPosition* pPos = pNew->GetPoint(); pPos->nNode.Assign( *pSttNd->EndOfSectionNode(), - 1 ); if( !( pNd = &pPos->nNode.GetNode())->IsCntntNode() ) - pNd = rNds.GoPrevSection( &pPos->nNode, sal_True, sal_False ); + pNd = rNds.GoPrevSection( &pPos->nNode, true, false ); pPos->nContent.Assign( (SwCntntNode*)pNd, ((SwCntntNode*)pNd)->Len() ); } @@ -2228,7 +2228,7 @@ bool SwTableCursor::NewTableSelection() { bool bRet = false; const SwNode *pStart = GetCntntNode()->FindTableBoxStartNode(); - const SwNode *pEnd = GetCntntNode(sal_False)->FindTableBoxStartNode(); + const SwNode *pEnd = GetCntntNode(false)->FindTableBoxStartNode(); if( pStart && pEnd ) { const SwTableNode *pTableNode = pStart->FindTableNode(); diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx index 68dc6c7e7e17..b956e2b7f958 100644 --- a/sw/source/core/crsr/trvlfnfl.cxx +++ b/sw/source/core/crsr/trvlfnfl.cxx @@ -63,7 +63,7 @@ sal_Bool SwCursor::GotoFtnTxt() SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection( &GetPoint()->nNode, - sal_True, !IsReadOnlyAvailable() ); + true, !IsReadOnlyAvailable() ); if( pCNd ) { GetPoint()->nContent.Assign( pCNd, 0 ); diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx index e123a5437400..04df75b3bbb0 100644 --- a/sw/source/core/crsr/trvlreg.cxx +++ b/sw/source/core/crsr/trvlreg.cxx @@ -53,7 +53,7 @@ sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, { aIdx = *pNd; SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx, - sal_True, !bInReadOnly ); + true, !bInReadOnly ); if( !pCNd ) { aIdx--; @@ -65,7 +65,7 @@ sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, { aIdx = *pNd->EndOfSectionNode(); SwCntntNode* pCNd = pNd->GetNodes().GoPrevSection( &aIdx, - sal_True, !bInReadOnly ); + true, !bInReadOnly ); if( !pCNd ) { aIdx.Assign( *pNd, - 1 ); @@ -107,7 +107,7 @@ sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, { aIdx = *pNd; SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx, - sal_True, !bInReadOnly ); + true, !bInReadOnly ); if( !pCNd ) { aIdx.Assign( *pNd->EndOfSectionNode(), +1 ); @@ -119,7 +119,7 @@ sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, { aIdx = *pNd->EndOfSectionNode(); SwCntntNode* pCNd = pNd->GetNodes().GoPrevSection( &aIdx, - sal_True, !bInReadOnly ); + true, !bInReadOnly ); if( !pCNd ) { ++aIdx; @@ -148,12 +148,12 @@ sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, if( bMoveBackward ) { SwNodeIndex aIdx( *pNd->EndOfSectionNode() ); - pCNd = pNd->GetNodes().GoPrevSection( &aIdx, sal_True, !bInReadOnly ); + pCNd = pNd->GetNodes().GoPrevSection( &aIdx, true, !bInReadOnly ); } else { SwNodeIndex aIdx( *pNd ); - pCNd = pNd->GetNodes().GoNextSection( &aIdx, sal_True, !bInReadOnly ); + pCNd = pNd->GetNodes().GoNextSection( &aIdx, true, !bInReadOnly ); } if( pCNd ) @@ -181,7 +181,7 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, if( bMoveBackward ) // to the end of the section { SwNodeIndex aIdx( *pNd->EndOfSectionNode() ); - pCNd = pNd->GetNodes().GoPrevSection( &aIdx, sal_True, !bInReadOnly ); + pCNd = pNd->GetNodes().GoPrevSection( &aIdx, true, !bInReadOnly ); if( !pCNd ) return sal_False; pPos->nNode = aIdx; @@ -189,7 +189,7 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, else { SwNodeIndex aIdx( *pNd ); - pCNd = pNd->GetNodes().GoNextSection( &aIdx, sal_True, !bInReadOnly ); + pCNd = pNd->GetNodes().GoNextSection( &aIdx, true, !bInReadOnly ); if( !pCNd ) return sal_False; pPos->nNode = aIdx; diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 19590a968e4b..f8ed4611e09b 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -176,7 +176,7 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) { const SwShellCrsr *pCrsr = _GetCrsr(); const SwFrm* pStartFrm = pFrm; - const SwCntntNode *pCNd = pCrsr->GetCntntNode( sal_False ); + const SwCntntNode *pCNd = pCrsr->GetCntntNode( false ); const SwFrm* pEndFrm = pCNd ? pCNd->getLayoutFrm( GetLayout(), &pCrsr->GetMkPos() ) : 0; if ( bRow ) diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx index efc0b56642c1..2237ab42491e 100644 --- a/sw/source/core/crsr/unocrsr.cxx +++ b/sw/source/core/crsr/unocrsr.cxx @@ -212,7 +212,7 @@ void SwUnoTableCrsr::MakeBoxSels() bool bMakeTblCrsrs = true; if( GetPoint()->nNode.GetIndex() && GetMark()->nNode.GetIndex() && 0 != ( pCNd = GetCntntNode() ) && pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) && - 0 != ( pCNd = GetCntntNode(sal_False) ) && pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) ) + 0 != ( pCNd = GetCntntNode(false) ) && pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) ) bMakeTblCrsrs = GetDoc()->GetCurrentLayout()->MakeTblCrsrs( *this ); if ( !bMakeTblCrsrs ) diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 96e106ecd231..d88c3a9e3438 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -690,7 +690,7 @@ void SwShellTableCrsr::FillRects() const SwTableNode* pSelTblNd = pSttNd->FindTableNode(); SwNodeIndex aIdx( *pSttNd ); - SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, sal_True, sal_False ); + SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false ); // table in table // (see also lcl_FindTopLevelTable in unoobj2.cxx for a different @@ -699,7 +699,7 @@ void SwShellTableCrsr::FillRects() while ( pSelTblNd != pCurTblNd && pCurTblNd ) { aIdx = pCurTblNd->EndOfSectionIndex(); - pCNd = rNds.GoNextSection( &aIdx, sal_True, sal_False ); + pCNd = rNds.GoNextSection( &aIdx, true, false ); pCurTblNd = pCNd->FindTableNode(); } @@ -735,7 +735,7 @@ sal_Bool SwShellTableCrsr::IsInside( const Point& rPt ) const for (size_t n = 0; n < m_SelectedBoxes.size(); ++n) { SwNodeIndex aIdx( *m_SelectedBoxes[n]->GetSttNd() ); - SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, sal_True, sal_False ); + SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false ); if( !pCNd ) continue; diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index cc362b2ff2e9..d895ae9f8e4b 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -218,7 +218,7 @@ SwAutoCompleteWord::SwAutoCompleteWord( sal_uInt16 nWords, sal_uInt16 nMWrdLen ) pImpl(new SwAutoCompleteWord_Impl(*this)), nMaxCount( nWords ), nMinWrdLen( nMWrdLen ), - bLockWordLst( sal_False ) + bLockWordLst( false ) { } @@ -242,7 +242,7 @@ bool SwAutoCompleteWord::InsertWord( const OUString& rWord, SwDoc& rDoc ) { const INetURLObject& rURL = pMedium->GetURLObject(); if ( rURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ) - return sal_False; + return false; } OUString aNewWord(rWord); diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index f0f1aa91b7a0..e5d35ddc5ca0 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -617,7 +617,7 @@ OutputDevice* SwDoc::getReferenceDevice(/*[in]*/ bool bCreate ) const if ( bCreate && !mpPrt->IsValid() ) { - pRet = getVirtualDevice( sal_True ); + pRet = getVirtualDevice( true ); } } else @@ -918,7 +918,7 @@ bool SwDoc::AppendTxtNode( SwPosition& rPos ) } SetModified(); - return sal_True; + return true; } bool SwDoc::InsertString( const SwPaM &rRg, const OUString &rStr, @@ -1914,13 +1914,13 @@ void SwDoc::SetModified() // Bit 0: -> old state // Bit 1: -> new state sal_IntPtr nCall = mbModified ? 3 : 2; - mbModified = sal_True; + mbModified = true; mpDocStat->bModified = sal_True; if( maOle2Link.IsSet() ) { - mbInCallModified = sal_True; + mbInCallModified = true; maOle2Link.Call( (void*)nCall ); - mbInCallModified = sal_False; + mbInCallModified = false; } if( mpACEWord && !mpACEWord->IsDeleted() ) @@ -1933,13 +1933,13 @@ void SwDoc::ResetModified() // Bit 0: -> old state // Bit 1: -> new state sal_IntPtr nCall = mbModified ? 1 : 0; - mbModified = sal_False; + mbModified = false; GetIDocumentUndoRedo().SetUndoNoModifiedPosition(); if( nCall && maOle2Link.IsSet() ) { - mbInCallModified = sal_True; + mbInCallModified = true; maOle2Link.Call( (void*)nCall ); - mbInCallModified = sal_False; + mbInCallModified = false; } } @@ -2192,7 +2192,7 @@ bool SwDoc::RemoveInvisibleContent() SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength()); if ( pTxtNd->HasHiddenCharAttribute( true ) ) { - bRemoved = sal_True; + bRemoved = true; bRet = true; // Remove hidden paragraph or delete contents: @@ -2214,7 +2214,7 @@ bool SwDoc::RemoveInvisibleContent() } else if ( pTxtNd->HasHiddenCharAttribute( false ) ) { - bRemoved = sal_True; + bRemoved = true; bRet = true; SwScriptInfo::DeleteHiddenRanges( *pTxtNd ); } @@ -2588,9 +2588,9 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew) OUString SwDoc::GetPaMDescr(const SwPaM & rPam) const { - if (rPam.GetNode(sal_True) == rPam.GetNode(sal_False)) + if (rPam.GetNode(true) == rPam.GetNode(false)) { - SwTxtNode * pTxtNode = rPam.GetNode(sal_True)->GetTxtNode(); + SwTxtNode * pTxtNode = rPam.GetNode(true)->GetTxtNode(); if (0 != pTxtNode) { @@ -2604,9 +2604,9 @@ OUString SwDoc::GetPaMDescr(const SwPaM & rPam) const + SW_RESSTR(STR_END_QUOTE); } } - else if (0 != rPam.GetNode(sal_True)) + else if (0 != rPam.GetNode(true)) { - if (0 != rPam.GetNode(sal_False)) + if (0 != rPam.GetNode(false)) { return SW_RESSTR(STR_PARAGRAPHS); } diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index faae1a5b5ae4..e4837a3a6c2e 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1205,7 +1205,7 @@ namespace ? rPam.GetPoint() == &rPam.GetBound() : rPam.GetMark() == &rPam.GetBound()); - const SwPosition* pPos = &rPam.GetBound( sal_True ); + const SwPosition* pPos = &rPam.GetBound( true ); if( pPos->nNode.GetIndex() == nNode && ( bBound1IsStart ? pPos->nContent.GetIndex() < nCntnt : pPos->nContent.GetIndex() <= nCntnt )) @@ -1214,7 +1214,7 @@ namespace rSave.Add( rSaveArr ); } - pPos = &rPam.GetBound( sal_False ); + pPos = &rPam.GetBound( false ); if( pPos->nNode.GetIndex() == nNode && ( (bBound1IsStart && bChkSelDirection) ? pPos->nContent.GetIndex() <= nCntnt @@ -1311,12 +1311,12 @@ void SaveBookmark::SetInDoc( if(pIdx && !m_nNode2) aPam.GetMark()->nContent += m_nCntnt2; else - aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(sal_False), m_nCntnt2); + aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2); } else { aPam.GetMark()->nNode = m_nNode2; - aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(sal_False), m_nCntnt2); + aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2); } } @@ -1384,8 +1384,8 @@ void _DelBookmarks( // Is at position? SwRangeRedline* pRedl = rTbl[ nCnt ]; - SwPosition *pRStt = &pRedl->GetBound(sal_True), - *pREnd = &pRedl->GetBound(sal_False); + SwPosition *pRStt = &pRedl->GetBound(true), + *pREnd = &pRedl->GetBound(false); if( *pRStt > *pREnd ) { SwPosition *pTmp = pRStt; pRStt = pREnd, pREnd = pTmp; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index c269ceec588d..eb233d2a7b63 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -882,7 +882,7 @@ void Compare::ShiftBoundaries( CompareData& rData1, CompareData& rData2 ) sal_uLong preceding = ULONG_MAX; sal_uLong other_preceding = ULONG_MAX; - while (1) + while (true) { sal_uLong start, other_start; @@ -904,7 +904,7 @@ void Compare::ShiftBoundaries( CompareData& rData1, CompareData& rData2 ) start = i; other_start = j; - while (1) + while (true) { /* Now find the end of this run of changes. */ @@ -925,7 +925,7 @@ void Compare::ShiftBoundaries( CompareData& rData1, CompareData& rData2 ) !pOtherData->GetChanged( j ) && !( start == preceding || other_start == other_preceding )) { - pData->SetChanged( start++, 0 ); + pData->SetChanged( start++, false ); pData->SetChanged( i ); /* Since one line-that-matches is now before this run instead of after, we must advance in the other file @@ -1368,7 +1368,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine, if ( nSrcFrom < nSrcTo ) { sal_Bool bUndo = pDstDoc->GetIDocumentUndoRedo().DoesUndo(); - pDstDoc->GetIDocumentUndoRedo().DoUndo( sal_False ); + pDstDoc->GetIDocumentUndoRedo().DoUndo( false ); SwPaM aCpyPam( rSrcNd, nSrcFrom ); aCpyPam.SetMark(); aCpyPam.GetPoint()->nContent = nSrcTo; @@ -2097,7 +2097,7 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const { if( nIdx1 < 0 || nIdx2 < 0 || nIdx1 >= nLen1 || nIdx2 >= nLen2 ) { - OSL_ENSURE( 0, "Index out of range!" ); + OSL_ENSURE( false, "Index out of range!" ); return false; } @@ -2175,7 +2175,7 @@ bool CharArrayComparator::Compare( int nIdx1, int nIdx2 ) const { if( nIdx1 < 0 || nIdx2 < 0 || nIdx1 >= GetLen1() || nIdx2 >= GetLen2() ) { - OSL_ENSURE( 0, "Index out of range!" ); + OSL_ENSURE( false, "Index out of range!" ); return false; } diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index ba16cdc2d6f3..488c70cb276e 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -173,7 +173,7 @@ bool SwDoc::GetData( const OUString& rItem, const OUString& rMimeType, return SwServerObject( *aPara.pTblNd ).GetData( rValue, rMimeType ); } - return sal_False; + return false; } bool SwDoc::SetData( const OUString& rItem, const OUString& rMimeType, @@ -217,7 +217,7 @@ bool SwDoc::SetData( const OUString& rItem, const OUString& rMimeType, return SwServerObject( *aPara.pTblNd ).SetData( rMimeType, rValue ); } - return sal_False; + return false; } ::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const OUString& rItem) diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 52b7ebcfc866..64d1fb389f5e 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -653,7 +653,7 @@ void SwDoc::PrtDataChanged() // #i41075# OSL_ENSURE( get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) || - 0 != getPrinter( sal_False ), "PrtDataChanged will be called recursively!" ); + 0 != getPrinter( false ), "PrtDataChanged will be called recursively!" ); SwRootFrm* pTmpRoot = GetCurrentLayout(); boost::scoped_ptr<SwWait> pWait; bool bEndAction = false; @@ -740,16 +740,16 @@ void SwDoc::PrtOLENotify( sal_Bool bAll ) // Because we don't have a Shell we remember this unfortunate situation // in the document, // which is made up for later on when creating the first Shell. - mbOLEPrtNotifyPending = sal_True; + mbOLEPrtNotifyPending = true; if ( bAll ) - mbAllOLENotify = sal_True; + mbAllOLENotify = true; } else { if ( mbAllOLENotify ) bAll = sal_True; - mbOLEPrtNotifyPending = mbAllOLENotify = sal_False; + mbOLEPrtNotifyPending = mbAllOLENotify = false; SwOLENodes *pNodes = SwCntntNode::CreateOLENodesArray( *GetDfltGrfFmtColl(), !bAll ); if ( pNodes ) @@ -806,7 +806,7 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, ) SwFEShell* pSh = (SwFEShell*)GetEditShell(); if( pSh ) { - mbOLEPrtNotifyPending = mbAllOLENotify = sal_False; + mbOLEPrtNotifyPending = mbAllOLENotify = false; SwOLENodes *pNodes = SwCntntNode::CreateOLENodesArray( *GetDfltGrfFmtColl(), true ); if( pNodes ) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index da57321ed813..0a4cc5c37f8a 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -578,7 +578,7 @@ void SwDoc::InitDrawModel() mnInvisibleControls = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID(); } - SdrPage* pMasterPage = mpDrawModel->AllocPage( sal_False ); + SdrPage* pMasterPage = mpDrawModel->AllocPage( false ); mpDrawModel->InsertPage( pMasterPage ); SAL_INFO( "sw.doc", "after create DrawDocument" ); SAL_INFO( "sw.doc", "before create Spellchecker/Hyphenator" ); @@ -627,13 +627,13 @@ void SwDoc::NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) { OUString sLayerNm; sLayerNm = "InvisibleHell"; - _rSdrPageView.SetLayerVisible( sLayerNm, sal_False ); + _rSdrPageView.SetLayerVisible( sLayerNm, false ); sLayerNm = "InvisibleHeaven"; - _rSdrPageView.SetLayerVisible( sLayerNm, sal_False ); + _rSdrPageView.SetLayerVisible( sLayerNm, false ); sLayerNm = "InvisibleControls"; - _rSdrPageView.SetLayerVisible( sLayerNm, sal_False ); + _rSdrPageView.SetLayerVisible( sLayerNm, false ); } /** method to determine, if a layer ID belongs to the visible ones. diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 2a0a14a2cd7e..87d601b4ae04 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -114,7 +114,7 @@ struct _SaveRedline if( pRedl->HasMark() ) { pRedl->GetMark()->nNode = nInsPos + nEnd; - pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(sal_False), nEndCnt ); + pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt ); } } @@ -125,7 +125,7 @@ struct _SaveRedline if( pRedl->HasMark() ) { pRedl->GetMark()->nNode = aPos.nNode.GetIndex() + nEnd; - pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(sal_False), nEndCnt + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) ); + pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) ); } } }; @@ -337,7 +337,7 @@ static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd, SwFtnIdxs& rFtnArr, SwFtnIdxs& rSaveArr, const SwIndex* pSttCnt = 0, const SwIndex* pEndCnt = 0 ) { - bool bUpdateFtn = sal_False; + bool bUpdateFtn = false; const SwNodes& rNds = rInsPos.GetNodes(); const bool bDelFtn = rInsPos.GetIndex() < rNds.GetEndOfAutotext().GetIndex() && rSttNd.GetIndex() >= rNds.GetEndOfAutotext().GetIndex(); @@ -382,7 +382,7 @@ static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd, if( bSaveFtn ) rSaveArr.insert( pSrch ); } - bUpdateFtn = sal_True; + bUpdateFtn = true; } } @@ -410,7 +410,7 @@ static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd, if( bSaveFtn ) rSaveArr.insert( pSrch ); } - bUpdateFtn = sal_True; + bUpdateFtn = true; } } } @@ -429,7 +429,7 @@ static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd, static_cast<SwTxtNode*>(pNode)->GetpSwpHints(); if( pHints && pHints->HasFtn() ) //...with footnotes { - bUpdateFtn = sal_True; // Heureka + bUpdateFtn = true; // Heureka sal_uInt16 nCount = pHints->Count(); for( sal_uInt16 i = 0; i < nCount; ++i ) { @@ -804,7 +804,7 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const OUString &rStr ) } SetModified(); - return sal_True; + return true; } bool SwDoc::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags ) @@ -1202,7 +1202,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos, } SetModified(); - return sal_True; + return true; } /// Convert list of ranges of whichIds to a corresponding list of whichIds @@ -1344,10 +1344,10 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ) // If the passed PaM is not in the Crsr ring, // treat it separately (e.g. when it's being called from AutoFormat) - if( pOldTxtNd == rPam.GetBound( sal_True ).nContent.GetIdxReg() ) - rPam.GetBound( sal_True ) = aAlphaPos; - if( pOldTxtNd == rPam.GetBound( sal_False ).nContent.GetIdxReg() ) - rPam.GetBound( sal_False ) = aAlphaPos; + if( pOldTxtNd == rPam.GetBound( true ).nContent.GetIdxReg() ) + rPam.GetBound( true ) = aAlphaPos; + if( pOldTxtNd == rPam.GetBound( false ).nContent.GetIdxReg() ) + rPam.GetBound( false ) = aAlphaPos; } // delete the Node, at last! pDoc->GetNodes().Delete( aOldIdx, 1 ); @@ -1386,13 +1386,13 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ) pDoc->CorrRel( aIdx, *rPam.GetPoint(), 0, sal_True ); // #i100466# adjust given <rPam>, if it does not belong to the cursors - if ( pDelNd == rPam.GetBound( sal_True ).nContent.GetIdxReg() ) + if ( pDelNd == rPam.GetBound( true ).nContent.GetIdxReg() ) { - rPam.GetBound( sal_True ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) ); + rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) ); } - if( pDelNd == rPam.GetBound( sal_False ).nContent.GetIdxReg() ) + if( pDelNd == rPam.GetBound( false ).nContent.GetIdxReg() ) { - rPam.GetBound( sal_False ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) ); + rPam.GetBound( false ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) ); } pTxtNd->JoinNext(); } @@ -2475,7 +2475,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam ) /* #i9185# Prevent getting the node after the end node (see below) */ rEnd.nNode.GetIndex() + 1 == GetNodes().Count() ) { - return sal_False; + return false; } // Move hard page brakes to the following Node. @@ -2556,7 +2556,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam ) if( !rPam.Move( fnMoveBackward, fnGoNode )) { OSL_FAIL( "no more Nodes" ); - return sal_False; + return false; } } // move bookmarks, redlines etc. @@ -2588,16 +2588,16 @@ bool SwDoc::DelFullPara( SwPaM& rPam ) } } - SwCntntNode *pTmpNode = rPam.GetBound( sal_True ).nNode.GetNode().GetCntntNode(); - rPam.GetBound( sal_True ).nContent.Assign( pTmpNode, 0 ); - pTmpNode = rPam.GetBound( sal_False ).nNode.GetNode().GetCntntNode(); - rPam.GetBound( sal_False ).nContent.Assign( pTmpNode, 0 ); + SwCntntNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetCntntNode(); + rPam.GetBound( true ).nContent.Assign( pTmpNode, 0 ); + pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetCntntNode(); + rPam.GetBound( false ).nContent.Assign( pTmpNode, 0 ); GetNodes().Delete( aRg.aStart, nNodeDiff+1 ); } rPam.DeleteMark(); SetModified(); - return sal_True; + return true; } void SwDoc::TransliterateText( @@ -2689,7 +2689,7 @@ void SwDoc::checkRedlining(RedlineMode_t& _rReadlineMode) { MessageDialog aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui"); sal_uInt16 nResult = aQuery.Execute(); - mbReadlineChecked = sal_True; + mbReadlineChecked = true; if ( nResult == RET_YES ) { sal_Int32 nMode = (sal_Int32)_rReadlineMode; diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 190c1c9cf8bd..35e3928e24b2 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -192,7 +192,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp ) ((SwSetExpFieldType&)rFldTyp).SetDeleted( sal_False ); break; case RES_USERFLD: - ((SwUserFieldType&)rFldTyp).SetDeleted( sal_False ); + ((SwUserFieldType&)rFldTyp).SetDeleted( false ); break; case RES_DDEFLD: ((SwDDEFieldType&)rFldTyp).SetDeleted( sal_False ); @@ -226,7 +226,7 @@ void SwDoc::RemoveFldType(sal_uInt16 nFld) if( RES_SETEXPFLD == nWhich ) ((SwSetExpFieldType*)pTmp)->SetDeleted( sal_True ); else if( RES_USERFLD == nWhich ) - ((SwUserFieldType*)pTmp)->SetDeleted( sal_True ); + ((SwUserFieldType*)pTmp)->SetDeleted( true ); else ((SwDDEFieldType*)pTmp)->SetDeleted( sal_True ); nWhich = 0; @@ -340,7 +340,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) } if( !IsExpFldsLocked() ) - UpdateExpFlds( 0, sal_False ); // update expression fields + UpdateExpFlds( 0, false ); // update expression fields // Tables UpdateTblFlds(pNewHt); @@ -437,7 +437,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt ) if( nsSwExtendedSubType::SUB_CMD & pFld->GetSubType() ) pFld->PtrToBoxNm( pUpdtFld->pTbl ); else - pFld->ChgValid( sal_False ); + pFld->ChgValid( false ); break; case TBL_BOXNAME: // is this the wanted table? @@ -463,7 +463,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt ) } else // reset the value flag for all - pFld->ChgValid( sal_False ); + pFld->ChgValid( false ); } } @@ -1082,7 +1082,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld ) { // create the sorted list of all SetFields mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC ); - mbNewFldLst = sal_False; + mbNewFldLst = false; SwNewDBMgr* pMgr = GetNewDBMgr(); pMgr->CloseAll(sal_False); @@ -1103,7 +1103,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt ) { // create the sorted list of all SetFields mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC ); - mbNewFldLst = sal_False; + mbNewFldLst = false; SwNewDBMgr* pMgr = GetNewDBMgr(); pMgr->CloseAll(sal_False); @@ -1126,7 +1126,7 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize, { // create the sorted list of all SetFields mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_EXPAND ); - mbNewFldLst = sal_False; + mbNewFldLst = false; // Hash table for all string replacements is filled on-the-fly. // Try to fabricate an uneven number. @@ -1210,8 +1210,8 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds ) bool bOldInUpdateFlds = mpUpdtFlds->IsInUpdateFlds(); mpUpdtFlds->SetInUpdateFlds( true ); - mpUpdtFlds->MakeFldList( *this, sal_True, GETFLD_ALL ); - mbNewFldLst = sal_False; + mpUpdtFlds->MakeFldList( *this, true, GETFLD_ALL ); + mbNewFldLst = false; if( mpUpdtFlds->GetSortLst()->empty() ) { @@ -2250,13 +2250,13 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) { pSectNd = rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode(); OSL_ENSURE( pSectNd, "Where is my SectionNode" ); - pSectNd->GetSection().SetCondHidden( sal_False ); + pSectNd->GetSection().SetCondHidden( false ); } for (sal_uInt16 n = 0; n < nArrStt; ++n) { pSectNd = rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode(); OSL_ENSURE( pSectNd, "Where is my SectionNode" ); - pSectNd->GetSection().SetCondHidden( sal_False ); + pSectNd->GetSection().SetCondHidden( false ); } // add all to the list so that they are sorted @@ -2544,7 +2544,7 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType ) SwDocUpdtFld::SwDocUpdtFld(SwDoc* pDoc) : pFldSortLst(0), nFldLstGetMode(0), pDocument(pDoc) { - bInUpdateFlds = bFldsDirty = sal_False; + bInUpdateFlds = bFldsDirty = false; memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) ); } @@ -2633,7 +2633,7 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld, // ContentString correctly SwDBField* pDBFld = (SwDBField*)pNewFld; if (pDBFld->IsInitialized()) - pDBFld->ChgValue( pDBFld->GetValue(), sal_True ); + pDBFld->ChgValue( pDBFld->GetValue(), true ); pDBFld->ClearInitialized(); pDBFld->InitContent(); diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index b5ae2c6d9604..8d9041daab71 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -507,7 +507,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, // The medium isn't locked after reopening the document. SfxRequest aReq( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, GetAttrPool() ); aReq.AppendItem( SfxStringItem( SID_FILE_NAME, rPath ) ); - aReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) ); + aReq.AppendItem( SfxBoolItem( SID_SAVETO, true ) ); if(pFilter) aReq.AppendItem( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) ); const SfxBoolItem *pRet = (const SfxBoolItem*)mpDocShell->ExecuteSlot( aReq ); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 790e236afc54..f5e793bd0d44 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -502,7 +502,7 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc, SdrPage *pPg = GetOrCreateDrawModel()->GetPage( 0 ); if( !pPg ) { - pPg = GetDrawModel()->AllocPage( sal_False ); + pPg = GetDrawModel()->AllocPage( false ); GetDrawModel()->InsertPage( pPg ); } @@ -1553,7 +1553,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, rDoc.GetInvisibleHellId() != nLayerId ) { SvxOpaqueItem aOpaque( RES_OPAQUE ); - aOpaque.SetValue( sal_True ); + aOpaque.SetValue( true ); pNewSet->Put( aOpaque ); } @@ -1862,7 +1862,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer ) pStartSh->LockView( sal_True ); GetSysFldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 ); // ChapterField - UpdateExpFlds( 0, sal_False ); // Updates ExpressionFields + UpdateExpFlds( 0, false ); // Updates ExpressionFields UpdateTblFlds(NULL); // Tables UpdateRefFlds(NULL); // References diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index c694880aaa17..0ded25694842 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -949,7 +949,7 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted) } else { - InsertPoolItem( rPam, SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, sal_False ), 0 ); + InsertPoolItem( rPam, SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, false ), 0 ); } } @@ -1954,12 +1954,12 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) for( sal_uInt16 n = 0; n < GetRedlineTbl().size(); ++n ) { SwRangeRedline* pTmp = GetRedlineTbl()[ n ]; - if( ( pPos = &pTmp->GetBound(sal_True))->nNode == aIdx ) + if( ( pPos = &pTmp->GetBound(true))->nNode == aIdx ) { pPos->nNode++; pPos->nContent.Assign( pPos->nNode.GetNode().GetCntntNode(),0); } - if( ( pPos = &pTmp->GetBound(sal_False))->nNode == aIdx ) + if( ( pPos = &pTmp->GetBound(false))->nNode == aIdx ) { pPos->nNode++; pPos->nContent.Assign( pPos->nNode.GetNode().GetCntntNode(),0); @@ -1989,8 +1989,8 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) // prevent assertion from aPam's target being deleted // (Alternatively, one could just let aPam go out of scope, but // that requires touching a lot of code.) - aPam.GetBound(sal_True).nContent.Assign( NULL, 0 ); - aPam.GetBound(sal_False).nContent.Assign( NULL, 0 ); + aPam.GetBound(true).nContent.Assign( NULL, 0 ); + aPam.GetBound(false).nContent.Assign( NULL, 0 ); AppendRedline( pNewRedline, true ); diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 6e3f940006f0..7df8b57aa3d0 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -1145,7 +1145,7 @@ bool SwDoc::AppendRedline( SwRangeRedline* pNewRedl, bool bCallDelete ) else pNewRedl->SetEnd( *pREnd, pEnd ); mpRedlineTbl->DeleteAndDestroy( n ); - bDec = 0; + bDec = false; } else if( POS_OVERLAP_BEHIND == eCmpPos ) pNewRedl->SetStart( *pREnd, pStt ); @@ -1341,7 +1341,7 @@ bool SwDoc::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo, { if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & meRedlineMode || !rRange.HasMark() || *rRange.GetMark() == *rRange.GetPoint() ) - return sal_False; + return false; bool bChg = false; @@ -1687,8 +1687,8 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, if( pCSttNd && !pCEndNd ) { - aPam.GetBound( sal_True ).nContent.Assign( 0, 0 ); - aPam.GetBound( sal_False ).nContent.Assign( 0, 0 ); + aPam.GetBound( true ).nContent.Assign( 0, 0 ); + aPam.GetBound( false ).nContent.Assign( 0, 0 ); aPam.DeleteMark(); rDoc.DelFullPara( aPam ); } @@ -1797,8 +1797,8 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, if( pCSttNd && !pCEndNd ) { - aPam.GetBound( sal_True ).nContent.Assign( 0, 0 ); - aPam.GetBound( sal_False ).nContent.Assign( 0, 0 ); + aPam.GetBound( true ).nContent.Assign( 0, 0 ); + aPam.GetBound( false ).nContent.Assign( 0, 0 ); aPam.DeleteMark(); rDoc.DelFullPara( aPam ); } @@ -3371,10 +3371,10 @@ void SwRangeRedline::MoveToSection() for( sal_uInt16 n = 0; n < rTbl.size(); ++n ) { SwRangeRedline* pRedl = rTbl[ n ]; - if( pRedl->GetBound(sal_True) == *pStt ) - pRedl->GetBound(sal_True) = *pEnd; - if( pRedl->GetBound(sal_False) == *pStt ) - pRedl->GetBound(sal_False) = *pEnd; + if( pRedl->GetBound(true) == *pStt ) + pRedl->GetBound(true) = *pEnd; + if( pRedl->GetBound(false) == *pStt ) + pRedl->GetBound(false) = *pEnd; } } @@ -3441,7 +3441,7 @@ void SwRangeRedline::CopyToSection() sal_Bool bSaveCopyFlag = pDoc->IsCopyIsMove(), bSaveRdlMoveFlg = pDoc->IsRedlineMove(); - pDoc->SetCopyIsMove( sal_True ); + pDoc->SetCopyIsMove( true ); // The IsRedlineMove() flag causes the behaviour of the // SwDoc::_CopyFlyInFly method to change, which will eventually be @@ -3524,10 +3524,10 @@ void SwRangeRedline::DelCopyOfSection() for( sal_uInt16 n = 0; n < rTbl.size(); ++n ) { SwRangeRedline* pRedl = rTbl[ n ]; - if( pRedl->GetBound(sal_True) == *pStt ) - pRedl->GetBound(sal_True) = *pEnd; - if( pRedl->GetBound(sal_False) == *pStt ) - pRedl->GetBound(sal_False) = *pEnd; + if( pRedl->GetBound(true) == *pStt ) + pRedl->GetBound(true) = *pEnd; + if( pRedl->GetBound(false) == *pStt ) + pRedl->GetBound(false) = *pEnd; } } @@ -3557,14 +3557,14 @@ void SwRangeRedline::DelCopyOfSection() { --n; bBreak = true; - if( rTbl[ n ]->GetBound(sal_True) == *aPam.GetPoint() ) + if( rTbl[ n ]->GetBound(true) == *aPam.GetPoint() ) { - rTbl[ n ]->GetBound(sal_True) = *pEnd; + rTbl[ n ]->GetBound(true) = *pEnd; bBreak = false; } - if( rTbl[ n ]->GetBound(sal_False) == *aPam.GetPoint() ) + if( rTbl[ n ]->GetBound(false) == *aPam.GetPoint() ) { - rTbl[ n ]->GetBound(sal_False) = *pEnd; + rTbl[ n ]->GetBound(false) = *pEnd; bBreak = false; } } @@ -3574,8 +3574,8 @@ void SwRangeRedline::DelCopyOfSection() *GetMark() = *pEnd; DeleteMark(); - aPam.GetBound( sal_True ).nContent.Assign( 0, 0 ); - aPam.GetBound( sal_False ).nContent.Assign( 0, 0 ); + aPam.GetBound( true ).nContent.Assign( 0, 0 ); + aPam.GetBound( false ).nContent.Assign( 0, 0 ); aPam.DeleteMark(); pDoc->DelFullPara( aPam ); } @@ -3607,14 +3607,14 @@ void SwRangeRedline::MoveFromSection() for( n = nMyPos+1; !bBreak && n < rTbl.size(); ++n ) { bBreak = true; - if( rTbl[ n ]->GetBound(sal_True) == *GetPoint() ) + if( rTbl[ n ]->GetBound(true) == *GetPoint() ) { - aBehindArr.push_back( &rTbl[ n ]->GetBound(sal_True) ); + aBehindArr.push_back( &rTbl[ n ]->GetBound(true) ); bBreak = false; } - if( rTbl[ n ]->GetBound(sal_False) == *GetPoint() ) + if( rTbl[ n ]->GetBound(false) == *GetPoint() ) { - aBehindArr.push_back( &rTbl[ n ]->GetBound(sal_False) ); + aBehindArr.push_back( &rTbl[ n ]->GetBound(false) ); bBreak = false; } } @@ -3622,14 +3622,14 @@ void SwRangeRedline::MoveFromSection() { --n; bBreak = true; - if( rTbl[ n ]->GetBound(sal_True) == *GetPoint() ) + if( rTbl[ n ]->GetBound(true) == *GetPoint() ) { - aBeforeArr.push_back( &rTbl[ n ]->GetBound(sal_True) ); + aBeforeArr.push_back( &rTbl[ n ]->GetBound(true) ); bBreak = false; } - if( rTbl[ n ]->GetBound(sal_False) == *GetPoint() ) + if( rTbl[ n ]->GetBound(false) == *GetPoint() ) { - aBeforeArr.push_back( &rTbl[ n ]->GetBound(sal_False) ); + aBeforeArr.push_back( &rTbl[ n ]->GetBound(false) ); bBreak = false; } } diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 09556026f410..13f83a8862b5 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -329,7 +329,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() )) { pRedlPam = new SwPaM( pStart->nNode, pEnd->nNode, -1, 1 ); - SwCntntNode* pCNd = pRedlPam->GetCntntNode( sal_False ); + SwCntntNode* pCNd = pRedlPam->GetCntntNode( false ); if( pCNd ) pRedlPam->GetMark()->nContent = pCNd->Len(); @@ -349,11 +349,11 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) DeleteRedline( *pRedlPam, true, USHRT_MAX ); pRedlPam->GetMark()->nNode.Assign( pEnd->nNode.GetNode(), 1 ); - pCNd = pRedlPam->GetCntntNode( sal_False ); + pCNd = pRedlPam->GetCntntNode( false ); pRedlPam->GetMark()->nContent.Assign( pCNd, 0 ); pRedlPam->GetPoint()->nNode.Assign( aEndIdx.GetNode() ); - pCNd = pRedlPam->GetCntntNode( sal_True ); + pCNd = pRedlPam->GetCntntNode( true ); sal_Int32 nCLen = 0; if( !pCNd && 0 != (pCNd = GetNodes()[ aEndIdx.GetIndex()-1 ]->GetCntntNode())) diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 8bd196569428..ad894dfe2b79 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -619,7 +619,7 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, for( sal_uInt16 n = 0; n < mpSectionFmtTbl->size(); ++n ) { - const SwSectionNode *pSectNd = (*mpSectionFmtTbl)[ n ]->GetSectionNode( sal_False ); + const SwSectionNode *pSectNd = (*mpSectionFmtTbl)[ n ]->GetSectionNode( false ); if ( !pSectNd ) continue; diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx index 4a04e8529b9a..25e3186c68e3 100644 --- a/sw/source/core/doc/gctable.cxx +++ b/sw/source/core/doc/gctable.cxx @@ -208,8 +208,8 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) // And now the own bottom edge with the succeeding top edge if( !pGCPara->IsLastLine() ) { - SwCollectTblLineBoxes aBottom( sal_False ); - SwCollectTblLineBoxes aTop( sal_True ); + SwCollectTblLineBoxes aBottom( false ); + SwCollectTblLineBoxes aTop( true ); sw_Line_CollectBox( pLine, &aBottom ); diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index f0a11b6d5f05..3ddcbba3f813 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -2211,7 +2211,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, if( USHRT_MAX != nLnPos && nLnPos ) { // There is a Line before it - SwCollectTblLineBoxes aLnPara( sal_False, HEADLINE_BORDERCOPY ); + SwCollectTblLineBoxes aLnPara( false, HEADLINE_BORDERCOPY ); pLn = GetTabLines()[ nLnPos - 1 ]; for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); @@ -2221,7 +2221,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, if( aLnPara.Resize( lcl_GetBoxOffset( aFndBox ), lcl_GetLineWidth( *pFndLn )) ) { - aLnPara.SetValues( sal_True ); + aLnPara.SetValues( true ); pLn = pNewTbl->GetTabLines()[ 0 ]; for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); it != pLn->GetTabBoxes().end(); ++it) @@ -2236,7 +2236,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, if( nLnPos < GetTabLines().size() - 1 ) { // There is a Line following it - SwCollectTblLineBoxes aLnPara( sal_True, HEADLINE_BORDERCOPY ); + SwCollectTblLineBoxes aLnPara( true, HEADLINE_BORDERCOPY ); pLn = GetTabLines()[ nLnPos + 1 ]; for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); @@ -2246,7 +2246,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, if( aLnPara.Resize( lcl_GetBoxOffset( aFndBox ), lcl_GetLineWidth( *pFndLn )) ) { - aLnPara.SetValues( sal_False ); + aLnPara.SetValues( false ); pLn = pNewTbl->GetTabLines().back(); for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); it != pLn->GetTabBoxes().end(); ++it) @@ -4065,7 +4065,7 @@ static bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam // Calculate the new relative size by means of the old one // If the selected Box get bigger, adjust via the max space else // via the max height. - if( 1 /*!rParam.bBigger*/ ) + if( true /*!rParam.bBigger*/ ) { nDist *= pLineFrm->Frm().Height(); nDist /= rParam.nMaxHeight; diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index ab5056d46be3..a7167b2c9eec 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -1256,7 +1256,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, if( rPos.nNode != aInsPos ) { pCopyPam->GetMark()->nNode = aInsPos; - pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetCntntNode(sal_False), 0); + pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetCntntNode(false), 0); rPos = *pCopyPam->GetMark(); } else @@ -1308,7 +1308,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, { // #i86492# - use <SwDoc::SetNumRule(..)>, because it also handles the <ListId> pDoc->SetNumRule( *pCopyPam, *pNumRuleToPropagate, false, - aListIdToPropagate, sal_True, true ); + aListIdToPropagate, true, true ); } pDoc->SetRedlineMode_intern( eOld ); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 3b0ce89b8c31..5dec44a56397 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -78,8 +78,8 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds, do { if ( _bPrev - ? !_rNds.GoPrevSection( &aChkIdx, sal_False, sal_False ) - : !_rNds.GoNextSection( &aChkIdx, sal_False, sal_False ) ) + ? !_rNds.GoPrevSection( &aChkIdx, false, false ) + : !_rNds.GoNextSection( &aChkIdx, false, false ) ) { OSL_FAIL( "<lcl_IsInSameTblBox(..)> - no previous/next!" ); return false; @@ -128,13 +128,13 @@ static void lcl_CheckEmptyLayFrm( SwNodes& rNds, SwSectionData& rSectionData, const SwNode& rStt, const SwNode& rEnd ) { SwNodeIndex aIdx( rStt ); - if( !rNds.GoPrevSection( &aIdx, sal_True, sal_False ) || + if( !rNds.GoPrevSection( &aIdx, true, false ) || !CheckNodesRange( rStt, aIdx, true ) || // #i21457# !lcl_IsInSameTblBox( rNds, rStt, true )) { aIdx = rEnd; - if( !rNds.GoNextSection( &aIdx, sal_True, sal_False ) || + if( !rNds.GoNextSection( &aIdx, true, false ) || !CheckNodesRange( rEnd, aIdx, true ) || // #i21457# !lcl_IsInSameTblBox( rNds, rEnd, false )) @@ -223,7 +223,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, pSttPos->nNode.GetNode().GetTxtNode(); if (pTNd) { - pUndoInsSect->SaveSplitNode( pTNd, sal_True ); + pUndoInsSect->SaveSplitNode( pTNd, true ); } } @@ -234,7 +234,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, if (pTNd && (pTNd->GetTxt().getLength() != pEndPos->nContent.GetIndex())) { - pUndoInsSect->SaveSplitNode( pTNd, sal_False ); + pUndoInsSect->SaveSplitNode( pTNd, false ); } } } @@ -302,7 +302,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, { if( pUndoInsSect && pCNd->IsTxtNode() ) { - pUndoInsSect->SaveSplitNode( (SwTxtNode*)pCNd, sal_True ); + pUndoInsSect->SaveSplitNode( (SwTxtNode*)pCNd, true ); } SplitNode( *pPos, false ); pNewSectNode = GetNodes().InsertTextSection( @@ -1057,11 +1057,11 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx ) if( GetSection().IsHidden() || IsCntntHidden() ) { SwNodeIndex aIdx( *EndOfSectionNode() ); - SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, sal_True, sal_False ); + SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false ); if( !pCNd ) { aIdx = *this; - if( 0 == ( pCNd = rNds.GoPrevSection( &aIdx, sal_True, sal_False )) ) + if( 0 == ( pCNd = rNds.GoPrevSection( &aIdx, true, false )) ) return ; } pCNd = aIdx.GetNode().GetCntntNode(); @@ -1196,13 +1196,13 @@ void SwSectionNode::DelFrms() // Or else the Fly/TblBox Frame does not have a Lower! { SwNodeIndex aIdx( *this ); - if( !rNds.GoPrevSection( &aIdx, sal_True, sal_False ) || + if( !rNds.GoPrevSection( &aIdx, true, false ) || !CheckNodesRange( *this, aIdx, true ) || // #i21457# !lcl_IsInSameTblBox( rNds, *this, true )) { aIdx = *EndOfSectionNode(); - if( !rNds.GoNextSection( &aIdx, sal_True, sal_False ) || + if( !rNds.GoNextSection( &aIdx, true, false ) || !CheckNodesRange( *EndOfSectionNode(), aIdx, true ) || // #i21457# !lcl_IsInSameTblBox( rNds, *EndOfSectionNode(), false )) @@ -1259,12 +1259,12 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c pNewSect->SetCondition( GetSection().GetCondition() ); pNewSect->SetLinkFileName( GetSection().GetLinkFileName() ); if( !pNewSect->IsHiddenFlag() && GetSection().IsHidden() ) - pNewSect->SetHidden( sal_True ); + pNewSect->SetHidden( true ); if( !pNewSect->IsProtectFlag() && GetSection().IsProtect() ) - pNewSect->SetProtect( sal_True ); + pNewSect->SetProtect( true ); // edit in readonly sections if( !pNewSect->IsEditInReadonlyFlag() && GetSection().IsEditInReadonly() ) - pNewSect->SetEditInReadonly( sal_True ); + pNewSect->SetEditInReadonly( true ); SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // Where am I? rNds._Copy( aRg, aInsPos, sal_False ); @@ -1385,7 +1385,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const sal_uInt16 n; for( n = 0; n < mpSectionFmtTbl->size(); ++n ) - if( 0 != ( pSectNd = (*mpSectionFmtTbl)[ n ]->GetSectionNode( sal_False ) )) + if( 0 != ( pSectNd = (*mpSectionFmtTbl)[ n ]->GetSectionNode( false ) )) { const OUString rNm = pSectNd->GetSection().GetSectionName(); if (rNm.startsWith( aName )) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index cc859506cc21..0d08fab3db01 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -3155,14 +3155,14 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode, // the upper Border of the current one case HEADLINE_BORDERCOPY: { - SwCollectTblLineBoxes aPara( sal_False, eHdlnMode ); + SwCollectTblLineBoxes aPara( false, eHdlnMode ); SwTableLine* pLn = rTbl.GetTabLines()[ rTbl.GetTabLines().size() - 1 ]; for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); it != pLn->GetTabBoxes().end(); ++it) sw_Box_CollectBox(*it, &aPara ); - aPara.SetValues( sal_True ); + aPara.SetValues( true ); pLn = pNew->GetTable().GetTabLines()[ 0 ]; for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); it != pLn->GetTabBoxes().end(); ++it) @@ -3181,13 +3181,13 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode, if( HEADLINE_BOXATRCOLLCOPY == eHdlnMode && pUndo ) pHst = pUndo->GetHistory(); - SwCollectTblLineBoxes aPara( sal_True, eHdlnMode, pHst ); + SwCollectTblLineBoxes aPara( true, eHdlnMode, pHst ); SwTableLine* pLn = rTbl.GetTabLines()[ 0 ]; for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); it != pLn->GetTabBoxes().end(); ++it) sw_Box_CollectBox(*it, &aPara ); - aPara.SetValues( sal_True ); + aPara.SetValues( true ); pLn = pNew->GetTable().GetTabLines()[ 0 ]; for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin(); it != pLn->GetTabBoxes().end(); ++it) diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 9a135869104f..31f64babf970 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -97,7 +97,7 @@ void SwTblFmtCmp::Delete( std::vector<SwTblFmtCmp*> &rArr ) static void lcl_GetStartEndCell( const SwCursor& rCrsr, SwLayoutFrm *&prStart, SwLayoutFrm *&prEnd ) { - OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( sal_False ), + OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( false ), "Tab selection not at ContentNode" ); Point aPtPos, aMkPos; @@ -110,7 +110,7 @@ static void lcl_GetStartEndCell( const SwCursor& rCrsr, // Robust: SwCntntNode* pPointNd = rCrsr.GetCntntNode(); - SwCntntNode* pMarkNd = rCrsr.GetCntntNode(sal_False); + SwCntntNode* pMarkNd = rCrsr.GetCntntNode(false); SwFrm* pPointFrm = pPointNd ? pPointNd->getLayoutFrm( pPointNd->GetDoc()->GetCurrentLayout(), &aPtPos ) : 0; SwFrm* pMarkFrm = pMarkNd ? pMarkNd->getLayoutFrm( pMarkNd->GetDoc()->GetCurrentLayout(), &aMkPos ) : 0; @@ -179,7 +179,7 @@ bool _FindBox( _FndBox & rBox, LinesAndTable* pPara ) { if (!rBox.GetLines().empty()) { - pPara->bInsertLines = sal_True; + pPara->bInsertLines = true; BOOST_FOREACH( _FndLine & rFndLine, rBox.GetLines() ) _FindLine( rFndLine, pPara ); if ( pPara->bInsertLines ) @@ -194,7 +194,7 @@ bool _FindBox( _FndBox & rBox, LinesAndTable* pPara ) (SwTableLine*)rLines[i] ); } else - pPara->bInsertLines = sal_False; + pPara->bInsertLines = false; } } else if (rBox.GetBox()) diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index e0710b31e589..3eae6c7c3fe2 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1282,7 +1282,7 @@ void SwCntntNode::DelFrms( sal_Bool /*bNeedDel*/, sal_Bool bIsDisposeAccTable ) pFrm->SetAccTableDispose( bIsDisposeAccTable ); pFrm->Cut(); //Set acc table dispose state to default value - pFrm->SetAccTableDispose( sal_True ); + pFrm->SetAccTableDispose( true ); delete pFrm; } diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 2d6e9ad8da50..de7685c9960d 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -189,7 +189,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz, "the code to handle text fields here looks broken\n" "if the target is in a different document."); if( !bRestPersData && !bSavePersData && pDestDoc ) - bSavePersData = bRestPersData = sal_True; + bSavePersData = bRestPersData = true; OUString sNumRule; SwNodeIndex aInsPos( rInsPos ); @@ -365,7 +365,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz, { OSL_ENSURE( !this, "here, something wrong happened" ); aFrmNdIdx = rNds.GetEndOfContent(); - pFrmNd = rNds.GoPrevSection( &aFrmNdIdx, sal_True, sal_False ); + pFrmNd = rNds.GoPrevSection( &aFrmNdIdx, true, false ); if( pFrmNd && !((SwCntntNode*)pFrmNd)->GetDepends() ) pFrmNd = 0; OSL_ENSURE( pFrmNd, "ChgNode() - no FrameNode found" ); @@ -2090,7 +2090,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx, rFrmIdx = aIdx; // search forward or backward for a content node - else if( 0 != ( pFrmNd = GoPrevSection( &aIdx, sal_True, sal_False )) && + else if( 0 != ( pFrmNd = GoPrevSection( &aIdx, true, false )) && ::CheckNodesRange( aIdx, rFrmIdx, true ) && // nach vorne nie aus der Tabelle hinaus! pFrmNd->FindTableNode() == pTableNd && @@ -2112,7 +2112,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx, // NEVER leave the section when doing this! if( ( pEnd && ( pFrmNd = &aIdx.GetNode())->IsCntntNode() ) || - ( 0 != ( pFrmNd = GoNextSection( &aIdx, sal_True, sal_False )) && + ( 0 != ( pFrmNd = GoNextSection( &aIdx, true, false )) && ::CheckNodesRange( aIdx, rFrmIdx, true ) && ( pFrmNd->FindTableNode() == pTableNd && // NEVER go out of the table cell at the end diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index d30670cb5b41..24fc8f49d783 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -526,7 +526,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) if( bUpdateFtn ) { - SwSectionNode* pSectNd = GetFmt()->GetSectionNode( sal_False ); + SwSectionNode* pSectNd = GetFmt()->GetSectionNode( false ); if( pSectNd ) pSectNd->GetDoc()->GetFtnIdxs().UpdateFtn(SwNodeIndex( *pSectNd )); } @@ -721,7 +721,7 @@ void SwSectionFmt::DelFrms() // Paste of the Framei tself would need to do this. But that leads // to subsequent errors, which we'd need to solve at run-time. SwNodeIndex aNextNd( *pIdx ); - SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, sal_True, sal_False ); + SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, true, false ); if( pCNd ) { const SfxPoolItem& rItem = pCNd->GetSwAttrSet().Get( RES_PAGEDESC ); @@ -1178,7 +1178,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) ::sfx2::SvBaseLink::UpdateResult SwIntrnlSectRefLink::DataChanged( const OUString& rMimeType, const uno::Any & rValue ) { - SwSectionNode* pSectNd = rSectFmt.GetSectionNode( sal_False ); + SwSectionNode* pSectNd = rSectFmt.GetSectionNode( false ); SwDoc* pDoc = rSectFmt.GetDoc(); sal_uLong nDataFormat = SotExchange::GetFormatIdFromMimeType( rMimeType ); @@ -1195,13 +1195,13 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) pDoc->SetModified(); // set additional flag that links have been updated, in order to check this // during load. - pDoc->SetLinksUpdated( sal_True ); + pDoc->SetLinksUpdated( true ); // Always switch off Undo bool const bWasUndo = pDoc->GetIDocumentUndoRedo().DoesUndo(); pDoc->GetIDocumentUndoRedo().DoUndo(false); sal_Bool bWasVisibleLinks = pDoc->IsVisibleLinks(); - pDoc->SetVisibleLinks( sal_False ); + pDoc->SetVisibleLinks( false ); SwPaM* pPam; SwViewShell* pVSh = 0; @@ -1476,7 +1476,7 @@ void SwIntrnlSectRefLink::Closed() pDoc->UpdateSection( n, aSectionData ); // Make all Links within the Section visible again - SwSectionNode* pSectNd = rSectFmt.GetSectionNode( sal_False ); + SwSectionNode* pSectNd = rSectFmt.GetSectionNode( false ); if( pSectNd ) pSectNd->GetSection().MakeChildLinksVisible( *pSectNd ); @@ -1584,13 +1584,13 @@ void SwSection::BreakLink() const SwNode* SwIntrnlSectRefLink::GetAnchor() const { - return rSectFmt.GetSectionNode( sal_False ); + return rSectFmt.GetSectionNode( false ); } sal_Bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 , sal_Int32 ) const { - SwStartNode* pSttNd = rSectFmt.GetSectionNode( sal_False ); + SwStartNode* pSttNd = rSectFmt.GetSectionNode( false ); return pSttNd && nSttNd < pSttNd->GetIndex() && pSttNd->EndOfSectionIndex() < nEndNd; diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index f25c61e5d31c..a0d2c15057d7 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -487,13 +487,13 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const { rInfo.bSelectAllowed = rInfo.bMoveAllowed = - rInfo.bResizeFreeAllowed = rInfo.bResizePropAllowed = sal_True; + rInfo.bResizeFreeAllowed = rInfo.bResizePropAllowed = true; rInfo.bRotateFreeAllowed = rInfo.bRotate90Allowed = rInfo.bMirrorFreeAllowed = rInfo.bMirror45Allowed = rInfo.bMirror90Allowed = rInfo.bShearAllowed = rInfo.bCanConvToPath = rInfo.bCanConvToPoly = - rInfo.bCanConvToPathLineToArea = rInfo.bCanConvToPolyLineToArea = sal_False; + rInfo.bCanConvToPathLineToArea = rInfo.bCanConvToPolyLineToArea = false; } // SwVirtFlyDrawObj - Size Determination diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 695805d66694..7cf986c17a17 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -49,11 +49,11 @@ const OUString GetPalettePath() SwDrawDocument::SwDrawDocument( SwDoc* pD ) : FmFormModel( ::GetPalettePath(), &pD->GetAttrPool(), - pD->GetDocShell(), sal_True ), + pD->GetDocShell(), true ), pDoc( pD ) { SetScaleUnit( MAP_TWIP ); - SetSwapGraphics( sal_True ); + SetSwapGraphics( true ); SwDocShell* pDocSh = pDoc->GetDocShell(); if ( pDocSh ) diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 99fc36cf5dca..6233863b0666 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -96,11 +96,11 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) : FmFormView( (FmFormModel*)pMd, pOutDev ), rImp( rI ) { - SetPageVisible( sal_False ); - SetBordVisible( sal_False ); - SetGridVisible( sal_False ); - SetHlplVisible( sal_False ); - SetGlueVisible( sal_False ); + SetPageVisible( false ); + SetBordVisible( false ); + SetGridVisible( false ); + SetHlplVisible( false ); + SetGlueVisible( false ); SetFrameDragSingles( sal_True ); SetVirtualObjectBundling( sal_True ); SetSwapAsynchron( sal_True ); diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 415977a14bf0..33472cd0afc3 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -509,7 +509,7 @@ void SwDontExpandItem::RestoreDontExpandItems( const SwPosition& rPos ) // The attribute was not previously set in this form in the // paragraph, so it can only be created through insert/copy // Because of that it is a candidate for DontExpand - pHt->SetDontExpand( sal_True ); + pHt->SetDontExpand( true ); } } } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 31cb24aebf63..96df66d13af0 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1167,7 +1167,7 @@ void SwAutoFormat::DelEmptyLine( bool bTstNextPara ) aDelPam.SetMark(); aDelPam.GetMark()->nNode--; - SwTxtNode* pTNd = aDelPam.GetNode( sal_False )->GetTxtNode(); + SwTxtNode* pTNd = aDelPam.GetNode( false )->GetTxtNode(); if( pTNd ) // first use the previous text node aDelPam.GetMark()->nContent.Assign(pTNd, pTNd->GetTxt().getLength()); @@ -1175,7 +1175,7 @@ void SwAutoFormat::DelEmptyLine( bool bTstNextPara ) { // then try the next (at the beginning of a Doc, table cells, borders, ...) aDelPam.GetMark()->nNode += 2; - pTNd = aDelPam.GetNode( sal_False )->GetTxtNode(); + pTNd = aDelPam.GetNode( false )->GetTxtNode(); if( pTNd ) { aDelPam.GetMark()->nContent.Assign( pTNd, 0 ); @@ -1591,7 +1591,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) { aDelPam.SetMark(); aDelPam.GetMark()->nNode++; - aDelPam.GetNode(sal_False)->GetTxtNode()->SetAttrListLevel( nLvl ); + aDelPam.GetNode(false)->GetTxtNode()->SetAttrListLevel( nLvl ); } pAktTxtNd->SetAttrListLevel(nLvl); @@ -2106,7 +2106,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, "Got no area" ); if( aFlags.bSetNumRule && !aFlags.bAFmtByInput ) - aFlags.bSetNumRule = sal_False; + aFlags.bSetNumRule = false; bool bReplaceStyles = !aFlags.bAFmtByInput || aFlags.bReplaceStyles; @@ -2145,7 +2145,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, RedlineMode_t eRedlMode = pDoc->GetRedlineMode(), eOldMode = eRedlMode; if( aFlags.bWithRedlining ) { - pDoc->SetAutoFmtRedline( sal_True ); + pDoc->SetAutoFmtRedline( true ); eRedlMode = (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT); } else @@ -2526,7 +2526,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, } if( aFlags.bWithRedlining ) - pDoc->SetAutoFmtRedline( sal_False ); + pDoc->SetAutoFmtRedline( false ); pDoc->SetRedlineMode( eOldMode ); // restore undo (in case it has been changed) diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index e94ea3bc43af..a5d7904ae8b5 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -47,7 +47,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo ) // 3. Point and Mark are at the document start and end, Point is in a table: delete selection as usual if( rPam.GetNode()->FindTableNode() && rPam.GetNode()->StartOfSectionNode() != - rPam.GetNode(sal_False)->StartOfSectionNode() && !bSelectAll ) + rPam.GetNode(false)->StartOfSectionNode() && !bSelectAll ) { // group the Undo in the table if( pUndo && !*pUndo ) @@ -264,7 +264,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell ) OSL_ENSURE( pCmp->GetPoint()->nContent.GetIdxReg() == pCmp->GetCntntNode(), "Point in wrong Node" ); OSL_ENSURE( pCmp->GetMark()->nContent.GetIdxReg() - == pCmp->GetCntntNode(sal_False), "Mark in wrong Node" ); + == pCmp->GetCntntNode(false), "Mark in wrong Node" ); bool bTst = *pCmp->GetPoint() == *pCmp->GetMark(); (void) bTst; } while( pDestShell->GetCrsr() != ( pCmp = (SwPaM*)pCmp->GetNext() ) ); diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index d1050a3a5e2e..23789028293c 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -267,7 +267,7 @@ void SwEditShell::UpdateFlds( SwField &rFld ) pTxtFld = lcl_FindInputFld( GetDoc(), rFld); if (pTxtFld != 0) - GetDoc()->UpdateFld(pTxtFld, rFld, pMsgHnt, sal_True); + GetDoc()->UpdateFld(pTxtFld, rFld, pMsgHnt, true); } // bOkay (instead of return because of EndAllAction) becomes false, @@ -297,9 +297,9 @@ void SwEditShell::UpdateFlds( SwField &rFld ) // Search for SwTxtFld ... while( bOkay && pCurStt->nContent != pCurEnd->nContent - && ( aPam.Find( aFldHint, sal_False, fnMoveForward, &aCurPam ) - || aPam.Find( aAnnotationFldHint, sal_False, fnMoveForward, &aCurPam ) - || aPam.Find( aInputFldHint, sal_False, fnMoveForward, &aCurPam ) ) ) + && ( aPam.Find( aFldHint, false, fnMoveForward, &aCurPam ) + || aPam.Find( aAnnotationFldHint, false, fnMoveForward, &aCurPam ) + || aPam.Find( aInputFldHint, false, fnMoveForward, &aCurPam ) ) ) { // if only one PaM has more than one field ... if( aPam.Start()->nContent != pCurStt->nContent ) @@ -316,7 +316,7 @@ void SwEditShell::UpdateFlds( SwField &rFld ) bOkay = false; bTblSelBreak = GetDoc()->UpdateFld(pTxtFld, rFld, - pMsgHnt, sal_False); + pMsgHnt, false); } // The search area is reduced by the found area: pCurStt->nContent++; diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 589acf1a3213..9e1d9f22e273 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -880,7 +880,7 @@ sal_uInt16 SwEditShell::GetLineCount( sal_Bool bActPos ) } while( 0 != ( pCNd = GetDoc()->GetNodes().GoNextSection( - &aStart, sal_True, sal_False )) && ( !bActPos || aStart <= rPtIdx ) ) + &aStart, true, false )) && ( !bActPos || aStart <= rPtIdx ) ) { if( 0 != ( pCntFrm = pCNd->getLayoutFrm( GetLayout() ) ) && pCntFrm->IsTxtFrm() ) { diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index a56461d9fa05..61b3ba454179 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -402,7 +402,7 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos) // #i42921# - 3rd parameter = false in order to // suppress setting of num rule at <aPaM>. // do not apply any list - GetDoc()->SetNumRule( aPaM, aRule, false, OUString(), sal_False ); + GetDoc()->SetNumRule( aPaM, aRule, false, OUString(), false ); } EndAllAction(); @@ -491,7 +491,7 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft ) } else // move down { - const SwNumRule* pOrig = aCrsr.GetNode(sal_False)->GetTxtNode()->GetNumRule(); + const SwNumRule* pOrig = aCrsr.GetNode(false)->GetTxtNode()->GetNumRule(); if( aCrsr.GetNode()->IsTxtNode() && pOrig == aCrsr.GetNode()->GetTxtNode()->GetNumRule() ) { diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 6ecc0fc4316e..c2f66d9136d4 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1895,7 +1895,7 @@ bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { util::DateTime aDateTimeValue; if(!(rAny >>= aDateTimeValue)) - return sal_False; + return false; aDateTime.SetNanoSec(aDateTimeValue.NanoSeconds); aDateTime.SetSec(aDateTimeValue.Seconds); aDateTime.SetMin(aDateTimeValue.Minutes); diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index bb5a398aad73..d7e49ad07c56 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -275,7 +275,7 @@ void SwGetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* pNew ) SwGetExpField::SwGetExpField(SwGetExpFieldType* pTyp, const OUString& rFormel, sal_uInt16 nSub, sal_uLong nFmt) : SwFormulaField( pTyp, nFmt, 0.0 ), - bIsInBodyTxt( sal_True ), + bIsInBodyTxt( true ), nSubType(nSub), bLateInitialization( false ) { @@ -337,7 +337,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld ) // #i82544# if( bLateInitialization ) { - SwFieldType* pSetExpFld = rDoc.GetFldType(RES_SETEXPFLD, GetFormula(), sal_False); + SwFieldType* pSetExpFld = rDoc.GetFldType(RES_SETEXPFLD, GetFormula(), false); if( pSetExpFld ) { bLateInitialization = false; diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index 35b726178f9d..453db79356a6 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -199,7 +199,7 @@ OUString SwUserFieldType::GetName() const void SwUserFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { if( !pOld && !pNew ) - ChgValid( sal_False ); + ChgValid( false ); NotifyClients( pOld, pNew ); // update input fields that might be connected to the user field diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index b9d5a65fb7c2..6ceae104f435 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -459,7 +459,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, sal_Bool bCopyIsMove = mpDoc->IsCopyIsMove(); if( bIsMove ) // set a flag in Doc, handled in TextNodes - mpDoc->SetCopyIsMove( sal_True ); + mpDoc->SetCopyIsMove( true ); RedlineMode_t eOldRedlMode = pDestShell->GetDoc()->GetRedlineMode(); pDestShell->GetDoc()->SetRedlineMode_intern( (RedlineMode_t)(eOldRedlMode | nsRedlineMode_t::REDLINE_DELETE_REDLINES)); diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx index 32bebf49c416..d8a1eeab949c 100644 --- a/sw/source/core/frmedt/fedesc.cxx +++ b/sw/source/core/frmedt/fedesc.cxx @@ -220,7 +220,7 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const pPtFrm = 0; if( PCURCRSR->HasMark() && - 0 != (pCNd = PCURCRSR->GetCntntNode( sal_False ) ) && + 0 != (pCNd = PCURCRSR->GetCntntNode( false ) ) && 0 != ( pMkFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, sal_False )) ) pMkFrm = pMkFrm->FindPageFrm(); else diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index fd0b09aec8d5..1e0311c6f8b8 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1265,7 +1265,7 @@ static bool lcl_IsControlGroup( const SdrObject *pObj ) { bool bRet = false; if(pObj->ISA(SdrUnoObj)) - bRet = sal_True; + bRet = true; else if( pObj->ISA( SdrObjGroup ) ) { bRet = true; @@ -1812,7 +1812,7 @@ sal_Bool SwFEShell::ImpEndCreate() if( !pPg ) { SdrModel* pTmpSdrModel = getIDocumentDrawModelAccess()->GetDrawModel(); - pPg = pTmpSdrModel->AllocPage( sal_False ); + pPg = pTmpSdrModel->AllocPage( false ); pTmpSdrModel->InsertPage( pPg ); } pPg->RecalcObjOrdNums(); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 8eaed08fd6d9..9fd1c78b03db 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1835,8 +1835,8 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag SwPosition* ppPos[2] = { 0, 0 }; Point paPt [2] = { rPt, aEndPt }; - bool pbRow[2] = { 0, 0 }; - bool pbCol[2] = { 0, 0 }; + bool pbRow[2] = { false, false }; + bool pbCol[2] = { false, false }; // pEnd is set during dragging. for ( sal_uInt16 i = 0; i < ( pEnd ? 2 : 1 ); ++i ) diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index dec5c7c86c23..b89c6a38bd70 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -161,7 +161,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, const SwTblSearchType eSearchType ) { // get start and end cell - OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( sal_False ), + OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( false ), "Tabselection not on Cnt." ); // Row-selection: @@ -188,7 +188,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, const SwTable& rTbl = pTblNd->GetTable(); const SwTableLines& rLines = rTbl.GetTabLines(); - const SwNode* pMarkNode = rCrsr.GetNode( sal_False ); + const SwNode* pMarkNode = rCrsr.GetNode( false ); const sal_uLong nMarkSectionStart = pMarkNode->StartOfSectionIndex(); const SwTableBox* pMarkBox = rTbl.GetTblBox( nMarkSectionStart ); @@ -197,7 +197,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, const SwTableLine* pLine = pMarkBox ? pMarkBox->GetUpper() : 0; sal_uInt16 nSttPos = rLines.GetPos( pLine ); OSL_ENSURE( USHRT_MAX != nSttPos, "Where is my row in the table?" ); - pLine = rTbl.GetTblBox( rCrsr.GetNode( sal_True )->StartOfSectionIndex() )->GetUpper(); + pLine = rTbl.GetTblBox( rCrsr.GetNode( true )->StartOfSectionIndex() )->GetUpper(); sal_uInt16 nEndPos = rLines.GetPos( pLine ); OSL_ENSURE( USHRT_MAX != nEndPos, "Where is my row in the table?" ); // pb: #i20193# if tableintable then nSttPos == nEndPos == USHRT_MAX @@ -235,7 +235,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, const SwCntntNode *pCntNd = rCrsr.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPtPos )->GetUpper() : 0; - pCntNd = rCrsr.GetCntntNode(sal_False); + pCntNd = rCrsr.GetCntntNode(false); const SwLayoutFrm *pEnd = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aMkPos )->GetUpper() : 0; if( pStart && pEnd ) @@ -431,7 +431,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) SwNodeIndex aIdx( rSttNd ); const SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode(); if( !pCNd ) - pCNd = aIdx.GetNodes().GoNextSection( &aIdx, sal_False, sal_False ); + pCNd = aIdx.GetNodes().GoNextSection( &aIdx, false, false ); // if table is invisible, return // (layout needed for forming table selection further down, so we can't @@ -448,7 +448,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) aIdx = rEndNd; pCNd = aIdx.GetNode().GetCntntNode(); if( !pCNd ) - pCNd = aIdx.GetNodes().GoNextSection( &aIdx, sal_False, sal_False ); + pCNd = aIdx.GetNodes().GoNextSection( &aIdx, false, false ); // #i22135# - Robust: check, if content was found and if it's visible if ( !pCNd || pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) == NULL ) @@ -686,7 +686,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes ) const SwLayoutFrm *pStart = pCrsr->GetCntntNode()->getLayoutFrm( rShell.GetLayout(), &pCrsr->GetPtPos() )->GetUpper(), - *pEnd = pCrsr->GetCntntNode(sal_False)->getLayoutFrm( rShell.GetLayout(), + *pEnd = pCrsr->GetCntntNode(false)->getLayoutFrm( rShell.GetLayout(), &pCrsr->GetMkPos() )->GetUpper(); const SwLayoutFrm* pSttCell = pStart; @@ -915,7 +915,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, { rBoxes.clear(); - OSL_ENSURE( rPam.GetCntntNode() && rPam.GetCntntNode( sal_False ), + OSL_ENSURE( rPam.GetCntntNode() && rPam.GetCntntNode( false ), "Tabselection not on Cnt." ); //JP 24.09.96: Merge with repeating TableHeadLines does not work properly. @@ -926,7 +926,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, const SwCntntNode* pCntNd = rPam.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); - pCntNd = rPam.GetCntntNode(sal_False); + pCntNd = rPam.GetCntntNode(false); const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); @@ -1450,7 +1450,7 @@ sal_uInt16 CheckMergeSel( const SwPaM& rPam ) const SwCntntNode* pCntNd = rPam.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); - pCntNd = rPam.GetCntntNode(sal_False); + pCntNd = rPam.GetCntntNode(false); const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); GetTblSel( pStart, pEnd, aBoxes, 0 ); @@ -1982,7 +1982,7 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, const SwCntntNode* pCntNd = rCrsr.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPtPos )->GetUpper(); - pCntNd = rCrsr.GetCntntNode(sal_False); + pCntNd = rCrsr.GetCntntNode(false); const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aMkPos )->GetUpper(); @@ -2288,7 +2288,7 @@ void _FndBox::DelFrms( SwTable &rTable,sal_Bool bAccTableDispose ) pFrm->SetAccTableDispose( bAccTableDispose ); pFrm->Cut(); //Set acc table dispose state to default value. - pFrm->SetAccTableDispose( sal_True ); + pFrm->SetAccTableDispose( true ); delete pFrm; } } diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 8b3e67ec83e9..7859097d9238 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -451,7 +451,7 @@ public: { pFnt = pNew; #ifdef DBG_UTIL - m_bFnt = sal_True; + m_bFnt = true; #endif } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 4fd4ce6e4d37..038a4a18459a 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -351,7 +351,7 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) aSize.Width() = nWd; } else - bRet = sal_False; + bRet = false; } break; case MID_FRMSIZE_HEIGHT: @@ -545,10 +545,10 @@ bool SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); if( (sal_IntPtr)pStartNode ^ (sal_IntPtr)((SwFmtCntnt&)rAttr).pStartNode ) - return 0; + return false; if( pStartNode ) return ( *pStartNode == *((SwFmtCntnt&)rAttr).GetCntntIdx() ); - return 1; + return true; } SfxPoolItem* SwFmtCntnt::Clone( SfxItemPool* ) const @@ -836,13 +836,13 @@ bool SwFmtCol::operator==( const SfxPoolItem& rAttr ) const aColumns.size() == rCmp.GetNumCols() && aWidthAdjustValue == rCmp.GetAdjustValue() ) ) - return 0; + return false; for ( sal_uInt16 i = 0; i < aColumns.size(); ++i ) if ( !(aColumns[i] == rCmp.GetColumns()[i]) ) - return 0; + return false; - return 1; + return true; } SfxPoolItem* SwFmtCol::Clone( SfxItemPool* ) const @@ -1865,7 +1865,7 @@ bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons case MID_NUM_TYPE : rVal <<= aFmt.GetNumberingType(); break; case MID_PREFIX : rVal <<= OUString(sPrefix); break; case MID_SUFFIX : rVal <<= OUString(sSuffix); break; - default: return sal_False; + default: return false; } return true; } diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index d812502d226e..dd881788bfe8 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -645,10 +645,10 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) { SwSectionFrm* pTmpSct = (SwSectionFrm*)m_rThis.GetUpper(); sal_Bool bOld = pTmpSct->IsCntntLocked(); - pTmpSct->SetCntntLock( sal_True ); + pTmpSct->SetCntntLock( true ); pTmpSct->Calc(); if( !bOld ) - pTmpSct->SetCntntLock( sal_False ); + pTmpSct->SetCntntLock( false ); } SwPageFrm *pPage = m_rThis.FindPageFrm(); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 26550da377bf..8f42605785b4 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1507,7 +1507,7 @@ void CalcCntnt( SwLayoutFrm *pLay, pLay->GetFmt()->GetDoc()->GetLayouter()-> InsertEndnotes( pSect ); sal_Bool bLock = pSect->IsFtnLock(); - pSect->SetFtnLock( sal_True ); + pSect->SetFtnLock( true ); pSect->CalcFtnCntnt(); pSect->CalcFtnCntnt(); pSect->SetFtnLock( bLock ); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index c407f6628cde..5a803df01eef 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -1284,7 +1284,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck ) SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); if ( !pNd ) pNd = pCheck->GetFmt()->GetDoc()-> - GetNodes().GoNextSection( &aIdx, sal_True, sal_False ); + GetNodes().GoNextSection( &aIdx, true, false ); SwIterator<SwFrm,SwCntntNode> aIter( *pNd ); SwFrm* pFrm = aIter.First(); while( pFrm ) @@ -1823,7 +1823,7 @@ SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr ) SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); if ( !pNd ) pNd = pRef->GetAttrSet()->GetDoc()-> - GetNodes().GoNextSection( &aIdx, sal_True, sal_False ); + GetNodes().GoNextSection( &aIdx, true, false ); if ( !pNd ) return 0; SwIterator<SwFrm,SwCntntNode> aIter( *pNd ); diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 62355e6d27e9..6634e37e5ce9 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -525,7 +525,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) SwDoc* pDoc = pFmt->GetDoc(); SwNodeIndex aIndex( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode() ); - SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, sal_True, sal_False ); + SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, true, false ); // #123067# pNode = 0 can really happen SwTableNode *pTblNd= pNode ? pNode->FindTableNode() : 0; diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 58eddf14bd2b..a3f41057c443 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -575,7 +575,7 @@ static void lcl_InvalidateInfFlags( SwFrm* pFrm, bool bInva ) pFrm->_InvalidatePrt(); } if( pFrm->IsLayoutFrm() ) - lcl_InvalidateInfFlags( ((SwLayoutFrm*)pFrm)->GetLower(), sal_False ); + lcl_InvalidateInfFlags( ((SwLayoutFrm*)pFrm)->GetLower(), false ); pFrm = pFrm->GetNext(); } } @@ -2341,7 +2341,7 @@ void SwSectionFrm::CalcFtnAtEndFlag() nVal = pFmt->GetFtnAtTxtEnd( sal_False ).GetValue(); if( FTNEND_ATPGORDOCEND != nVal ) { - bFtnAtEnd = sal_True; + bFtnAtEnd = true; bOwnFtnNum = bOwnFtnNum ||FTNEND_ATTXTEND_OWNNUMSEQ == nVal || FTNEND_ATTXTEND_OWNNUMANDFMT == nVal; } diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index ff7950711d4e..15766d3fa085 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -706,8 +706,8 @@ static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, //going down. sal_Bool bTblSel = false; if ( pStart->IsInTab() && - pPam->GetNode( sal_True )->StartOfSectionNode() != - pPam->GetNode( sal_False )->StartOfSectionNode() ) + pPam->GetNode( true )->StartOfSectionNode() != + pPam->GetNode( false )->StartOfSectionNode() ) { bTblSel = true; const SwLayoutFrm *pCell = pStart->GetUpper(); @@ -1851,7 +1851,7 @@ sal_uInt16 SwFrm::GetVirtPageNum() const bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) { //Find Union-Rects and tables (Follows) of the selection. - OSL_ENSURE( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( sal_False ), + OSL_ENSURE( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( false ), "Tabselection nicht auf Cnt." ); bool bRet = false; @@ -1873,7 +1873,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) // #151012# Made code robust here const SwCntntNode* pTmpStartNode = rTblCrsr.GetCntntNode(); - const SwCntntNode* pTmpEndNode = rTblCrsr.GetCntntNode(sal_False); + const SwCntntNode* pTmpEndNode = rTblCrsr.GetCntntNode(false); const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->getLayoutFrm( this, &aPtPt, 0, sal_False ) : 0; const SwFrm* pTmpEndFrm = pTmpEndNode ? pTmpEndNode->getLayoutFrm( this, &aMkPt, 0, sal_False ) : 0; diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index d7f6895903b3..42c60de81dc6 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -467,7 +467,7 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const { const SwTxtNode *pTxtNode = pTxtFrm->GetTxtNode(); if (pTxtNode && pTxtNode->IsGrammarCheckDirty()) - pRoot->SetNeedGrammarCheck( sal_True ); + pRoot->SetNeedGrammarCheck( true ); } } } @@ -3387,7 +3387,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, if( pFtnAny && pFtnAny->IsValid() ) { bBackLock = true; - ((SwSectionFrm*)this)->SetFtnLock( sal_True ); + ((SwSectionFrm*)this)->SetFtnLock( true ); } } } @@ -3646,7 +3646,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // OD 14.03.2003 #i11760# - adjust 2nd parameter - sal_True --> true ::CalcCntnt( this, true ); if( bBackLock ) - ((SwSectionFrm*)this)->SetFtnLock( sal_False ); + ((SwSectionFrm*)this)->SetFtnLock( false ); } } diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 64739126a110..020ee9ae1c2f 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -658,7 +658,7 @@ SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef& xObj ) : pListener( 0 ), xOLERef( xObj ) { - xOLERef.Lock( sal_True ); + xOLERef.Lock( true ); if ( xObj.is() ) { pListener = new SwOLEListener_Impl( this ); @@ -673,7 +673,7 @@ SwOLEObj::SwOLEObj( const OUString &rString, sal_Int64 nAspect ) : pListener( 0 ), aName( rString ) { - xOLERef.Lock( sal_True ); + xOLERef.Lock( true ); xOLERef.SetViewAspect( nAspect ); } @@ -713,7 +713,7 @@ SwOLEObj::~SwOLEObj() // unlock object so that object can be closed in RemoveEmbeddedObject // successful closing of the object will automatically clear the reference then - xOLERef.Lock(sal_False); + xOLERef.Lock(false); // Always remove object from container it is connected to try diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index c03c3c61228a..5e1fa912881b 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -580,7 +580,7 @@ static void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill, { const SwTableBox *pBox = pLine->GetTabBoxes()[i]; if ( pBox->GetSttNd() ) - ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, sal_True, sal_False ); + ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, sal_True, false ); else for ( sal_uInt16 j = 0; j < pBox->GetTabLines().size(); ++j ) ::lcl_ProcessLineGet( pBox->GetTabLines()[j], rToFill, pTabFmt ); @@ -1892,7 +1892,7 @@ void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm ) break; nCol /= coDiff; --nCol; - } while( 1 ); + } while( true ); } OUString SwTableBox::GetName() const diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 1e0abda66bc0..226401f60ee4 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -796,8 +796,8 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset, SwSetToRightMargin aSet; if( IsInTab() && - pPam->GetNode( sal_True )->StartOfSectionNode() != - pPam->GetNode( sal_False )->StartOfSectionNode() ) + pPam->GetNode( true )->StartOfSectionNode() != + pPam->GetNode( false )->StartOfSectionNode() ) { // If the PaM is located within different boxes, we have a table selection, // which is handled by the base class. @@ -1189,8 +1189,8 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset, { if ( IsInTab() && - pPam->GetNode( sal_True )->StartOfSectionNode() != - pPam->GetNode( sal_False )->StartOfSectionNode() ) + pPam->GetNode( true )->StartOfSectionNode() != + pPam->GetNode( false )->StartOfSectionNode() ) { // If the PaM is located within different boxes, we have a table selection, // which is handled by the base class. diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 22039964799b..c570d9139e79 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -128,10 +128,10 @@ void _ValidateBodyFrm( SwFrm *pFrm ) else { sal_Bool bOld = ((SwSectionFrm*)pFrm)->IsCntntLocked(); - ((SwSectionFrm*)pFrm)->SetCntntLock( sal_True ); + ((SwSectionFrm*)pFrm)->SetCntntLock( true ); pFrm->Calc(); if( !bOld ) - ((SwSectionFrm*)pFrm)->SetCntntLock( sal_False ); + ((SwSectionFrm*)pFrm)->SetCntntLock( false ); } } } @@ -1521,7 +1521,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf, sal_Bool bOldMidHyph = rLine.GetCurr()->IsMidHyph(); bFormat = FormatLine( rLine, bPrev ); // There can only be one bPrev ... (???) - bPrev = sal_False; + bPrev = false; if ( bMaxHyph ) { if ( rLine.GetCurr()->IsEndHyph() != bOldEndHyph ) diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 09e0efc40ed8..de10934b6c7e 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1487,7 +1487,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf, cHookChar = 0; nMaxHyph = 0; bTestFormat = rInf.bTestFormat; - SetMulti( sal_True ); + SetMulti( true ); SetFirstMulti( rInf.IsFirstMulti() ); } sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 48ced12c2634..d5f1d37114d3 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -214,19 +214,19 @@ protected: , m_nIdx(0) , m_nLen(0) , m_nKanaIdx(0) - , m_bOnWin (0) - , m_bNotEOL (0) - , m_bURLNotify(0) - , m_bStopUnderFlow(0) - , m_bFtnInside(0) - , m_bOtherThanFtnInside(0) - , m_bMulti(0) - , m_bFirstMulti(0) - , m_bRuby(0) - , m_bHanging(0) - , m_bScriptSpace(0) - , m_bForbiddenChars(0) - , m_bSnapToGrid(0) + , m_bOnWin (false) + , m_bNotEOL (false) + , m_bURLNotify(false) + , m_bStopUnderFlow(false) + , m_bFtnInside(false) + , m_bOtherThanFtnInside(false) + , m_bMulti(false) + , m_bFirstMulti(false) + , m_bRuby(false) + , m_bHanging(false) + , m_bScriptSpace(false) + , m_bForbiddenChars(false) + , m_bSnapToGrid(false) , m_nDirection(0) {} public: diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 1c3337a86bb9..a49c049276f2 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -884,7 +884,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd ) SwAttrHandler& rAH = aIter.GetAttrHandler(); SvxCharScaleWidthItem aItem(100, RES_CHRATR_SCALEW); SwTxtAttrEnd aAttr( aItem, nStt, nEnd ); - aAttr.SetPriorityAttr( sal_True ); + aAttr.SetPriorityAttr( true ); rAH.PushAndChg( aAttr, *(aIter.GetFnt()) ); sal_Int32 nIdx = nStt; diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 1bc04e4f1d4e..e0e681a3a6cf 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -692,7 +692,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, if( pPor->IsMultiPortion() ) { nTmpAscent = AdjustBaseLine( *pCurr, pPor ); - GetInfo().SetMulti( sal_True ); + GetInfo().SetMulti( true ); pOrig->Pos().Y() += nTmpAscent - nPorAscent; if( pCMS && pCMS->b2Lines ) @@ -822,18 +822,18 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, // the second line if ( !pCurr->GetNext() || !pCurr->GetNext()->GetLen() ) - GetInfo().SetMulti( sal_False ); + GetInfo().SetMulti( false ); } } // ruby portions are treated like single line portions else if( ((SwMultiPortion*)pPor)->IsRuby() || ((SwMultiPortion*)pPor)->IsBidi() ) - GetInfo().SetMulti( sal_False ); + GetInfo().SetMulti( false ); // calculate cursor values if( ((SwMultiPortion*)pPor)->HasRotation() ) { - GetInfo().SetMulti( sal_False ); + GetInfo().SetMulti( false ); long nTmp = pOrig->Width(); pOrig->Width( pOrig->Height() ); pOrig->Height( nTmp ); diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 399d92c53a3e..e34919da490d 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -699,7 +699,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) if ( ! bFull ) new SwKernPortion( *pPor, (short)(nKernWidth - nKernWidth_1), - sal_False, sal_True ); + false, true ); pGridKernPortion = 0; } diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 1d187adcebda..c86b8a25bb66 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -76,7 +76,7 @@ void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld ) SwFldPortion::SwFldPortion( const OUString &rExpand, SwFont *pFont, bool bPlaceHold ) : aExpand(rExpand), pFnt(pFont), nNextOffset(0), nNextScriptChg(COMPLETE_STRING), nViewWidth(0), bFollow( sal_False ), bHasFollow( sal_False ), bPlaceHolder( bPlaceHold ) - , m_bNoLength( sal_False ) + , m_bNoLength( false ) { SetWhichPor( POR_FLD ); m_nAttrFldType = 0; diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 2ac0a190eebe..58963475136e 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -1620,12 +1620,12 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, if ( bRubyTop ) { nOfst += nRubyHeight; - GetInfo().SetSnapToGrid( sal_True ); + GetInfo().SetSnapToGrid( true ); } else { nOfst += pCurr->Height() - nRubyHeight; - GetInfo().SetSnapToGrid( sal_False ); + GetInfo().SetSnapToGrid( false ); } } else { @@ -1884,7 +1884,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, // in grid mode we temporarily have to disable the grid for the ruby line const sal_Bool bOldGridModeAllowed = GetInfo().SnapToGrid(); if ( bHasGrid && aInf.IsRuby() && bRubyTop ) - aInf.SetSnapToGrid( sal_False ); + aInf.SetSnapToGrid( false ); // If there's no more rubytext, then buildportion is forbidden if( pFirstRest || !aInf.IsRuby() ) @@ -1934,7 +1934,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, // in grid mode we temporarily have to disable the grid for the ruby line if ( bHasGrid && aTmp.IsRuby() && ! bRubyTop ) - aTmp.SetSnapToGrid( sal_False ); + aTmp.SetSnapToGrid( false ); BuildPortions( aTmp ); @@ -2013,7 +2013,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, } if( pLine ) { - GetInfo().SetMulti( sal_True ); + GetInfo().SetMulti( true ); // If the fourth element bSkipKashida of function CalcNewBlock is true, multiportion will be showed in justification. // Kashida (Persian) is a type of justification used in some cursive scripts, particularly Arabic. @@ -2024,7 +2024,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, // Only when Adjust is SVX_ADJUST_BLOCK ( alignment is justify ), multiportion will be showed in justification in new code. CalcNewBlock( pLine, NULL, rMulti.Width(), GetAdjust() != SVX_ADJUST_BLOCK ); - GetInfo().SetMulti( sal_False ); + GetInfo().SetMulti( false ); } rInf.SetIdx( nStartIdx ); } diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index bab1eb838b2a..3c460af52f2d 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -971,7 +971,7 @@ void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const } else { - assert(0); // unknown type... + assert(false); // unknown type... } } } @@ -1004,7 +1004,7 @@ sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf ) } else { - assert( 0 ); // unknown type... + assert( false ); // unknown type... } } return ret; diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 8b6338ff7693..7870eafd6ca9 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -265,7 +265,7 @@ short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) SwTxtAttr* pAttr = MakeRedlineTxtAttr( const_cast<SwDoc&>(rDoc), *const_cast<SfxPoolItem*>(pItem) ); - pAttr->SetPriorityAttr( sal_True ); + pAttr->SetPriorityAttr( true ); m_Hints.push_back(pAttr); rAttrHandler.PushAndChg( *pAttr, rFnt ); if( RES_CHRATR_COLOR == nWhich ) diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 8379f10b9350..8d9dca09db15 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -679,8 +679,8 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // #102344# Ignore connectors which have one or more connections if(pNew && pNew->ISA(SdrEdgeObj)) { - if(((SdrEdgeObj*)pNew)->GetConnectedNode(sal_True) - || ((SdrEdgeObj*)pNew)->GetConnectedNode(sal_False)) + if(((SdrEdgeObj*)pNew)->GetConnectedNode(true) + || ((SdrEdgeObj*)pNew)->GetConnectedNode(false)) { return sal_False; } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 3e18b95a497e..c98cd273e718 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -859,7 +859,7 @@ static void lcl_SetWrong( SwTxtFrm& rFrm, sal_Int32 nPos, sal_Int32 nCnt, bool b SwRootFrm *pRootFrm = rFrm.getRootFrm(); if (pRootFrm) { - pRootFrm->SetNeedGrammarCheck( sal_True ); + pRootFrm->SetNeedGrammarCheck( true ); } SwPageFrm *pPage = rFrm.FindPageFrm(); diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index 8efa43059408..aef4f02cfaa6 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -247,7 +247,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) xHyphWord = rInf.HyphWord( aSelTxt, nMinTrail ); bRet = xHyphWord.is(); if ( !rHyphInf.IsCheck() && sal_False == bRet ) - rHyphInf.SetNoLang( sal_True ); + rHyphInf.SetNoLang( true ); } if( bRet ) @@ -255,8 +255,8 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) rHyphInf.SetHyphWord( xHyphWord ); rHyphInf.nWordStart = nWrdStart; rHyphInf.nWordLen = nLen; - rHyphInf.SetNoLang( sal_False ); - rHyphInf.SetCheck( sal_True ); + rHyphInf.SetNoLang( false ); + rHyphInf.SetCheck( true ); } } } diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx index 3b64b03fe845..020565dfb54d 100644 --- a/sw/source/core/text/txtpaint.cxx +++ b/sw/source/core/text/txtpaint.cxx @@ -40,7 +40,7 @@ void SwSaveClip::Reset() else pOut->SetClipRegion(); } - bChg = sal_False; + bChg = false; } } @@ -112,7 +112,7 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm, } #endif } - bChg = sal_True; + bChg = true; (SwRect&)rRect = aOldRect; } diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 30718a9c7f04..81c9e03cd484 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -577,7 +577,7 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) c SwTxtNode* pSrc = (SwTxtNode*)aTOXSources[0].pNd; pSrc->GetExpandTxt( rNd, &rInsPos, nStartIndex, nEndIndex == -1 ? -1 : nEndIndex - nStartIndex, - sal_False, sal_False, sal_True ); + false, false, true ); } else { diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index ab3d9a083b70..8b7567c8165d 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -243,7 +243,7 @@ bool SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const && mnVisitedFmtId == ((SwFmtINetFmt&)rAttr).mnVisitedFmtId; if( !bRet ) - return sal_False; + return false; const SvxMacroTableDtor* pOther = ((SwFmtINetFmt&)rAttr).mpMacroTbl; if( !mpMacroTbl ) diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 288e1c7f9ec8..6ce20e8374c9 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -157,7 +157,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere, { if( pNd->StartOfSectionNode()->GetSectionNode()->GetSection().IsHiddenFlag()) { - if( !GoPrevSection( &aTmp, sal_True, sal_False ) || + if( !GoPrevSection( &aTmp, true, false ) || aTmp.GetNode().FindTableNode() != pNode->FindTableNode() ) return pNode; // schade, das wars @@ -307,7 +307,7 @@ static void lcl_ChangeFtnRef( SwTxtNode &rNode ) SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); if ( !pNd ) pNd = pFrm->GetAttrSet()->GetDoc()-> - GetNodes().GoNextSection( &aIdx, sal_True, sal_False ); + GetNodes().GoNextSection( &aIdx, true, false ); if ( !pNd ) continue; @@ -837,7 +837,7 @@ void SwTxtNode::Update( const bool bNegative, const bool bDelete ) { - SetAutoCompleteWordDirty( sal_True ); + SetAutoCompleteWordDirty( true ); ::std::auto_ptr<SwpHts> pCollector; const sal_Int32 nChangePos = rPos.GetIndex(); @@ -2064,12 +2064,12 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, if( bUpdate ) { // Update aller Indizies - Update( rDestStart, nLen, sal_False, sal_True ); + Update( rDestStart, nLen, false, true ); } CHECK_SWPHINTS(this); - Update( rStart, nLen, sal_True, sal_True ); + Update( rStart, nLen, true, true ); CHECK_SWPHINTS(this); @@ -2112,7 +2112,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, if( bUpdate ) { // Update aller Indizies - pDest->Update( rDestStart, nLen, sal_False, sal_True); + pDest->Update( rDestStart, nLen, false, true); } CHECK_SWPHINTS(pDest); @@ -2265,7 +2265,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, ++nAttrCnt; } } - Update( rStart, nLen, sal_True, sal_True ); + Update( rStart, nLen, true, true ); for ( sal_uInt16 n = 0; n < aArr.size(); ++n ) { @@ -2276,7 +2276,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, } else { - Update( rStart, nLen, sal_True, sal_True ); + Update( rStart, nLen, true, true ); } if (bMergePortionsNeeded) @@ -2376,7 +2376,7 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount, TryDeleteSwpHints(); - Update( rIdx, nCnt, sal_True ); + Update( rIdx, nCnt, true ); if( 1 == nCnt ) { @@ -3155,7 +3155,7 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx, bool bWithFtn, bool bReplaceTabsWithSpaces ) const { if( &rDestNd == this ) - return sal_False; + return false; SwIndex aDestIdx(&rDestNd, rDestNd.GetTxt().getLength()); if( pDestIdx ) @@ -3860,7 +3860,7 @@ void SwTxtNode::SetListRestart( bool bRestart ) else { SfxBoolItem aNewIsRestartItem( RES_PARATR_LIST_ISRESTART, - sal_True ); + true ); SetAttr( aNewIsRestartItem ); } } @@ -3988,7 +3988,7 @@ void SwTxtNode::SetCountedInList( bool bCounted ) } else { - SfxBoolItem aIsCountedInListItem( RES_PARATR_LIST_ISCOUNTED, sal_False ); + SfxBoolItem aIsCountedInListItem( RES_PARATR_LIST_ISCOUNTED, false ); SetAttr( aIsCountedInListItem ); } } diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 11a8fac97ca8..07fd4a32d009 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1348,7 +1348,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) m_Text = m_Text.replaceAt(*pAttr->GetStart(), 1, ""); // Indizies Updaten SwIndex aTmpIdx( this, *pAttr->GetStart() ); - Update( aTmpIdx, 1, sal_True ); + Update( aTmpIdx, 1, true ); } // do not record deletion of Format! ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo()); @@ -1384,7 +1384,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) m_Text = m_Text.replaceAt(*pAttr->GetStart(), 1, ""); // Indizies Updaten SwIndex aTmpIdx( this, *pAttr->GetStart() ); - Update( aTmpIdx, 1, sal_True ); + Update( aTmpIdx, 1, true ); } DestroyAttr( pAttr ); return false; @@ -3194,7 +3194,7 @@ bool SwpHints::TryInsertHint( } if( nsSetAttrMode::SETATTR_DONTEXPAND & nMode ) - pHint->SetDontExpand( sal_True ); + pHint->SetDontExpand( true ); // SwTxtAttrs ohne Ende werden sonderbehandelt: // Sie werden natuerlich in das Array insertet, aber sie werden nicht diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 9776533d5cf2..c553b46d60a9 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -50,7 +50,7 @@ SwTxtCharFmt::SwTxtCharFmt( SwFmtCharFmt& rAttr, , m_nSortNumber( 0 ) { rAttr.pTxtAttr = this; - SetCharFmtAttr( sal_True ); + SetCharFmtAttr( true ); } SwTxtCharFmt::~SwTxtCharFmt( ) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index d043f7e7a6ae..7ab20bd7e211 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -530,7 +530,7 @@ void SwTxtNode::RstTxtAttr( m_pSwpHints->NoteInHistory( pHt ); // UGLY: this may temporarily destroy the sorting! *pHt->GetStart() = nEnd; - m_pSwpHints->NoteInHistory( pHt, sal_True ); + m_pSwpHints->NoteInHistory( pHt, true ); if ( pStyleHandle.get() && nAttrStart < nEnd ) { @@ -564,7 +564,7 @@ void SwTxtNode::RstTxtAttr( m_pSwpHints->NoteInHistory( pHt ); // UGLY: this may temporarily destroy the sorting! *pAttrEnd = nStt; - m_pSwpHints->NoteInHistory( pHt, sal_True ); + m_pSwpHints->NoteInHistory( pHt, true ); if ( pStyleHandle.get() ) { @@ -590,7 +590,7 @@ void SwTxtNode::RstTxtAttr( m_pSwpHints->NoteInHistory( pHt ); // UGLY: this may temporarily destroy the sorting! *pAttrEnd = nStt; - m_pSwpHints->NoteInHistory( pHt, sal_True ); + m_pSwpHints->NoteInHistory( pHt, true ); if ( pStyleHandle.get() && nStt < nEnd ) { @@ -1570,7 +1570,7 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, sal_Int32 nActPos ) } if( bAnyWrd && !bACWDirty ) - pNode->SetAutoCompleteWordDirty( sal_False ); + pNode->SetAutoCompleteWordDirty( false ); } /** Findet den TxtFrm und sucht dessen CalcHyph */ @@ -1581,7 +1581,7 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf ) && USHRT_MAX == GetLang(0, m_Text.getLength())) { if( !rHyphInf.IsCheck() ) - rHyphInf.SetNoLang( sal_True ); + rHyphInf.SetNoLang( true ); return sal_False; } @@ -1905,7 +1905,7 @@ void SwTxtNode::ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen, while( nI + nCnt < nTLen && nOff == pOffsets[ nI + nCnt ] ) ++nCnt; - Update( SwIndex( this, nMyOff ), nCnt, sal_False ); + Update( SwIndex( this, nMyOff ), nCnt, false ); nMyOff = nOff; //nMyOff -= nCnt; nI += nCnt - 1; @@ -1913,14 +1913,14 @@ void SwTxtNode::ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen, else if( nOff > nMyOff ) { // something is deleted - Update( SwIndex( this, nMyOff+1 ), nOff - nMyOff, sal_True ); + Update( SwIndex( this, nMyOff+1 ), nOff - nMyOff, true ); nMyOff = nOff; } ++nMyOff; } if( nMyOff < nLen ) // something is deleted at the end - Update( SwIndex( this, nMyOff ), nLen - nMyOff, sal_True ); + Update( SwIndex( this, nMyOff ), nLen - nMyOff, true ); // notify the layout! SwDelTxt aDelHint( nPos, nTLen ); diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx index 6a35a95da24a..f61e9c85482f 100644 --- a/sw/source/core/undo/SwUndoFmt.cxx +++ b/sw/source/core/undo/SwUndoFmt.cxx @@ -200,7 +200,7 @@ SwUndoTxtFmtCollCreate::SwUndoTxtFmtCollCreate SwFmt * SwUndoTxtFmtCollCreate::Create(SwFmt * pDerivedFrom) { - return pDoc->MakeTxtFmtColl(sNewName, (SwTxtFmtColl *)pDerivedFrom, sal_True); + return pDoc->MakeTxtFmtColl(sNewName, (SwTxtFmtColl *)pDerivedFrom, true); } void SwUndoTxtFmtCollCreate::Delete() @@ -221,7 +221,7 @@ SwUndoTxtFmtCollDelete::SwUndoTxtFmtCollDelete(SwTxtFmtColl * _pOld, SwFmt * SwUndoTxtFmtCollDelete::Create(SwFmt * pDerivedFrom) { - return pDoc->MakeTxtFmtColl(sOldName, (SwTxtFmtColl *) pDerivedFrom, sal_True); + return pDoc->MakeTxtFmtColl(sOldName, (SwTxtFmtColl *) pDerivedFrom, true); } void SwUndoTxtFmtCollDelete::Delete(SwFmt * pOld) diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index ed71456592c0..0be55af7ca8e 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1245,7 +1245,7 @@ void SwHistory::CopyAttr( case RES_TXTATR_ANNOTATION: case RES_TXTATR_INPUTFIELD: if( !bCopyFields ) - bNextAttr = sal_True; + bNextAttr = true; break; case RES_TXTATR_FLYCNT: case RES_TXTATR_FTN: diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 31fd89b6174f..9f2f3256f9be 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -851,10 +851,10 @@ void SwUndoSaveSection::SaveSection( aPam.GetPoint()->nNode--; aPam.GetMark()->nNode++; - SwCntntNode* pCNd = aPam.GetCntntNode( sal_False ); + SwCntntNode* pCNd = aPam.GetCntntNode( false ); if( pCNd ) aPam.GetMark()->nContent.Assign( pCNd, 0 ); - if( 0 != ( pCNd = aPam.GetCntntNode( sal_True )) ) + if( 0 != ( pCNd = aPam.GetCntntNode( true )) ) aPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() ); // Keep positions as SwIndex so that this section can be deleted in DTOR diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index 21a7caf6dc9c..bff9c425600e 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -83,7 +83,7 @@ void SwUndoInsNum::UndoImpl(::sw::UndoRedoContext & rContext) SwTxtNode* pNd; if( ULONG_MAX != nSttSet && 0 != ( pNd = rDoc.GetNodes()[ nSttSet ]->GetTxtNode() )) - pNd->SetListRestart( sal_True ); + pNd->SetListRestart( true ); else pNd = 0; diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx index a97bd17c1923..03e4e53fb52f 100644 --- a/sw/source/core/undo/unredln.cxx +++ b/sw/source/core/undo/unredln.cxx @@ -172,7 +172,7 @@ void SwUndoRedlineDelete::RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) { if (rPam.GetPoint() != rPam.GetMark()) { - rDoc.AppendRedline( new SwRangeRedline(*pRedlData, rPam), sal_False ); + rDoc.AppendRedline( new SwRangeRedline(*pRedlData, rPam), false ); } } @@ -409,8 +409,8 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext) pDoc->SetRedlineMode_intern( eOld ); // per definition Point is end (in SwUndRng!) - SwCntntNode* pCSttNd = pPam->GetCntntNode( sal_False ); - SwCntntNode* pCEndNd = pPam->GetCntntNode( sal_True ); + SwCntntNode* pCSttNd = pPam->GetCntntNode( false ); + SwCntntNode* pCEndNd = pPam->GetCntntNode( true ); // if start- and end-content is zero, then the doc-compare moves // complete nodes into the current doc. And then the selection @@ -430,7 +430,7 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext) if( pCSttNd && !pCEndNd) { // #112139# Do not step behind the end of content. - SwNode * pTmp = pPam->GetNode(sal_True); + SwNode * pTmp = pPam->GetNode(true); if (pTmp) { SwNode * pEnd = pDoc->GetNodes().DocumentSectionEndNode(pTmp); @@ -439,8 +439,8 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext) { pPam->SetMark(); pPam->GetPoint()->nNode++; - pPam->GetBound( sal_True ).nContent.Assign( 0, 0 ); - pPam->GetBound( sal_False ).nContent.Assign( 0, 0 ); + pPam->GetBound( true ).nContent.Assign( 0, 0 ); + pPam->GetBound( false ).nContent.Assign( 0, 0 ); pUnDel2 = new SwUndoDelete( *pPam, sal_True ); } } diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index a2d2565d4ced..a631b21b3b24 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -324,7 +324,7 @@ void SwUndoInsTbl::RedoImpl(::sw::UndoRedoContext & rContext) !rDoc.GetRedlineTbl().empty() )) { SwPaM aPam( *pTblNode->EndOfSectionNode(), *pTblNode, 1 ); - SwCntntNode* pCNd = aPam.GetCntntNode( sal_False ); + SwCntntNode* pCNd = aPam.GetCntntNode( false ); if( pCNd ) aPam.GetMark()->nContent.Assign( pCNd, 0 ); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index e26155187dc6..b964cc946497 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -616,7 +616,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData uno::Sequence< OUString > aSubRanges; // get sub-ranges and check that they all are from the very same table - sal_Bool bOk = GetSubranges( aRangeRepresentation, aSubRanges, sal_True ); + sal_Bool bOk = GetSubranges( aRangeRepresentation, aSubRanges, true ); if (!bOk && pDoc && !aChartOleObjectName.isEmpty() ) { @@ -661,7 +661,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData OUString aNewEndCell( sw_GetCellName( aDesc.nRight, aDesc.nBottom ) ); aRangeRepresentation = GetRangeRepFromTableAndCells( aChartTableName, aNewStartCell, aNewEndCell, sal_True ); - bOk = GetSubranges( aRangeRepresentation, aSubRanges, sal_True ); + bOk = GetSubranges( aRangeRepresentation, aSubRanges, true ); } } if (!bOk) // different tables used, or incorrect range specifiers @@ -1307,7 +1307,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume // to be nice to the user we now sort the cell ranges according to // rows or columns depending on the direction used in the data source uno::Sequence< OUString > aSortedRanges; - GetSubranges( aCellRanges, aSortedRanges, sal_False /*sub ranges should already be normalized*/ ); + GetSubranges( aCellRanges, aSortedRanges, false /*sub ranges should already be normalized*/ ); SortSubranges( aSortedRanges, (nDtaSrcIsColumns == 1) ); sal_Int32 nSortedRanges = aSortedRanges.getLength(); const OUString *pSortedRanges = aSortedRanges.getConstArray(); diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 76f64befafc3..206423d1ed75 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -622,10 +622,10 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 break; case SW_SERVICE_TYPE_FOOTNOTE : - xRet = (cppu::OWeakObject*)new SwXFootnote(sal_False); + xRet = (cppu::OWeakObject*)new SwXFootnote(false); break; case SW_SERVICE_TYPE_ENDNOTE : - xRet = (cppu::OWeakObject*)new SwXFootnote(sal_True); + xRet = (cppu::OWeakObject*)new SwXFootnote(true); break; case SW_SERVICE_CONTENT_INDEX_MARK : case SW_SERVICE_USER_INDEX_MARK : @@ -792,7 +792,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 break; case SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY: { - SwFieldType* pType = pDoc->GetFldType(RES_AUTHORITY, aEmptyOUStr, sal_True); + SwFieldType* pType = pDoc->GetFldType(RES_AUTHORITY, aEmptyOUStr, true); if(!pType) { SwAuthorityFieldType aType(pDoc); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index ac1a62832df5..f08021c87f54 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -667,7 +667,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry { SwTxtNode *const pTxtNode = rPam.GetNode()->GetTxtNode(); - if (rPam.GetNode(sal_True) == rPam.GetNode(sal_False) + if (rPam.GetNode(true) == rPam.GetNode(false) && pTxtNode && pTxtNode->GetpSwpHints()) { sal_uInt16 nPaMStart = rPam.GetPoint()->nContent.GetIndex(); @@ -1067,7 +1067,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, { SwReader* pRdr; SfxItemSet* pSet = pMed->GetItemSet(); - pSet->Put(SfxBoolItem(FN_API_CALL, sal_True)); + pSet->Put(SfxBoolItem(FN_API_CALL, true)); if(!sPassword.isEmpty()) pSet->Put(SfxStringItem(SID_PASSWORD, sPassword)); Reader *pRead = pDocSh->StartConvertFrom( *pMed, &pRdr, 0, pUnoCrsr); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index f35688a86eaf..b78f725c8ee1 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -597,7 +597,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, rValue >>= uTmp; OUString sTypeName(uTmp); SwFieldType * pType2 = m_pImpl->m_pDoc->GetFldType( - m_pImpl->m_nResTypeId, sTypeName, sal_False); + m_pImpl->m_nResTypeId, sTypeName, false); OUString sTable(SW_RES(STR_POOLCOLL_LABEL_TABLE)); OUString sDrawing(SW_RES(STR_POOLCOLL_LABEL_DRAWING)); @@ -1735,7 +1735,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } //make sure the SubType matches the field type SwFieldType* pSetExpFld = pDoc->GetFldType( - RES_SETEXPFLD, m_pImpl->m_pProps->sPar1, sal_False); + RES_SETEXPFLD, m_pImpl->m_pProps->sPar1, false); bool bSetGetExpFieldUninitialized = false; if (pSetExpFld) { @@ -2700,7 +2700,7 @@ uno::Any SwXTextFieldMasters::getByName(const OUString& rName) css::uno::Reference<css::uno::XInterface>()); sName = sName.copy(std::min(sTypeName.getLength()+1, sName.getLength())); - SwFieldType* pType = GetDoc()->GetFldType(nResId, sName, sal_True); + SwFieldType* pType = GetDoc()->GetFldType(nResId, sName, true); if(!pType) throw container::NoSuchElementException( "SwXTextFieldMasters::getByName(" + rName + ")", @@ -2789,7 +2789,7 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::Runti if( USHRT_MAX != nResId ) { sName = sName.copy(std::min(sTypeName.getLength()+1, sName.getLength())); - bRet = USHRT_MAX != nResId && 0 != GetDoc()->GetFldType(nResId, sName, sal_True); + bRet = USHRT_MAX != nResId && 0 != GetDoc()->GetFldType(nResId, sName, true); } return bRet; } @@ -2888,7 +2888,7 @@ void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException) throw uno::RuntimeException(); UnoActionContext aContext(GetDoc()); GetDoc()->UpdateDocStat(); - GetDoc()->UpdateFlds(0, sal_False); + GetDoc()->UpdateFlds(0, false); } // call refresh listeners (without SolarMutex locked) lang::EventObject const event(static_cast< ::cppu::OWeakObject*>(this)); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index eab4e48f4b7e..890f61552161 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -766,10 +766,10 @@ bool SwOLEProperties_Impl::AnyToItemSet( const ::uno::Any* pTemp; if(!GetProperty(FN_UNO_CLSID, 0, pTemp) && !GetProperty(FN_UNO_STREAM_NAME, 0, pTemp) && !GetProperty(FN_EMBEDDED_OBJECT, 0, pTemp) ) - return sal_False; + return false; SwFrameProperties_Impl::AnyToItemSet( pDoc, rFrmSet, rSet, rSizeFound); // - return sal_True; + return true; } diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 051de4298afb..ea3e1c4bdfa3 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -359,7 +359,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) pTxtAttr->SetSeqRefNo(); } } - m_pImpl->m_bIsDescriptor = sal_False; + m_pImpl->m_bIsDescriptor = false; SetDoc(pNewDoc); } diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 1172c8afaebe..0209c3528b57 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1378,7 +1378,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) m_pImpl->m_pProps.reset(); m_pImpl->m_pDoc = pDoc; - m_pImpl->m_bIsDescriptor = sal_False; + m_pImpl->m_bIsDescriptor = false; } uno::Reference< text::XTextRange > SAL_CALL @@ -1915,7 +1915,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) m_pImpl->InsertTOXMark(*const_cast<SwTOXType *>(pTOXType), aMark, aPam, dynamic_cast<SwXTextCursor const*>(pCursor)); - m_pImpl->m_bIsDescriptor = sal_False; + m_pImpl->m_bIsDescriptor = false; } template<typename T> struct NotContainedIn diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index bbdc6c11784b..705a01861bfc 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -1060,7 +1060,7 @@ SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException) if (pSectionStartNode->GetSection().IsHiddenFlag()) { pCNode = GetDoc()->GetNodes().GoNextSection( - &rUnoCursor.GetPoint()->nNode, sal_True, sal_False); + &rUnoCursor.GetPoint()->nNode, true, false); if (pCNode) { rUnoCursor.GetPoint()->nContent.Assign(pCNode, 0); @@ -2026,7 +2026,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) pSetParent.reset( pSet->Clone( sal_False ) ); // #i63870# SwUnoCursorHelper::GetCrsrAttr( - rPaM, *pSetParent, sal_True, sal_False ); + rPaM, *pSetParent, true, false ); } pStates[i] = ( (pSetParent)->Count() ) diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 7832ddbccf3f..fc53a05621dd 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -788,7 +788,7 @@ bool ::sw::GetDefaultTextContentValue( else if(rPropertyName == UNO_NAME_TEXT_WRAP) nWID = FN_UNO_TEXT_WRAP; else - return sal_False; + return false; } switch(nWID) @@ -803,9 +803,9 @@ bool ::sw::GetDefaultTextContentValue( } break; default: - return sal_False; + return false; } - return sal_True; + return true; } void SAL_CALL diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index b0d78f28491e..00f8fb4b8200 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -466,7 +466,7 @@ uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName ) uno::Reference<XInterface> xRet; SwNode* pNode = pRedline->GetNode(); if(!bStart && pRedline->HasMark()) - pNode = pRedline->GetNode(sal_False); + pNode = pRedline->GetNode(false); switch(pNode->GetNodeType()) { case ND_SECTIONNODE: diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index d40a8c281df7..d194f6d3974c 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -306,7 +306,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) //das muss jetzt sal_True liefern ::sw::XTextRangeToSwPaM(aPam, xTextRange); m_pImpl->InsertRefMark(aPam, dynamic_cast<SwXTextCursor*>(pCursor)); - m_pImpl->m_bIsDescriptor = sal_False; + m_pImpl->m_bIsDescriptor = false; m_pImpl->m_pDoc = pDocument; } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index fc28a3ceb163..205b61ead50c 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -674,7 +674,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } if (m_bIsDescriptor) { - m_pProps->m_bDDE = sal_False; + m_pProps->m_bDDE = false; m_pProps->m_sLinkFileName = aLink.FileURL; m_pProps->m_sSectionFilter = aLink.FilterName; } @@ -715,7 +715,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, pValues[nProperty] >>= sLink; if (m_bIsDescriptor) { - m_pProps->m_bDDE = sal_False; + m_pProps->m_bDDE = false; m_pProps->m_sSectionRegion = sLink; } else @@ -1158,8 +1158,8 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, for (sal_uInt16 nRed = 0; nRed < rRedTbl.size(); nRed++) { const SwRangeRedline* pRedline = rRedTbl[nRed]; - SwNode const*const pRedPointNode = pRedline->GetNode(sal_True); - SwNode const*const pRedMarkNode = pRedline->GetNode(sal_False); + SwNode const*const pRedPointNode = pRedline->GetNode(true); + SwNode const*const pRedMarkNode = pRedline->GetNode(false); if ((pRedPointNode == pSectNode) || (pRedMarkNode == pSectNode)) { diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 9cf1151f3b02..b483d617865e 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -164,7 +164,7 @@ static SwGetPoolIdFromName lcl_GetSwEnumFromSfxEnum ( SfxStyleFamily eFamily ) case SFX_STYLE_FAMILY_PSEUDO: return nsSwGetPoolIdFromName::GET_POOLID_NUMRULE; default: - OSL_ENSURE(sal_False, "someone asking for all styles in unostyle.cxx!" ); + OSL_ENSURE(false, "someone asking for all styles in unostyle.cxx!" ); return nsSwGetPoolIdFromName::GET_POOLID_CHRFMT; } } @@ -3138,13 +3138,13 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( SID_ATTR_PAGE_SHARED, SID_ATTR_PAGE_SHARED, SID_ATTR_PAGE_SHARED_FIRST, SID_ATTR_PAGE_SHARED_FIRST, 0 ); - aTempSet.Put(SfxBoolItem(nRes, sal_True)); + aTempSet.Put(SfxBoolItem(nRes, true)); aTempSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(MM50, MM50))); aTempSet.Put(SvxLRSpaceItem(RES_LR_SPACE)); aTempSet.Put(SvxULSpaceItem(RES_UL_SPACE)); - aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_SHARED, sal_True)); - aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_SHARED_FIRST, sal_True)); - aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_DYNAMIC, sal_True)); + aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_SHARED, true)); + aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_SHARED_FIRST, true)); + aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_DYNAMIC, true)); SvxSetItem aNewSetItem( bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET, aTempSet); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index f419d217d974..ac05c38801a5 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -316,8 +316,8 @@ static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimp for(sal_uInt16 nRed = 0; nRed < rRedTbl.size(); nRed++) { const SwRangeRedline* pRedline = rRedTbl[nRed]; - const SwNode* pRedPointNode = pRedline->GetNode(sal_True); - const SwNode* pRedMarkNode = pRedline->GetNode(sal_False); + const SwNode* pRedPointNode = pRedline->GetNode(true); + const SwNode* pRedMarkNode = pRedline->GetNode(false); if(pRedPointNode == pTblNode || pRedMarkNode == pTblNode) { const SwNode* pStartOfRedline = SwNodeIndex(*pRedPointNode) <= SwNodeIndex(*pRedMarkNode) ? @@ -1862,7 +1862,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) case FN_UNO_PARA_STYLE: { SwFmtColl *const pFmt = - SwUnoCursorHelper::GetCurTxtFmtColl(*pUnoCrsr, sal_False); + SwUnoCursorHelper::GetCurTxtFmtColl(*pUnoCrsr, false); OUString sRet; if(pFmt) sRet = pFmt->GetName(); @@ -4001,7 +4001,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be case FN_UNO_PARA_STYLE: { SwFmtColl *const pTmpFmt = - SwUnoCursorHelper::GetCurTxtFmtColl(*pTblCrsr, sal_False); + SwUnoCursorHelper::GetCurTxtFmtColl(*pTblCrsr, false); OUString sRet; if(pFmt) sRet = pTmpFmt->GetName(); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 161a289150ef..6ce00e9c936a 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -431,7 +431,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) case text::ControlCharacter::PARAGRAPH_BREAK : // a table cell now becomes an ordinary text cell! m_pImpl->m_pDoc->ClearBoxNumAttrs( aTmp.GetPoint()->nNode ); - m_pImpl->m_pDoc->SplitNode( *aTmp.GetPoint(), sal_False ); + m_pImpl->m_pDoc->SplitNode( *aTmp.GetPoint(), false ); break; case text::ControlCharacter::APPEND_PARAGRAPH: { @@ -1897,7 +1897,7 @@ void SwXText::Impl::ConvertCell( // align the beginning - if necessary if (aStartCellPam.Start()->nContent.GetIndex()) { - m_pDoc->SplitNode(*aStartCellPam.Start(), sal_False); + m_pDoc->SplitNode(*aStartCellPam.Start(), false); } } else @@ -1916,7 +1916,7 @@ void SwXText::Impl::ConvertCell( } else { - m_pDoc->SplitNode(*aStartCellPam.Start(), sal_False); + m_pDoc->SplitNode(*aStartCellPam.Start(), false); } } else if (nStartCellNodeIndex == (nLastNodeEndIndex + 1)) @@ -1935,7 +1935,7 @@ void SwXText::Impl::ConvertCell( if (aEndCellPam.End()->nContent.GetIndex() < aEndCellPam.End()->nNode.GetNode().GetTxtNode()->Len()) { - m_pDoc->SplitNode(*aEndCellPam.End(), sal_False); + m_pDoc->SplitNode(*aEndCellPam.End(), false); // take care that the new start/endcell is moved to the right position // aStartCellPam has to point to the start of the new (previous) node // aEndCellPam has to point to the end of the new (previous) node diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index 913476a1f115..9b501d0822b4 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -159,7 +159,7 @@ sal_uLong SwASCWriter::WriteStream() Strm().WriteUChar( sal_uInt8(0xEF) ).WriteUChar( sal_uInt8(0xBB) ). WriteUChar( sal_uInt8(0xBF) ); break; case RTL_TEXTENCODING_UCS2: - Strm().SetEndianSwap(sal_False); + Strm().SetEndianSwap(false); #ifdef OSL_LITENDIAN Strm().WriteUChar( sal_uInt8(0xFF) ).WriteUChar( sal_uInt8(0xFE) ); #else diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 0b95aabab2e4..2e3f72ecaf15 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -67,7 +67,7 @@ OUString SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_) const bool bRet = false; if ( sHTML == sName ) - bRet = HTMLParser::IsHTMLFormat( pHeader, sal_True, RTL_TEXTENCODING_DONTKNOW ); + bRet = HTMLParser::IsHTMLFormat( pHeader, true, RTL_TEXTENCODING_DONTKNOW ); else if ( FILTER_RTF == sName ) bRet = 0 == strncmp( "{\\rtf", pHeader, 5 ); else if ( sWW5 == sName ) @@ -214,7 +214,7 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName) { SvStream* pStream = rMedium.GetInStream(); if ( pStream && SotStorage::IsStorageFile(pStream) ) - xStg = new SotStorage( pStream, sal_False ); + xStg = new SotStorage( pStream, false ); } SfxFilterMatcher aMatcher( rFltContainer.GetName() ); @@ -333,7 +333,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName, { SvStream* pStream = pMedium->GetInStream(); if ( pStream && SotStorage::IsStorageFile(pStream) ) - xStg = new SotStorage( pStream, sal_False ); + xStg = new SotStorage( pStream, false ); if( xStg.Is() && ( xStg->GetError() == SVSTREAM_OK ) ) { @@ -510,7 +510,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen, { case 0x0: if( nCnt + 1 < rLen && !*(pBuf+1) ) - return 0; + return false; bIsBareUnicode = true; break; case 0xA: diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 62917757bfa8..4e332d320cc1 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -930,7 +930,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName ) { rDoc.ResetModified(); // #i38810# - reset also flag, that indicates updated links - rDoc.SetLinksUpdated( sal_False ); + rDoc.SetLinksUpdated( false ); } } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 32ed74ab85db..2bcf3b578b0d 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -66,7 +66,7 @@ void SwHTMLParser::NewScript() if( !aScriptURL.isEmpty() ) { // Den Inhalt des Script-Tags ignorieren - bIgnoreRawData = sal_True; + bIgnoreRawData = true; } } @@ -85,7 +85,7 @@ void SwHTMLParser::EndScript() break; } - bIgnoreRawData = sal_False; + bIgnoreRawData = false; aScriptSource = convertLineEnd(aScriptSource, GetSystemLineEnd()); // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 0f31ce027b5a..59f3f9914c5d 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1708,7 +1708,7 @@ void SwHTMLParser::NewStyle() void SwHTMLParser::EndStyle() { - bIgnoreRawData = sal_False; + bIgnoreRawData = false; if( !aStyleSource.isEmpty() ) { @@ -1860,7 +1860,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn ) } - pPageEntry = GetPage( "first", sal_True ); + pPageEntry = GetPage( "first", true ); if( pPageEntry ) { SetPageDescAttrs( GetFirstPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1868,7 +1868,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn ) bSetFirstPageDesc = sal_True; } - pPageEntry = GetPage( "right", sal_True ); + pPageEntry = GetPage( "right", true ); if( pPageEntry ) { SetPageDescAttrs( GetRightPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1876,7 +1876,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn ) bSetRightPageDesc = sal_True; } - pPageEntry = GetPage( "left", sal_True ); + pPageEntry = GetPage( "left", true ); if( pPageEntry ) SetPageDescAttrs( GetLeftPageDesc(sal_True), pPageEntry->GetItemSet(), pPageEntry->GetPropertyInfo() ); diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index 39ef0907a421..edb840d7f8c0 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -492,7 +492,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eHeightType ) aTwipSz.Height() = aPropInfo.nHeight; - bFixMarqueeWidth = sal_False; + bFixMarqueeWidth = false; if( !nWidth || bPrcWidth ) { if( pTable ) @@ -503,7 +503,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) // in einer Zelle. Da jetzt keine vernuenftige Zuordung // zu einer Zelle moeglich ist, passen wir hir die // Breite dem Inhalt der Laufschrift an. - bFixMarqueeWidth = sal_True; + bFixMarqueeWidth = true; } else if( !nWidth ) { diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 57015eeabf66..1155a34f83b0 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -534,7 +534,7 @@ void SwHTMLParser::NewField() pDoc->InsertPoolItem( *pPam, SwFmtFld(*pFld), 0 ); delete pFld; } - bInField = sal_True; + bInField = true; } } @@ -574,7 +574,7 @@ void SwHTMLParser::EndField() pField = 0; } - bInField = sal_False; + bInField = false; aContents = ""; } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 5fea6b1ccf87..002a1d9abb86 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -698,7 +698,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha if ( pDocSh->GetMedium() ) { // if there is no hidden property in the MediaDescriptor it should be removed after loading - SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); + SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); bRemoveHidden = ( pHiddenItem == NULL || !pHiddenItem->GetValue() ); } @@ -2167,8 +2167,8 @@ void SwHTMLParser::NewTextArea() SplitPREListingXMP( pCntxt ); PushContext( pCntxt ); - bTextArea = sal_True; - bTAIgnoreNewPara = sal_True; + bTextArea = true; + bTAIgnoreNewPara = true; } void SwHTMLParser::EndTextArea() @@ -2197,7 +2197,7 @@ void SwHTMLParser::EndTextArea() delete pCntxt; } - bTextArea = sal_False; + bTextArea = false; } void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken ) @@ -2227,7 +2227,7 @@ void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken ) rText += ">"; } - bTAIgnoreNewPara = sal_False; + bTAIgnoreNewPara = false; } void SwHTMLParser::NewSelect() @@ -2416,11 +2416,11 @@ void SwHTMLParser::NewSelect() } Size aSz( MINFLY, MINFLY ); - bFixSelectWidth = bFixSelectHeight = sal_True; + bFixSelectWidth = bFixSelectHeight = true; if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eWidthType ) { aSz.Width() = TWIP_TO_MM100( aCSS1PropInfo.nWidth ); - bFixSelectWidth = sal_False; + bFixSelectWidth = false; bMinWidth = sal_False; } if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType ) @@ -2451,7 +2451,7 @@ void SwHTMLParser::NewSelect() SplitPREListingXMP( pCntxt ); PushContext( pCntxt ); - bSelect = sal_True; + bSelect = true; } void SwHTMLParser::EndSelect() @@ -2545,7 +2545,7 @@ void SwHTMLParser::EndSelect() delete pCntxt; } - bSelect = sal_False; + bSelect = false; } void SwHTMLParser::InsertSelectOption() @@ -2554,7 +2554,7 @@ void SwHTMLParser::InsertSelectOption() OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(), "kein Select-Control" ); - bLBEntrySelected = sal_False; + bLBEntrySelected = false; OUString aValue; const HTMLOptions& rHTMLOptions = GetOptions(); @@ -2567,7 +2567,7 @@ void SwHTMLParser::InsertSelectOption() // erstmal weglassen!!! break; case HTML_O_SELECTED: - bLBEntrySelected = sal_True; + bLBEntrySelected = true; break; case HTML_O_VALUE: aValue = rOption.GetString(); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index c1c7088302ab..68bbbdda70a7 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -707,7 +707,7 @@ IMAGE_SETEVENT: // ggfs. eine Grafik anspringen if( JUMPTO_GRAPHIC == eJumpTo && sHTMLGrfName == sJmpMark ) { - bChkJumpMark = sal_True; + bChkJumpMark = true; eJumpTo = JUMPTO_NONE; } } @@ -1210,11 +1210,11 @@ ANCHOR_SETEVENT: if( bEnAnchor || bFtnAnchor ) { InsertFootEndNote( aFtnName, bEnAnchor, bFixed ); - bInFootEndNoteAnchor = bCallNextToken = sal_True; + bInFootEndNoteAnchor = bCallNextToken = true; } else if( bFtnEnSymbol ) { - bInFootEndNoteSymbol = bCallNextToken = sal_True; + bInFootEndNoteSymbol = bCallNextToken = true; } // den Kontext merken @@ -1226,11 +1226,11 @@ void SwHTMLParser::EndAnchor() if( bInFootEndNoteAnchor ) { FinishFootEndNote(); - bInFootEndNoteAnchor = sal_False; + bInFootEndNoteAnchor = false; } else if( bInFootEndNoteSymbol ) { - bInFootEndNoteSymbol = sal_False; + bInFootEndNoteSymbol = false; } EndTag( HTML_ANCHOR_OFF ); diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index 323bd7d1972d..99ff3bde5429 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -501,7 +501,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken ) // einen neuen Absatz aufmachen if( pPam->GetPoint()->nContent.GetIndex() ) AppendTxtNode( AM_NOSPACE, sal_False ); - bNoParSpace = sal_False; // In <LI> wird kein Abstand eingefuegt! + bNoParSpace = false; // In <LI> wird kein Abstand eingefuegt! const bool bCountedInList( HTML_LISTHEADER_ON==nToken ? false : true ); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 7da37d9183c7..3ca8df45e02d 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -951,7 +951,7 @@ void SwHTMLParser::InsertFloatingFrame() // Ggf Frames anlegen und auto-geb. Rahmen registrieren RegisterFlyFrm( pFlyFmt ); - bInFloatingFrame = sal_True; + bInFloatingFrame = true; } diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 71f800261f73..273b38d0c9f8 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -338,7 +338,7 @@ void SwHTMLParser::NewDivision( int nToken ) // ggfs. einen Bereich anspringen if( JUMPTO_REGION == eJumpTo && aName == sJmpMark ) { - bChkJumpMark = sal_True; + bChkJumpMark = true; eJumpTo = JUMPTO_NONE; } @@ -727,7 +727,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) // Jump to section, if this is requested. if( JUMPTO_REGION == eJumpTo && aName == sJmpMark ) { - bChkJumpMark = sal_True; + bChkJumpMark = true; eJumpTo = JUMPTO_NONE; } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 4ba16d2f3215..632aa8aad44b 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -3109,7 +3109,7 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser ) rParser.nDefListDeep = nDefListDeepSave; // und ein par Flags zuruecksetzen - rParser.bNoParSpace = sal_False; + rParser.bNoParSpace = false; rParser.nOpenParaToken = 0; if( !rParser.aParaAttrs.empty() ) @@ -3712,7 +3712,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, SetAttr( sal_True, sal_True, pPostIts ); } } - bNoParSpace = sal_False; + bNoParSpace = false; // Aktuelle Numerierung retten und auschalten. pTCntxt->SetNumInfo( GetNumInfo() ); @@ -4089,7 +4089,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, pSaveStruct->AddContents( InsertTableContents( bHead ) ); } - bCallNextToken = sal_True; + bCallNextToken = true; NewMarquee( pCurTable ); break; @@ -5457,7 +5457,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, if( pTable==pCurTable ) { // oberen Absatz-Abstand einstellen - bUpperSpace = sal_True; + bUpperSpace = true; SetTxtCollAttrs(); nParaCnt = nParaCnt - std::min(nParaCnt, @@ -5467,7 +5467,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, if( JUMPTO_TABLE == eJumpTo && pTable->GetSwTable() && pTable->GetSwTable()->GetFrmFmt()->GetName() == sJmpMark ) { - bChkJumpMark = sal_True; + bChkJumpMark = true; eJumpTo = JUMPTO_NONE; } diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 4ae93049f4b0..3dfbaea226c5 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -750,7 +750,7 @@ void CSS1Parser::ParseRule() return; // Selektor verarbeiten - if( SelectorParsed( pSelector, sal_True ) ) + if( SelectorParsed( pSelector, true ) ) delete pSelector; LOOP_CHECK_DECL @@ -769,7 +769,7 @@ void CSS1Parser::ParseRule() return; // Selektor verarbeiten - if( SelectorParsed( pSelector, sal_False ) ) + if( SelectorParsed( pSelector, false ) ) delete pSelector; } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 1ab9890f6780..b1c99dfae725 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -271,36 +271,36 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn, m_nContinue( 0 ), #endif eParaAdjust( SVX_ADJUST_END ), - bDocInitalized( sal_False ), - bSetModEnabled( sal_False ), - bInFloatingFrame( sal_False ), - bInField( sal_False ), - bCallNextToken( sal_False ), - bIgnoreRawData( sal_False ), + bDocInitalized( false ), + bSetModEnabled( false ), + bInFloatingFrame( false ), + bInField( false ), + bCallNextToken( false ), + bIgnoreRawData( false ), bLBEntrySelected ( false ), bTAIgnoreNewPara ( false ), bFixMarqueeWidth ( false ), bFixMarqueeHeight ( false ), - bNoParSpace( sal_False ), - bInNoEmbed( sal_False ), - bInTitle( sal_False ), - bUpdateDocStat( sal_False ), - bFixSelectWidth( sal_False ), - bFixSelectHeight( sal_False ), - bTextArea( sal_False ), - bSelect( sal_False ), - bInFootEndNoteAnchor( sal_False ), - bInFootEndNoteSymbol( sal_False ), + bNoParSpace( false ), + bInNoEmbed( false ), + bInTitle( false ), + bUpdateDocStat( false ), + bFixSelectWidth( false ), + bFixSelectHeight( false ), + bTextArea( false ), + bSelect( false ), + bInFootEndNoteAnchor( false ), + bInFootEndNoteSymbol( false ), bIgnoreHTMLComments( bNoHTMLComments ), - bRemoveHidden( sal_False ), + bRemoveHidden( false ), pTempViewFrame(0) { nEventId = 0; bUpperSpace = bViewCreated = bChkJumpMark = - bSetCrsr = sal_False; + bSetCrsr = false; eScriptLang = HTML_SL_UNKNOWN; - bAnyStarBasic = sal_True; + bAnyStarBasic = true; rCrsr.DeleteMark(); pPam = &rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert @@ -360,7 +360,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn, SwDocShell* pDocSh = pDoc->GetDocShell(); if( pDocSh ) { - bViewCreated = sal_True; // nicht, synchron laden + bViewCreated = true; // nicht, synchron laden // es ist ein Sprungziel vorgegeben. @@ -415,7 +415,7 @@ SwHTMLParser::~SwHTMLParser() OSL_ENSURE( !m_nContinue, "DTOR im Continue!" ); #endif sal_Bool bAsync = pDoc->IsInLoadAsynchron(); - pDoc->SetInLoadAsynchron( sal_False ); + pDoc->SetInLoadAsynchron( false ); pDoc->set(IDocumentSettingAccess::HTML_MODE, bOldIsHTMLMode); if( pDoc->GetDocShell() && nEventId ) @@ -537,7 +537,7 @@ SvParserState SwHTMLParser::CallParser() } else { - bViewCreated = sal_True; + bViewCreated = true; nEventId = 0; } } @@ -584,8 +584,8 @@ void SwHTMLParser::Continue( int nToken ) // An dieser Stelle wurde im CallParser gerade mal ein Zeichen // gelesen und ein SaveState(0) gerufen. eState = SVPAR_PENDING; - bViewCreated = sal_True; - pDoc->SetInLoadAsynchron( sal_True ); + bViewCreated = true; + pDoc->SetInLoadAsynchron( true ); #ifdef DBG_UTIL m_nContinue--; @@ -594,7 +594,7 @@ void SwHTMLParser::Continue( int nToken ) return; } - bSetModEnabled = sal_False; + bSetModEnabled = false; if( pDoc->GetDocShell() && (bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) ) { @@ -699,21 +699,21 @@ void SwHTMLParser::Continue( int nToken ) #if OSL_DEBUG_LEVEL > 0 // !!! sollte nicht moeglich sein, oder ?? -OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( sal_True ).nNode.GetIndex(), +OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( true ).nNode.GetIndex(), "Pam.Bound1 steht noch im Node" ); -OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( sal_False ).nNode.GetIndex(), +OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( false ).nNode.GetIndex(), "Pam.Bound2 steht noch im Node" ); -if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_True ).nNode.GetIndex() ) +if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( true ).nNode.GetIndex() ) { - const sal_Int32 nCntPos = pPam->GetBound( sal_True ).nContent.GetIndex(); - pPam->GetBound( sal_True ).nContent.Assign( pTxtNode, + const sal_Int32 nCntPos = pPam->GetBound( true ).nContent.GetIndex(); + pPam->GetBound( true ).nContent.Assign( pTxtNode, pTxtNode->GetTxt().getLength() + nCntPos ); } -if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) +if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() ) { - const sal_Int32 nCntPos = pPam->GetBound( sal_False ).nContent.GetIndex(); - pPam->GetBound( sal_False ).nContent.Assign( pTxtNode, + const sal_Int32 nCntPos = pPam->GetBound( false ).nContent.GetIndex(); + pPam->GetBound( false ).nContent.Assign( pTxtNode, pTxtNode->GetTxt().getLength() + nCntPos ); } #endif @@ -771,8 +771,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) pCrsrSh->SetMark(); pCrsrSh->ClearMark(); } - pPam->GetBound(sal_True).nContent.Assign( 0, 0 ); - pPam->GetBound(sal_False).nContent.Assign( 0, 0 ); + pPam->GetBound(true).nContent.Assign( 0, 0 ); + pPam->GetBound(false).nContent.Assign( 0, 0 ); pDoc->GetNodes().Delete( pPam->GetPoint()->nNode ); } } @@ -820,10 +820,10 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) if( pPrev->HasSwAttrSet() ) pTxtNode->SetAttr( *pPrev->GetpSwAttrSet() ); - if( &pPam->GetBound(sal_True).nNode.GetNode() == pPrev ) - pPam->GetBound(sal_True).nContent.Assign( pTxtNode, 0 ); - if( &pPam->GetBound(sal_False).nNode.GetNode() == pPrev ) - pPam->GetBound(sal_False).nContent.Assign( pTxtNode, 0 ); + if( &pPam->GetBound(true).nNode.GetNode() == pPrev ) + pPam->GetBound(true).nContent.Assign( pTxtNode, 0 ); + if( &pPam->GetBound(false).nNode.GetNode() == pPrev ) + pPam->GetBound(false).nContent.Assign( pTxtNode, 0 ); pTxtNode->JoinPrev(); } @@ -885,7 +885,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) if( bSetModEnabled && pDoc->GetDocShell() ) { pDoc->GetDocShell()->EnableSetModified( sal_True ); - bSetModEnabled = sal_False; // this is unnecessary here + bSetModEnabled = false; // this is unnecessary here } } @@ -919,11 +919,11 @@ void SwHTMLParser::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) void SwHTMLParser::DocumentDetected() { OSL_ENSURE( !bDocInitalized, "DocumentDetected mehrfach aufgerufen" ); - bDocInitalized = sal_True; + bDocInitalized = true; if( IsNewDoc() ) { if( IsInHeader() ) - FinishHeader( sal_True ); + FinishHeader( true ); CallEndAction( sal_True, sal_True ); @@ -1000,7 +1000,7 @@ void SwHTMLParser::NextToken( int nToken ) pDoc->GetDocShell()->SetTitle( sTitle ); } } - bInTitle = sal_False; + bInTitle = false; sTitle = ""; break; @@ -1042,7 +1042,7 @@ void SwHTMLParser::NextToken( int nToken ) sal_Bool bGetIDOption = sal_False, bInsertUnknown = sal_False; sal_Bool bUpperSpaceSave = bUpperSpace; - bUpperSpace = sal_False; + bUpperSpace = false; // The following special cases may or have to be treated after the // filter detection @@ -1054,7 +1054,7 @@ void SwHTMLParser::NextToken( int nToken ) // Applets as well if( HTML_IFRAME_OFF == nToken ) { - bCallNextToken = sal_False; + bCallNextToken = false; EndFloatingFrame(); } @@ -1068,8 +1068,8 @@ void SwHTMLParser::NextToken( int nToken ) aContents = convertLineEnd(aContents, GetSystemLineEnd()); InsertComment( aContents, OOO_STRING_SVTOOLS_HTML_noembed ); aContents = ""; - bCallNextToken = sal_False; - bInNoEmbed = sal_False; + bCallNextToken = false; + bInNoEmbed = false; break; case HTML_RAWDATA: @@ -1092,11 +1092,11 @@ void SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_APPLET_OFF: - bCallNextToken = sal_False; + bCallNextToken = false; EndApplet(); break; case HTML_OBJECT_OFF: - bCallNextToken = sal_False; + bCallNextToken = false; EndObject(); break; @@ -1115,7 +1115,7 @@ void SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_TEXTAREA_OFF: - bCallNextToken = sal_False; + bCallNextToken = false; EndTextArea(); break; @@ -1132,7 +1132,7 @@ void SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_SELECT_OFF: - bCallNextToken = sal_False; + bCallNextToken = false; EndSelect(); return; @@ -1166,7 +1166,7 @@ void SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_MARQUEE_OFF: - bCallNextToken = sal_False; + bCallNextToken = false; EndMarquee(); break; @@ -1182,7 +1182,7 @@ void SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_SDFIELD_OFF: - bCallNextToken = sal_False; + bCallNextToken = false; EndField(); break; @@ -1199,7 +1199,7 @@ void SwHTMLParser::NextToken( int nToken ) { case HTML_ANCHOR_OFF: EndAnchor(); - bCallNextToken = sal_False; + bCallNextToken = false; break; case HTML_TEXTTOKEN: @@ -1340,7 +1340,7 @@ void SwHTMLParser::NextToken( int nToken ) break; case HTML_TITLE_ON: - bInTitle = sal_True; + bInTitle = true; break; case HTML_SCRIPT_ON: @@ -1505,7 +1505,7 @@ void SwHTMLParser::NextToken( int nToken ) break; case HTML_NOEMBED_ON: - bInNoEmbed = sal_True; + bInNoEmbed = true; bCallNextToken = pTable!=0; ReadRawData( OOO_STRING_SVTOOLS_HTML_noembed ); break; @@ -1633,7 +1633,7 @@ void SwHTMLParser::NextToken( int nToken ) break; case HTML_PREFORMTXT_OFF: - bNoParSpace = sal_True; // the last PRE-paragraph gets a spacing + bNoParSpace = true; // the last PRE-paragraph gets a spacing EndTxtFmtColl( HTML_PREFORMTXT_OFF ); break; @@ -1996,7 +1996,7 @@ void SwHTMLParser::NextToken( int nToken ) case HTML_NOFRAMES_ON: if( IsInHeader() ) - FinishHeader( sal_True ); + FinishHeader( true ); bInsertUnknown = bKeepUnknown; break; @@ -2393,7 +2393,7 @@ void SwHTMLParser::AddParSpace() if( !bNoParSpace ) return; - bNoParSpace = sal_False; + bNoParSpace = false; sal_uLong nNdIdx = pPam->GetPoint()->nNode.GetIndex() - 1; @@ -2587,7 +2587,7 @@ SwViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr pSh = (SwViewShell *)pSh->GetNext(); } while( pSh != pActionViewShell ); - bSetCrsr = sal_False; + bSetCrsr = false; } if( pActionViewShell->ISA( SwEditShell ) ) { @@ -2607,7 +2607,7 @@ SwViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr if( GetMedium() && aVisSttPos == pActionViewShell->VisArea().Pos() ) ::JumpToSwMark( pActionViewShell, GetMedium()->GetURLObject().GetMark() ); - bChkJumpMark = sal_False; + bChkJumpMark = false; } } else @@ -2836,7 +2836,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, // jump to bookmark if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == sJmpMark ) { - bChkJumpMark = sal_True; + bChkJumpMark = true; eJumpTo = JUMPTO_NONE; } } @@ -2883,7 +2883,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, JUMPTO_MARK == eJumpTo && sJmpMark == ((SwFmtINetFmt*)pAttr->pItem)->GetName() ) { - bChkJumpMark = sal_True; + bChkJumpMark = true; eJumpTo = JUMPTO_NONE; } @@ -5472,9 +5472,9 @@ _HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, nEndPara( rPos.nNode ), nSttCntnt( rPos.nContent.GetIndex() ), nEndCntnt(rPos.nContent.GetIndex() ), - bInsAtStart( sal_True ), - bLikePara( sal_False ), - bValid( sal_True ), + bInsAtStart( true ), + bLikePara( false ), + bValid( true ), nCount( 1 ), pNext( 0 ), pPrev( 0 ), diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 4a88b6f284ce..878ba65854c9 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -127,7 +127,7 @@ public: // waere sehr aufwendig, da man nicht so genau weiss, wo sie eingekettet // sind. Sie werden deshalb einfach invalidiert und erst beim naechsten // _SetAttr() geloescht. - void Invalidate() { bValid = sal_False; } + void Invalidate() { bValid = false; } sal_Bool IsValid() const { return bValid; } }; @@ -240,15 +240,15 @@ public: nUpperSpace( 0 ), nLowerSpace( 0 ), eAppend( AM_NONE ), - bLRSpaceChanged( sal_False ), - bULSpaceChanged( sal_False ), + bLRSpaceChanged( false ), + bULSpaceChanged( false ), bDfltTxtFmtColl( bDfltColl ), - bSpansSection( sal_False ), - bPopStack( sal_False ), - bFinishPREListingXMP( sal_False ), - bRestartPRE( sal_False ), - bRestartXMP( sal_False ), - bRestartListing( sal_False ) + bSpansSection( false ), + bPopStack( false ), + bFinishPREListingXMP( false ), + bRestartPRE( false ), + bRestartXMP( false ), + bRestartListing( false ) {} _HTMLAttrContext( sal_uInt16 nTokn ) : @@ -262,15 +262,15 @@ public: nUpperSpace( 0 ), nLowerSpace( 0 ), eAppend( AM_NONE ), - bLRSpaceChanged( sal_False ), - bULSpaceChanged( sal_False ), - bDfltTxtFmtColl( sal_False ), - bSpansSection( sal_False ), - bPopStack( sal_False ), - bFinishPREListingXMP( sal_False ), - bRestartPRE( sal_False ), - bRestartXMP( sal_False ), - bRestartListing( sal_False ) + bLRSpaceChanged( false ), + bULSpaceChanged( false ), + bDfltTxtFmtColl( false ), + bSpansSection( false ), + bPopStack( false ), + bFinishPREListingXMP( false ), + bRestartPRE( false ), + bRestartXMP( false ), + bRestartListing( false ) {} ~_HTMLAttrContext() { ClearSaveDocContext(); delete pFrmItemSet; } @@ -719,7 +719,7 @@ private: void InsertParam(); // htmlplug.cxx void InsertFloatingFrame(); - void EndFloatingFrame() { bInFloatingFrame = sal_False; } + void EndFloatingFrame() { bInFloatingFrame = false; } // <BODY>-Tag auswerten: Hintergrund-Grafiken und -Farben setzen (htmlgrin.cxx) void InsertBodyOptions(); @@ -948,7 +948,7 @@ inline void _HTMLAttrContext::SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight, nLeftMargin = nLeft; nRightMargin = nRight; nFirstLineIndent = nIndent; - bLRSpaceChanged = sal_True; + bLRSpaceChanged = true; } inline void _HTMLAttrContext::GetMargins( sal_uInt16& nLeft, @@ -967,7 +967,7 @@ inline void _HTMLAttrContext::SetULSpace( sal_uInt16 nUpper, sal_uInt16 nLower ) { nUpperSpace = nUpper; nLowerSpace = nLower; - bULSpaceChanged = sal_True; + bULSpaceChanged = true; } inline void _HTMLAttrContext::GetULSpace( sal_uInt16& rUpper, diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 7378b4719b66..163233239dc4 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -467,7 +467,7 @@ public: { // #i73790# - method renamed pColl->ResetAllFmtAttr(); - pColl->SetAuto(sal_False); // nach Empfehlung JP + pColl->SetAuto(false); // nach Empfehlung JP } void Derived(SwTxtFmtColl* pBase) { pColl->SetDerivedFrom(pBase); } diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 7c0023ac352f..7c69b4924fda 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -529,7 +529,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwNumRule* pRul = pDoc->FindNumRulePtr( rNumNm ); if( pRul ) { - if( rEntry.MakeRegion(pDoc, aRegion, sal_True)) + if( rEntry.MakeRegion(pDoc, aRegion, true)) { SwNodeIndex aTmpStart( aRegion.Start()->nNode ); SwNodeIndex aTmpEnd( aTmpStart ); @@ -638,7 +638,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, break; case RES_FLTR_REDLINE: { - if (rEntry.MakeRegion(pDoc, aRegion, sal_True)) + if (rEntry.MakeRegion(pDoc, aRegion, true)) { pDoc->SetRedlineMode((RedlineMode_t)( nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT @@ -682,7 +682,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, { rEntry.SetIsParaEnd( IsParaEndInCPs(nStart,nEnd,bHasSdOD) ); } - if (rEntry.MakeRegion(pDoc, aRegion, sal_False)) + if (rEntry.MakeRegion(pDoc, aRegion, false)) { nStart = rEntry.GetStartCP(); nEnd = rEntry.GetEndCP(); diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 72de563e4cdf..be05e22a7156 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -343,7 +343,7 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, sal_uLong nFieldFlgs) long nLeft = rFib.GetFIB().cbSttbfffnGet() - sizeof(nCountBytes); // Zaehle, wieviele Fonts enthalten W1_FFN* p = pA; - while (1) + while (true) { sal_uInt16 nNextSiz; nNextSiz = p->cbFfnM1Get() + 1; @@ -815,7 +815,7 @@ Ww1StringList::Ww1StringList( SvStream& rSt, sal_uLong nFc, sal_uInt16 nCb ) // Zaehle, wieviele Fonts enthalten long nLeft = nCb - sizeof(nCountBytes); sal_Char* p = pA; - while (1) + while (true) { sal_uInt16 nNextSiz; nNextSiz = *p + 1; @@ -836,7 +836,7 @@ Ww1StringList::Ww1StringList( SvStream& rSt, sal_uLong nFc, sal_uInt16 nCb ) sal_uInt16 i = 2; p = pA; sal_uInt8 nL = *p; - while(1) + while(true) { p += nL + 1; // Neues Laengen-Byte nL = *p; // merke Laenge @@ -919,7 +919,7 @@ long Ww1Bookmarks::Len() const { if( nIsEnd ) { - OSL_ENSURE( sal_False, "Falscher Aufruf (1) von Ww1Bookmarks::Len()" ); + OSL_ENSURE( false, "Falscher Aufruf (1) von Ww1Bookmarks::Len()" ); return 0; } sal_uInt16 nEndIdx = SVBT16ToShort(pPos[0]->GetData(nPlcIdx[0])); @@ -1112,7 +1112,7 @@ sal_Bool Ww1Pap::HasId0(sal_uInt16 nId) UpdateIdx(); if( !pPap ){ - OSL_ENSURE( sal_False, "Ww1Pap::HasId():: kann kein pPap erzeugen" ); + OSL_ENSURE( false, "Ww1Pap::HasId():: kann kein pPap erzeugen" ); return sal_False; } diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 6630d8f261be..1574e23f6244 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -139,9 +139,9 @@ void Ww1Manager::OutStop(Ww1Shell& rOut, sal_Unicode cUnknown) pFld->Stop(rOut, *this, cUnknown); if (!Pushed()) aFtn.Stop(rOut, *this, cUnknown); - if (1) + if (true) aChp.Stop(rOut, *this, cUnknown); - if (1) + if (true) aPap.Stop(rOut, *this, cUnknown); if (!Pushed()) aSep.Stop(rOut, *this, cUnknown); @@ -152,9 +152,9 @@ void Ww1Manager::OutStart( Ww1Shell& rOut ) // alle attribute, die's brauchen beginnen if (!Pushed()) aSep.Start(rOut, *this); - if (1) + if (true) aPap.Start(rOut, *this); - if (1) + if (true) aChp.Start(rOut, *this); if (!Pushed()) aFtn.Start(rOut, *this); @@ -167,10 +167,10 @@ void Ww1Manager::OutStart( Ww1Shell& rOut ) if (!Pushed()) if (ulEnd > aSep.Where()) // naechster Sep vorher? ulEnd = aSep.Where(); - if (1) + if (true) if (ulEnd > aPap.Where()) // naechster Pap vorher? ulEnd = aPap.Where(); - if (1) + if (true) if (ulEnd > aChp.Where()) // naechster Chp vorher? ulEnd = aChp.Where(); if (!Pushed()) @@ -455,7 +455,7 @@ static WWDateTime GetTimeDatePara( const OUString& rForm, } sal_Int32 nDPos = 0; - while (1) + while (true) { nDPos = rForm.indexOf('M', nDPos); // M -> Datum if (nDPos == 0 || nDPos == -1) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 92e0881e7989..7c15a2244712 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -646,7 +646,7 @@ void DocxAttributeOutput::EndRun() // Add the fields starts for hyperlinks, TOCs and index marks if ( pIt->bOpen && !pIt->pField ) { - StartField_Impl( *pIt, sal_True ); + StartField_Impl( *pIt, true ); // Remove the field if no end needs to be written if ( !pIt->bClose ) { diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index c0dbac14c88d..30f69ac7cbd1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -668,7 +668,7 @@ private: void WritePostponedVMLDrawing(); void WritePostponedDMLDrawing(); - void StartField_Impl( FieldInfos& rInfos, bool bWriteRun = sal_False ); + void StartField_Impl( FieldInfos& rInfos, bool bWriteRun = false ); void DoWriteCmd( const OUString& rCmd ); void CmdField_Impl( FieldInfos& rInfos ); void EndField_Impl( FieldInfos& rInfos ); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 6de5e07da49f..6760572b4f1e 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -436,7 +436,7 @@ void RtfAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*/ void RtfAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCharSet*/ ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", rText: " << rText); - RawText( rText, 0, m_rExport.eCurrentEncoding ); + RawText( rText, false, m_rExport.eCurrentEncoding ); } OStringBuffer& RtfAttributeOutput::RunText() diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index af06f82c0569..226259a8e598 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -499,7 +499,7 @@ void RtfExport::WritePageDescTable() return; Strm().WriteCharPtr( SAL_NEWLINE_STRING ); - bOutPageDescs = sal_True; + bOutPageDescs = true; Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PGDSCTBL ); for( sal_uInt16 n = 0; n < nSize; ++n ) { @@ -521,7 +521,7 @@ void RtfExport::WritePageDescTable() Strm().WriteCharPtr( msfilter::rtfutil::OutString( rPageDesc.GetName(), eDefaultEncoding).getStr() ).WriteCharPtr( ";}" ); } Strm().WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING ); - bOutPageDescs = sal_False; + bOutPageDescs = false; // reset table infos, otherwise the depth of the cells will be incorrect, // in case the page style (header or footer) had tables diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index d09d9cfd28ce..4e29bddd0a9a 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2082,7 +2082,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ); if ( isDropdownOrCheckbox ) - AppendBookmark( pFieldmark->GetName(), 0 ); + AppendBookmark( pFieldmark->GetName(), false ); OutputField( NULL, lcl_getFieldId( pFieldmark ), lcl_getFieldCode( pFieldmark ), WRITEFIELD_START | WRITEFIELD_CMD_START ); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index ba882ada3bdb..363a4717c452 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -467,13 +467,13 @@ void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap ) // static defaults, that differs between WinWord and SO if( bPap ) { - aFlags[ static_cast< sal_uInt16 >(RES_PARATR_WIDOWS) - RES_CHRATR_BEGIN ] = 1; - aFlags[ static_cast< sal_uInt16 >(RES_PARATR_HYPHENZONE) - RES_CHRATR_BEGIN ] = 1; + aFlags[ static_cast< sal_uInt16 >(RES_PARATR_WIDOWS) - RES_CHRATR_BEGIN ] = true; + aFlags[ static_cast< sal_uInt16 >(RES_PARATR_HYPHENZONE) - RES_CHRATR_BEGIN ] = true; } else { - aFlags[ RES_CHRATR_FONTSIZE - RES_CHRATR_BEGIN ] = 1; - aFlags[ RES_CHRATR_LANGUAGE - RES_CHRATR_BEGIN ] = 1; + aFlags[ RES_CHRATR_FONTSIZE - RES_CHRATR_BEGIN ] = true; + aFlags[ RES_CHRATR_LANGUAGE - RES_CHRATR_BEGIN ] = true; } const SfxItemSet* pOldI = m_rExport.GetCurItemSet(); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index de5c2814cb1f..6c8289885f3c 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -372,11 +372,11 @@ static void WriteDop( WW8Export& rWrt ) if ((rWrt.pSepx && rWrt.pSepx->DocumentIsProtected()) || rDop.lKeyProtDoc != 0) { - rDop.fProtEnabled = 1; + rDop.fProtEnabled = true; } else { - rDop.fProtEnabled = 0; + rDop.fProtEnabled = false; } if (!xDocProps.is()) @@ -3030,7 +3030,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec if ( mpMedium ) { - SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); + SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); if ( pEncryptionDataItem && ( pEncryptionDataItem->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) { OSL_ENSURE( false, "Unexpected EncryptionData!" ); @@ -3040,7 +3040,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec if ( !aEncryptionData.getLength() ) { // try to generate the encryption data based on password - SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False ); + SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false ); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() && pPasswordItem->GetValue().getLength() <= 15 ) { // Generate random number with a seed of time as salt. @@ -3088,7 +3088,7 @@ void WW8Export::ExportDocument_Impl() if( bWrtWW8 ) { - pFib->fWhichTblStm = 1; + pFib->fWhichTblStm = true; xTableStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::a1Table), STREAM_STD_WRITE ); xDataStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::aData), @@ -3211,8 +3211,8 @@ void WW8Export::ExportDocument_Impl() EncryptRC4(aCtx, GetWriter().Strm(), *pStrmTemp); // Write Unencrypted Fib 68 bytes to the start of the workdocument stream - pFib->fEncrypted = 1; // fEncrypted indicates the document is encrypted. - pFib->fObfuscated = 0; // Must be 0 for RC4. + pFib->fEncrypted = true; // fEncrypted indicates the document is encrypted. + pFib->fObfuscated = false; // Must be 0 for RC4. pFib->nHash = 0x34; // encrypt header bytes count of table stream. pFib->nKey = 0; // lkey2 must be 0 for RC4. diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index df9e3808a5c2..bb366dc042d2 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -89,7 +89,7 @@ void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ ) if ( mpParentFrame ) { OutGrf( *mpParentFrame ); - pFib->fHasPic = 1; + pFib->fHasPic = true; } } diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 96b9f63c2a90..5f1f9dc5a8ee 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -5008,7 +5008,7 @@ static void ParaTabStopDelAdd( WW8Export& rWrt, nO++; nN++; } - } while( 1 ); + } while( true ); aTab.PutAll( rWrt ); } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 81a2ec02f12e..78ab20346d1d 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1175,7 +1175,7 @@ bool SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartC long& rEndCp) { bool bErase, bContainsText; - InsertTxbxText( 0,0,nTxBxS,USHRT_MAX,0,0,0, bErase, &bContainsText, + InsertTxbxText( 0,0,nTxBxS,USHRT_MAX,0,0,false, bErase, &bContainsText, &rStartCp, &rEndCp ); return bContainsText; } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index e56207f52789..4504278ac189 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5421,7 +5421,7 @@ namespace uno::Sequence< beans::NamedValue > InitXorWord95Codec( ::msfilter::MSCodec_XorWord95& rCodec, SfxMedium& rMedium, WW8Fib* pWwFib ) { uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) aEncryptionData.realloc( 0 ); @@ -5480,7 +5480,7 @@ namespace uno::Sequence< beans::NamedValue > InitStd97Codec( ::msfilter::MSCodec_Std97& rCodec, sal_uInt8 pDocId[16], SfxMedium& rMedium ) { uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) aEncryptionData.realloc( 0 ); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index bd44accf1677..f007d9649267 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1650,11 +1650,11 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, SwWW8ImplReader* pIo) bGrafApo = true; // nein -> 1-zeiliger APO // -> Grafik-APO } - while( 0 ); // Block zum rausspringen + while( false ); // Block zum rausspringen pPlcxMan->GetPap()->Restore( aSave ); pIoStrm->Seek( nPos ); - }while( 0 ); // Block zum rausspringen + }while( false ); // Block zum rausspringen } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 922aa0d4a116..324483d78d5f 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1511,7 +1511,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) if (!checkSeek(*pStr, nClxPos)) return NULL; - while( 1 ) // Zaehle Zahl der Grpprls + while( true ) // Zaehle Zahl der Grpprls { sal_uInt8 clxt(2); *pStr >> clxt; @@ -1536,7 +1536,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) memset( pPieceGrpprls, 0, ( nGrpprl + 1 ) * sizeof(sal_uInt8 *) ); nPieceGrpprls = nGrpprl; sal_Int16 nAktGrpprl = 0; // read Grpprls - while( 1 ) + while( true ) { sal_uInt8 clxt(2); *pStr >> clxt; @@ -1819,7 +1819,7 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) void* pData; sal_uLong nOldIdx = rPLCF.GetIdx(); - rF.nLen = rF.nId = rF.nOpt = rF.bCodeNest = rF.bResNest = 0; + rF.nLen = rF.nId = rF.nOpt = rF.bCodeNest = rF.bResNest = false; if( !rPLCF.Get( rF.nSCode, pData ) ) // end of PLCFspecial? goto Err; @@ -2196,7 +2196,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN) pPLCF_PosArray[nIMax] = nFc; // end of the last Fkp failure = rSt.GetError(); - } while(0); + } while(false); } if (!failure) @@ -3049,7 +3049,7 @@ bool WW8PLCFx_Fc_FKP::HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rR OSL_FAIL( "+Motz: HasSprm: NewFkp needed ( no const possible )" ); // happens in BugDoc 31722 if( !NewFkp() ) - return 0; + return false; } pFkp->HasSprm(nId, rResult); @@ -3469,7 +3469,7 @@ bool WW8PLCFx_SEPX::Find4Sprms(sal_uInt16 nId1,sal_uInt16 nId2,sal_uInt16 nId3,s sal_uInt8*& p1, sal_uInt8*& p2, sal_uInt8*& p3, sal_uInt8*& p4) const { if( !pPLCF ) - return 0; + return false; bool bFound = false; p1 = 0; @@ -5965,7 +5965,7 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) if( 20 < nRead ) rSt.SeekRel( nRead-20 ); } - while( 0 ); // Trick: obiger Block wird genau einmal durchlaufen + while( false ); // Trick: obiger Block wird genau einmal durchlaufen // und kann vorzeitig per "break" verlassen werden. nRemaining -= cbStshi; @@ -6041,7 +6041,7 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd ) if( 10 < nRead ) rSt.SeekRel( nRead-10 ); } - while( 0 ); // Trick: obiger Block wird genau einmal durchlaufen + while( false ); // Trick: obiger Block wird genau einmal durchlaufen // und kann vorzeitig per "break" verlassen werden. if( (0 != rSt.GetError()) || !nRead ) @@ -6649,7 +6649,7 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) //#i22436#, for all WW7- documents if (nFib <= 104) // Word 95 - fUsePrinterMetrics = 1; + fUsePrinterMetrics = true; /* bei nFib > 105 gehts weiter: @@ -6740,26 +6740,26 @@ WW8Dop::WW8Dop() : bUseThaiLineBreakingRules(false) // first set everything to a default of 0 memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); - fWidowControl = 1; + fWidowControl = true; fpc = 1; nFtn = 1; - fOutlineDirtySave = 1; - fHyphCapitals = 1; - fBackup = 1; - fPagHidden = 1; - fPagResults = 1; - fDfltTrueType = 1; + fOutlineDirtySave = true; + fHyphCapitals = true; + fBackup = true; + fPagHidden = true; + fPagResults = true; + fDfltTrueType = true; /* Writer acts like this all the time at the moment, ideally we need an option for these two as well to import word docs that are not like this by default */ - fNoLeading = 1; - fUsePrinterMetrics = 1; + fNoLeading = true; + fUsePrinterMetrics = true; - fRMView = 1; - fRMPrint = 1; + fRMView = true; + fRMPrint = true; dxaTab = 0x2d0; dxaHotZ = 0x168; nRevision = 1; @@ -6767,15 +6767,15 @@ WW8Dop::WW8Dop() : bUseThaiLineBreakingRules(false) epc = 3; nfcEdnRef = 2; - fShadeFormData = 1; + fShadeFormData = true; wvkSaved = 2; wScaleSaved = 100; zkSaved = 0; lvl = 9; - fIncludeHeader = 1; - fIncludeFooter = 1; + fIncludeHeader = true; + fIncludeFooter = true; cChWS = /**!!**/ 0; cChWSFtnEdn = /**!!**/ 0; diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 54052c835c98..f7ab28263365 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -92,8 +92,8 @@ static void lcl_EnsureValidPam( SwPaM& rPam ) // else: point was already valid // if mark is invalid, we delete it - if( ( rPam.GetCntntNode( sal_False ) == NULL ) || - ( rPam.GetCntntNode( sal_False ) != rPam.GetMark()->nContent.GetIdxReg() ) ) + if( ( rPam.GetCntntNode( false ) == NULL ) || + ( rPam.GetCntntNode( false ) != rPam.GetMark()->nContent.GetIdxReg() ) ) { rPam.DeleteMark(); } @@ -956,7 +956,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c } // Fix #i58251#: Unfortunately is the static default different to SO7 behaviour, // so we have to set a dynamic default after importing SO7 - rDoc.SetDefault( SfxBoolItem( RES_ROW_SPLIT, sal_False ) ); + rDoc.SetDefault( SfxBoolItem( RES_ROW_SPLIT, false ) ); } rDoc.PropagateOutlineRule(); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index ace6e2ba3c93..f1a999f5054d 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -764,26 +764,26 @@ void SwXMLImport::endDocument( void ) #if OSL_DEBUG_LEVEL > 0 // !!! This should be impossible !!!! OSL_ENSURE( pSttNdIdx->GetIndex()+1 != - pPaM->GetBound( sal_True ).nNode.GetIndex(), + pPaM->GetBound( true ).nNode.GetIndex(), "PaM.Bound1 point to new node " ); OSL_ENSURE( pSttNdIdx->GetIndex()+1 != - pPaM->GetBound( sal_False ).nNode.GetIndex(), + pPaM->GetBound( false ).nNode.GetIndex(), "PaM.Bound2 points to new node" ); if( pSttNdIdx->GetIndex()+1 == - pPaM->GetBound( sal_True ).nNode.GetIndex() ) + pPaM->GetBound( true ).nNode.GetIndex() ) { const sal_Int32 nCntPos = - pPaM->GetBound( sal_True ).nContent.GetIndex(); - pPaM->GetBound( sal_True ).nContent.Assign( pTxtNode, + pPaM->GetBound( true ).nContent.GetIndex(); + pPaM->GetBound( true ).nContent.Assign( pTxtNode, pTxtNode->GetTxt().getLength() + nCntPos ); } if( pSttNdIdx->GetIndex()+1 == - pPaM->GetBound( sal_False ).nNode.GetIndex() ) + pPaM->GetBound( false ).nNode.GetIndex() ) { const sal_Int32 nCntPos = - pPaM->GetBound( sal_False ).nContent.GetIndex(); - pPaM->GetBound( sal_False ).nContent.Assign( pTxtNode, + pPaM->GetBound( false ).nContent.GetIndex(); + pPaM->GetBound( false ).nContent.Assign( pTxtNode, pTxtNode->GetTxt().getLength() + nCntPos ); } #endif @@ -821,8 +821,8 @@ void SwXMLImport::endDocument( void ) if( pCNd && pCNd->StartOfSectionIndex()+2 < pCNd->EndOfSectionIndex() ) { - pPaM->GetBound(sal_True).nContent.Assign( 0, 0 ); - pPaM->GetBound(sal_False).nContent.Assign( 0, 0 ); + pPaM->GetBound(true).nContent.Assign( 0, 0 ); + pPaM->GetBound(false).nContent.Assign( 0, 0 ); pDoc->GetNodes().Delete( pPaM->GetPoint()->nNode ); } } diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index edd06c1da78c..9f6935cc7faa 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -631,13 +631,13 @@ bool SvXMLImportItemMapper::PutXMLValue( if( IsXMLToken( rValue, XML_ALWAYS ) || IsXMLToken( rValue, XML_TRUE ) ) { - pFmtKeep->SetValue( sal_True ); + pFmtKeep->SetValue( true ); bOk = true; } else if( IsXMLToken( rValue, XML_AUTO ) || IsXMLToken( rValue, XML_FALSE ) ) { - pFmtKeep->SetValue( sal_False ); + pFmtKeep->SetValue( false ); bOk = true; } } @@ -811,13 +811,13 @@ bool SvXMLImportItemMapper::PutXMLValue( if( IsXMLToken( rValue, XML_AUTO ) || IsXMLToken( rValue, XML_TRUE ) ) { - pSplit->SetValue( sal_True ); + pSplit->SetValue( true ); bOk = true; } else if( IsXMLToken( rValue, XML_ALWAYS ) || IsXMLToken( rValue, XML_FALSE ) ) { - pSplit->SetValue( sal_False ); + pSplit->SetValue( false ); bOk = true; } } @@ -965,12 +965,12 @@ bool SvXMLImportItemMapper::PutXMLValue( if( IsXMLToken( rValue, XML_COLLAPSING ) ) { - pBorders->SetValue( sal_True ); + pBorders->SetValue( true ); bOk = true; } else if( IsXMLToken( rValue, XML_SEPARATING ) ) { - pBorders->SetValue( sal_False ); + pBorders->SetValue( false ); bOk = true; } else diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 4077b8898a3f..6ebfa5c36e4b 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1669,7 +1669,7 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, { for( i=GetColumnCount(); i<nColsReq; i++ ) { - aColumnWidths.push_back( ColumnWidthInfo(MINLAY, sal_True) ); + aColumnWidths.push_back( ColumnWidthInfo(MINLAY, true) ); } // adjust columns in *all* rows, if columns must be inserted for( i=0; i<pRows->size(); i++ ) @@ -1727,7 +1727,7 @@ void SwXMLTableContext::InsertRow( const OUString& rStyleName, // Make sure there is at least one column. if( 0==nCurRow && 0UL == GetColumnCount() ) - InsertColumn( USHRT_MAX, sal_True ); + InsertColumn( USHRT_MAX, true ); if( nCurRow < pRows->size() ) { diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index ecd7e2abe872..8d3842a3721e 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -207,7 +207,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) boost::scoped_ptr<SfxAbstractTabDialog> pDlg; short nMode = ENV_INSERT; - SFX_REQUEST_ARG( rReq, pItem, SwEnvItem, FN_ENVELOP, sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SwEnvItem, FN_ENVELOP, false ); if ( !pItem ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); @@ -219,7 +219,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) } else { - SFX_REQUEST_ARG( rReq, pBoolItem, SfxBoolItem, FN_PARAM_1, sal_False ); + SFX_REQUEST_ARG( rReq, pBoolItem, SfxBoolItem, FN_PARAM_1, false ); if ( pBoolItem && pBoolItem->GetValue() ) nMode = ENV_NEWDOC; } @@ -488,7 +488,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) { rReq.AppendItem( rItem ); if ( nMode == ENV_NEWDOC ) - rReq.AppendItem( SfxBoolItem( FN_PARAM_1, sal_True ) ); + rReq.AppendItem( SfxBoolItem( FN_PARAM_1, true ) ); } rReq.Done(); diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 8582adb97e48..42ef39bc6f8a 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -188,7 +188,7 @@ static SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL) { SfxStringItem aURL(SID_FILE_NAME, rURL); SfxStringItem aTargetFrameName( SID_TARGETNAME, OUString("_blank") ); - SfxBoolItem aHidden( SID_HIDDEN, sal_True ); + SfxBoolItem aHidden( SID_HIDDEN, true ); SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle()); SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_SYNCHRON, @@ -661,7 +661,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pTemplateItem, SfxBoolItem, - SID_TEMPLATE, sal_False); + SID_TEMPLATE, false); if (pTemplateItem && pTemplateItem->GetValue()) { pDocSh->GetDoc()->SetFixFields(false, 0); @@ -671,7 +671,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // Update all FIX-Date/Time fields if( pWrtSh ) { - SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); + SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); bool bUpdateFields = true; if( pUpdateDocItem && pUpdateDocItem->GetValue() == document::UpdateDocMode::NO_UPDATE) bUpdateFields = false; diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 4ce4aac1f32d..b36107af9784 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -170,7 +170,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) pRet->Put(SwPtrItem(FN_PARAM_STDFONTS, GetStdFontConfig())); if( PTR_CAST( SwPagePreview, SfxViewShell::Current())!=0) { - SfxBoolItem aBool(SfxBoolItem(SID_PRINTPREVIEW, sal_True)); + SfxBoolItem aBool(SfxBoolItem(SID_PRINTPREVIEW, true)); pRet->Put(aBool); } @@ -466,7 +466,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI if ( fnCreatePage ) pRet = (*fnCreatePage)( pParent, rSet ); } - aSet.Put (SfxBoolItem(SID_FAX_LIST, sal_True)); + aSet.Put (SfxBoolItem(SID_FAX_LIST, true)); pRet->PageCreated(aSet); } break; diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 58bec90eaeef..791287d1c9e0 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -207,7 +207,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, } // #i30171# set the UpdateDocMode at the SwDocShell - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; if (!pFlt->GetDefaultTemplate().isEmpty()) @@ -350,7 +350,7 @@ sal_Bool SwDocShell::Save() { if( SvtFilterOptions::Get().IsLoadWordBasicStorage() ) nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) (*this) ); - pDoc->SetContainsMSVBasic( sal_False ); + pDoc->SetContainsMSVBasic( false ); } // End TableBox Edit! @@ -382,7 +382,7 @@ sal_Bool SwDocShell::Save() SfxViewFrame* pFrm = pWrtShell ? pWrtShell->GetView().GetViewFrame() : 0; if( pFrm ) { - pFrm->GetBindings().SetState(SfxBoolItem(SID_DOC_MODIFIED, sal_False)); + pFrm->GetBindings().SetState(SfxBoolItem(SID_DOC_MODIFIED, false)); } return !IsError( nErr ); } @@ -462,7 +462,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) { if( SvtFilterOptions::Get().IsLoadWordBasicStorage() ) nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) *this ); - pDoc->SetContainsMSVBasic( sal_False ); + pDoc->SetContainsMSVBasic( false ); } // End TableBox Edit! @@ -558,13 +558,13 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) if ( bSave ) { - SvStorageRef xStg = new SotStorage( rMedium.GetOutStream(), sal_False ); + SvStorageRef xStg = new SotStorage( rMedium.GetOutStream(), false ); OSL_ENSURE( !xStg->GetError(), "No storage available for storing VBA macros!" ); if ( !xStg->GetError() ) { nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, OUString("Macros") ); xStg->Commit(); - pDoc->SetContainsMSVBasic( sal_True ); + pDoc->SetContainsMSVBasic( true ); } } } @@ -964,9 +964,9 @@ void SwDocShell::GetState(SfxItemSet& rSet) rSet.DisableItem( SID_PRINTPREVIEW ); else { - SfxBoolItem aBool( SID_PRINTPREVIEW, sal_False ); + SfxBoolItem aBool( SID_PRINTPREVIEW, false ); if( PTR_CAST( SwPagePreview, SfxViewShell::Current()) ) - aBool.SetValue( sal_True ); + aBool.SetValue( true ); rSet.Put( aBool ); } } @@ -1239,7 +1239,7 @@ bool SwDocShell::getDocReadOnly() const return pDoc->getDocReadOnly(); } - return sal_False; + return false; } static const char* s_EventNames[] = diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index d3282377d30a..23a58a630bc0 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -348,7 +348,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxApplication* pApp = SFX_APP(); SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SFX_CALLMODE_SYNCHRON, pApp->GetPool()); - SfxBoolItem aSwOptions( SID_AUTO_CORRECT_DLG, sal_True ); + SfxBoolItem aSwOptions( SID_AUTO_CORRECT_DLG, true ); aAppReq.AppendItem(aSwOptions); // SMARTTAGS @@ -473,11 +473,11 @@ void SwDocShell::Execute(SfxRequest& rReq) if ( pArgs ) { - SFX_REQUEST_ARG( rReq, pTemplateItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False ); + SFX_REQUEST_ARG( rReq, pTemplateItem, SfxStringItem, SID_TEMPLATE_NAME, false ); if ( pTemplateItem ) { aFileName = pTemplateItem->GetValue(); - SFX_REQUEST_ARG( rReq, pFlagsItem, SfxInt32Item, SID_TEMPLATE_LOAD, sal_False ); + SFX_REQUEST_ARG( rReq, pFlagsItem, SfxInt32Item, SID_TEMPLATE_LOAD, false ); if ( pFlagsItem ) nFlags = (sal_uInt16) pFlagsItem->GetValue(); } @@ -717,7 +717,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pStrm->Seek( STREAM_SEEK_TO_BEGIN ); // Transfer ownership of stream to a lockbytes object - SvLockBytes aLockBytes( pStrm, sal_True ); + SvLockBytes aLockBytes( pStrm, true ); SvLockBytesStat aStat; if ( aLockBytes.Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE ) { @@ -783,7 +783,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pStrm->Seek( STREAM_SEEK_TO_BEGIN ); // Transfer ownership of stream to a lockbytes object - SvLockBytes aLockBytes( pStrm, sal_True ); + SvLockBytes aLockBytes( pStrm, true ); SvLockBytesStat aStat; if ( aLockBytes.Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE ) { @@ -857,7 +857,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, sal_False, &pItem ) ) { aFileName = ((const SfxStringItem*)pItem)->GetValue(); - SFX_ITEMSET_ARG( pArgs, pTemplItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False ); + SFX_ITEMSET_ARG( pArgs, pTemplItem, SfxStringItem, SID_TEMPLATE_NAME, false ); if ( pTemplItem ) aTemplateName = pTemplItem->GetValue(); } diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index d82c6d32f530..c8753479ccf4 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -298,7 +298,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) pDoc->SetDefault( SvxAdjustItem(SVX_ADJUST_RIGHT, RES_PARATR_ADJUST ) ); // #i29550# - pDoc->SetDefault( SfxBoolItem( RES_COLLAPSING_BORDERS, sal_True ) ); + pDoc->SetDefault( SfxBoolItem( RES_COLLAPSING_BORDERS, true ) ); // <-- collapsing //#i16874# AutoKerning as default for new documents @@ -482,7 +482,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium ) mxBasePool = new SwDocStyleSheetPool( *pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() ); if(GetCreateMode() != SFX_CREATE_MODE_ORGANIZER) { - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; } diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 13041dbe6148..0b8a6326efce 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -293,8 +293,8 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) else { // convert internal StyleName to DisplayName (slot implementation uses the latter) - SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_APPLY_STYLE, sal_False ); - SFX_REQUEST_ARG( rReq, pFamilyItem, SfxStringItem, SID_STYLE_FAMILYNAME, sal_False ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_APPLY_STYLE, false ); + SFX_REQUEST_ARG( rReq, pFamilyItem, SfxStringItem, SID_STYLE_FAMILYNAME, false ); if ( pFamilyItem && pNameItem ) { uno::Reference< style::XStyleFamiliesSupplier > xModel(GetModel(), uno::UNO_QUERY); diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index d865d57598fa..1f7f6f3b6a61 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -184,14 +184,14 @@ void SwBreakDlg::CheckEnable() sal_Bool bEnable = sal_True; if ( bHtmlMode ) { - m_pColumnBtn->Enable(sal_False); - m_pPageCollBox->Enable(sal_False); + m_pColumnBtn->Enable(false); + m_pPageCollBox->Enable(false); bEnable = sal_False; } else if(rSh.GetFrmType(0,sal_True) & (FRMTYPE_FLY_ANY | FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FOOTNOTE)) { - m_pPageBtn->Enable(sal_False); + m_pPageBtn->Enable(false); if(m_pPageBtn->IsChecked()) m_pLineBtn->Check(sal_True); bEnable = sal_False; diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index d2b0e210888e..971f63689195 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -231,8 +231,8 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, sal_False, &pItem)) { m_pTextED->SetText(((const SfxStringItem*)pItem)->GetValue()); - m_pTextFT->Enable( sal_False ); - m_pTextED->Enable( sal_False ); + m_pTextFT->Enable( false ); + m_pTextED->Enable( false ); } } diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 0ea2a0468110..5be8280731a1 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -192,7 +192,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { if (!bDrawParaDlg) { - aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True)); + aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,true)); rPage.PageCreated(aSet); } } @@ -203,7 +203,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) if( !(FRMTYPE_BODY & eType) || rSh.GetSelectionType() & nsSelectionType::SEL_TBL ) { - aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_True)); + aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,true)); rPage.PageCreated(aSet); } } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 3f76347d0999..e31dd1c51e1f 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -435,14 +435,14 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& ) } if (m_pProspectCB->IsChecked()) { - m_pProspectCB_RTL->Enable(sal_True); - m_pNoRB->Enable( sal_False ); - m_pOnlyRB->Enable( sal_False ); - m_pEndRB->Enable( sal_False ); - m_pEndPageRB->Enable( sal_False ); + m_pProspectCB_RTL->Enable(true); + m_pNoRB->Enable( false ); + m_pOnlyRB->Enable( false ); + m_pEndRB->Enable( false ); + m_pEndPageRB->Enable( false ); } else - m_pProspectCB_RTL->Enable( sal_False ); + m_pProspectCB_RTL->Enable( false ); } void SwAddPrinterTabPage::Init() @@ -484,8 +484,8 @@ IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, SelectHdl) void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pListItem,SfxBoolItem,SID_FAX_LIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pPreviewItem,SfxBoolItem,SID_PREVIEWFLAG_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pListItem,SfxBoolItem,SID_FAX_LIST,false); + SFX_ITEMSET_ARG (&aSet,pPreviewItem,SfxBoolItem,SID_PREVIEWFLAG_TYPE,false); if (pPreviewItem) { SetPreview(pPreviewItem->GetValue()); @@ -847,7 +847,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) if( nIndexHeight <= 0) nIndexHeight = pFontConfig->GetDefaultHeightFor( FONT_INDEX + nFontGroup * FONT_PER_GROUP, eLanguage); - pDocOnlyCB->Enable(sal_False); + pDocOnlyCB->Enable(false); } else { @@ -1057,7 +1057,7 @@ IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, ComboBox*, pBox ) void SwStdFontTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt16Item, SID_FONTMODE_TYPE, sal_False); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt16Item, SID_FONTMODE_TYPE, false); if (pFlagItem) SetFontMode(sal::static_int_cast< sal_uInt8, sal_uInt16>( pFlagItem->GetValue())); } @@ -1255,7 +1255,7 @@ IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl) void SwTableOptionsTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,sal_False); + SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,false); if (pWrtSh) SetWrtShell(pWrtSh->GetValue()); } @@ -1334,7 +1334,7 @@ SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) { - SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,sal_False); + SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,false); if (pWrtSh) SetWrtShell(pWrtSh->GetValue()); } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 09e2654f7d6a..f91e22d17f3c 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -411,7 +411,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) { OUString sHomePath(SvtPathOptions().GetWorkPath()); utl::TempFile aTempFile(sFind , &sExt, &sHomePath); - aTempFile.EnableKillingFile(sal_True); + aTempFile.EnableKillingFile(true); sTmpName = aTempFile.GetURL(); } xStore->storeAsURL(sTmpName, Sequence< PropertyValue >()); @@ -428,7 +428,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) pUserData->sURL = sURL; m_pCreatedDataSource->SetUserData(pUserData); m_pListLB->Select(m_pCreatedDataSource); - m_pCreateListPB->Enable(sal_False); + m_pCreateListPB->Enable(false); } catch (const Exception&) @@ -520,7 +520,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt pThis->m_aDBData.sDataSource = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1); pThis->m_aDBData.sCommand = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); pThis->m_aDBData.nCommandType = pUserData->nCommandType; - pThis->m_pOK->Enable(sal_True); + pThis->m_pOK->Enable(true); } sTable = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); if(sTable == pThis->m_sConnecting) @@ -627,7 +627,7 @@ void SwAddressListDialog::DetectTablesAndQueries( catch (const Exception&) { OSL_FAIL("exception caught in SwAddressListDialog::DetectTablesAndQueries"); - m_pOK->Enable( sal_False ); + m_pOK->Enable( false ); } } diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 59b4bc201add..cdb0354d8881 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -195,11 +195,11 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData) // Reset the scrollbar's thumb to the top before it is disabled. m_aScrollBar.DoScroll(0); m_aScrollBar.SetThumbPos(0); - m_aScrollBar.Enable(sal_False); + m_aScrollBar.Enable(false); } else { - m_aScrollBar.Enable(sal_True); + m_aScrollBar.Enable(true); m_aScrollBar.SetRange(Range(0, nLines)); m_aScrollBar.SetThumbPos(0); m_aScrollBar.SetVisibleSize(nVisibleLines); @@ -217,7 +217,7 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData) if (m_aEdits.size() < 1) { m_aScrollBar.DoScroll(0); m_aScrollBar.SetThumbPos(0); - m_aScrollBar.Enable(sal_False); + m_aScrollBar.Enable(false); } } @@ -493,7 +493,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, DeleteHdl_Impl) // if only one set is available then clear the data OUString sTemp; m_pCSVData->aDBData[0].assign(m_pCSVData->aDBData[0].size(), sTemp); - m_aDeletePB.Enable(sal_False); + m_aDeletePB.Enable(false); } m_pAddressControl->SetCurrentDataSet(nCurrent); m_aSetNoNF.SetMax(m_pCSVData->aDBData.size()); @@ -738,7 +738,7 @@ IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl) IMPL_LINK_NOARG(SwFindEntryDialog, CloseHdl_Impl) { - Show(sal_False); + Show(false); return 0; } diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index a05ddd5905d1..c78e5c553d4d 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -353,7 +353,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, // when the cursor is inside of a table, table must NEVER be selectable if( pView->GetWrtShell().GetTableFmt() ) { - m_pRbAsTable->Enable( sal_False ); + m_pRbAsTable->Enable( false ); m_pRbAsField->Check( sal_True ); m_pRbDbFmtFromDb->Check( sal_True ); } @@ -361,8 +361,8 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, { m_pRbAsTable->Check( sal_True ); m_pRbDbFmtFromDb->Check( sal_True ); - m_pIbDbcolOneFrom->Enable( sal_False ); - m_pIbDbcolAllFrom->Enable( sal_False ); + m_pIbDbcolOneFrom->Enable( false ); + m_pIbDbcolAllFrom->Enable( false ); } m_pRbAsTable->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl )); @@ -606,9 +606,9 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton ) m_pIbDbcolOneFrom->Enable( bEnableFrom ); m_pIbDbcolAllFrom->Enable( bEnableFrom ); - m_pRbDbFmtFromDb->Enable( sal_False ); - m_pRbDbFmtFromUsr->Enable( sal_False ); - m_pLbDbFmtFromUsr->Enable( sal_False ); + m_pRbDbFmtFromDb->Enable( false ); + m_pRbDbFmtFromUsr->Enable( false ); + m_pLbDbFmtFromUsr->Enable( false ); m_pPbTblFormat->Enable( bEnableFrom ); } @@ -791,9 +791,9 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox ) OUString sTxt( m_pFormatFrame->get_label().copy( 0, nGBFmtLen )); if( aSrch.sColumn.isEmpty() ) { - m_pRbDbFmtFromDb->Enable( sal_False ); - m_pRbDbFmtFromUsr->Enable( sal_False ); - m_pLbDbFmtFromUsr->Enable( sal_False ); + m_pRbDbFmtFromDb->Enable( false ); + m_pRbDbFmtFromUsr->Enable( false ); + m_pLbDbFmtFromUsr->Enable( false ); } else { @@ -1304,7 +1304,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, if(aStandard != aCompare) nValue += (aStandard - aCompare); } - pFld->ChgValue( nValue, sal_True ); + pFld->ChgValue( nValue, true ); } pFld->SetInitialized(); @@ -1752,11 +1752,11 @@ void SwInsertDBColAutoPilot::Load() if( !m_pLbTblDbColumn->GetEntryCount() ) { - m_pIbDbcolAllTo->Enable( sal_False ); - m_pIbDbcolOneTo->Enable( sal_False ); + m_pIbDbcolAllTo->Enable( false ); + m_pIbDbcolOneTo->Enable( false ); } - m_pIbDbcolOneFrom->Enable( sal_True ); - m_pIbDbcolAllFrom->Enable( sal_True ); + m_pIbDbcolOneFrom->Enable( true ); + m_pIbDbcolAllFrom->Enable( true ); } m_pEdDbText->SetText( pNewData->sEdit ); diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 8a2f1117b511..e9e0319e909e 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1257,7 +1257,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs)); } - aPrtMonDlg.Show( sal_False ); + aPrtMonDlg.Show( false ); // save the single output document if(rMergeDescriptor.bCreateSingleFile || bAsSingleFile) @@ -2357,7 +2357,7 @@ OUString SwNewDBMgr::LoadAndRegisterDataSource() OUString sTmpName; { utl::TempFile aTempFile(sNewName , &sOutputExt, &sHomePath); - aTempFile.EnableKillingFile(sal_True); + aTempFile.EnableKillingFile(true); sTmpName = aTempFile.GetURL(); } xStore->storeAsURL(sTmpName, Sequence< PropertyValue >()); diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index c1dc07a8ec5c..8ddda2de4f6a 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -435,7 +435,7 @@ IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton ) { m_pImpl->xMailDispatcher->start(); pButton->SetText(m_sStop); - m_PausedFI.Show(sal_False); + m_PausedFI.Show(false); } } return 0; @@ -443,7 +443,7 @@ IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton ) IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl) { - ModelessDialog::Show( sal_False ); + ModelessDialog::Show( false ); return 0; } @@ -662,7 +662,7 @@ void SwSendMailDialog::UpdateTransferStatus() void SwSendMailDialog::AllMailsSent() { - m_aStopPB.Enable(sal_False); + m_aStopPB.Enable(false); } diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 97200ec5edd7..57d25c07bbca 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -257,7 +257,7 @@ void SwAddressPreview::SetAddress(const OUString& rAddress) { pImpl->aAdresses.clear(); pImpl->aAdresses.push_back(rAddress); - aVScrollBar.Show(sal_False); + aVScrollBar.Show(false); Invalidate(); } diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 575ae3832f2c..d96f6d71d0f4 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -241,7 +241,7 @@ void SwMailMergeWizard::UpdateRoadmap() switch(nPage) { case MM_DOCUMENTSELECTPAGE : - bEnable = sal_True; + bEnable = true; break; case MM_OUTPUTTYPETPAGE : bEnable = bEnableOutputTypePage; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 8705a7eed1a9..4bd2cf53dc4c 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -430,7 +430,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton) } m_aAddressBlocks.realloc(m_aAddressBlocks.getLength() - 1); if(m_aAddressBlocks.getLength() <= 1) - pButton->Enable(sal_False); + pButton->Enable(false); m_pPreview->RemoveSelectedAddress(); } return 0; @@ -744,13 +744,13 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiL m_pFieldCB->InsertEntry(*aIterator); } m_pFieldCB->SetText(sSelect); - m_pFieldCB->Enable(sal_True); - m_pFieldFT->Enable(sal_True); + m_pFieldCB->Enable(true); + m_pFieldFT->Enable(true); } else { - m_pFieldCB->Enable(sal_False); - m_pFieldFT->Enable(sal_False); + m_pFieldCB->Enable(false); + m_pFieldFT->Enable(false); } UpdateImageButtons_Impl(); diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 43ea2e41e986..f869b14bfa5f 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -81,7 +81,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent) m_pRecentDocLB->SelectEntryPos(0); if(!rDocs.getLength()) { - m_pRecentDocRB->Enable(sal_False); + m_pRecentDocRB->Enable(false); } //Temp hack until all pages are converted to .ui and wizard diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index 89fc9df0fede..a54be84ba23e 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -69,7 +69,7 @@ IMPL_LINK_NOARG(SwMailMergeMergePage, FindHdl_Impl) { SvxSearchItem aSearchItem( SID_SEARCH_ITEM ); - SfxBoolItem aQuiet( SID_SEARCH_QUIET, sal_False ); + SfxBoolItem aQuiet( SID_SEARCH_QUIET, false ); aSearchItem.SetSearchString(m_aFindED.GetText()); aSearchItem.SetWordOnly(m_aWholeWordsCB.IsChecked()); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index eb32ac9668ba..66ce675f8b50 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -375,7 +375,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) Control** pControl = aControls; do { - (*pControl)->Show(sal_False); + (*pControl)->Show(false); } while(*(++pControl)); @@ -397,7 +397,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) Control** pSaveMergeControl = aSaveMergedControls; do { - (*pSaveMergeControl)->Show(sal_True); + (*pSaveMergeControl)->Show(true); } while(*(++pSaveMergeControl)); if(!m_aFromRB.IsChecked() && !m_aSaveAsOneRB.IsChecked()) @@ -426,7 +426,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) Control** pPrinterControl = aPrintControls; do { - (*pPrinterControl)->Show(sal_True); + (*pPrinterControl)->Show(true); } while(*(++pPrinterControl)); if(!m_aFromRB.IsChecked()) @@ -456,7 +456,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) Control** pMailControl = aMailControls; do { - (*pMailControl)->Show(sal_True); + (*pMailControl)->Show(true); } while(*(++pMailControl)); @@ -571,9 +571,9 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton) rConfigItem.AddSavedDocument( aURL.GetMainURL(INetURLObject::DECODE_TO_IURI)); - pButton->Enable(sal_False); + pButton->Enable(false); m_pWizard->enableButtons(WZB_FINISH, sal_True); - pButton->Enable(sal_False); + pButton->Enable(false); } } @@ -850,7 +850,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) SfxObjectShell* pObjSh = pTargetView->GetViewFrame()->GetObjectShell(); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), pObjSh)); - SfxBoolItem aMergeSilent(SID_SILENT, sal_False); + SfxBoolItem aMergeSilent(SID_SILENT, false); m_pWizard->enableButtons(WZB_CANCEL, sal_False); uno::Sequence < beans::PropertyValue > aProps( 2 ); diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index 6fa39cfddf36..abd3c50a3297 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -547,8 +547,8 @@ void SwSpellDialogChildWindow::GetFocus() case SHELL_MODE_TABLE_LIST_TEXT: { SwPaM* pCursor = pWrtShell->GetCrsr(); - if(m_pSpellState->m_pPointNode != pCursor->GetNode(sal_True) || - m_pSpellState->m_pMarkNode != pCursor->GetNode(sal_False)|| + if(m_pSpellState->m_pPointNode != pCursor->GetNode(true) || + m_pSpellState->m_pMarkNode != pCursor->GetNode(false)|| m_pSpellState->m_nPointPos != pCursor->GetPoint()->nContent.GetIndex()|| m_pSpellState->m_nMarkPos != pCursor->GetMark()->nContent.GetIndex()) bInvalidate = true; @@ -604,8 +604,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(sal_True); - m_pSpellState->m_pMarkNode = pCursor->GetNode(sal_False); + m_pSpellState->m_pPointNode = pCursor->GetNode(true); + m_pSpellState->m_pMarkNode = pCursor->GetNode(false); m_pSpellState->m_nPointPos = pCursor->GetPoint()->nContent.GetIndex(); m_pSpellState->m_nMarkPos = pCursor->GetMark()->nContent.GetIndex(); @@ -806,7 +806,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh) Point aTmp( 0,0 ); rSh.SelectObj( aTmp, 0, pTextObj ); SdrPageView* pPV = pDrView->GetSdrPageView(); - rView.BeginTextEdit( pTextObj, pPV, &rView.GetEditWin(), sal_False, sal_True ); + rView.BeginTextEdit( pTextObj, pPV, &rView.GetEditWin(), false, true ); rView.AttrChangedNotify(&rSh); bNextDoc = true; } diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 9f015c0f65db..bb133daaa07c 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -64,9 +64,9 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) SwFEShell* pFEShell = pDocShell->GetFEShell(); if(!pFEShell) { - m_pUpdatePB->Show(sal_False); - m_pLineLbl->Show(sal_False); - m_pLineNo->Show(sal_False); + m_pUpdatePB->Show(false); + m_pLineLbl->Show(false); + m_pLineNo->Show(false); } } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 5cff3e04baf5..82b7a102f4e6 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -617,7 +617,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) { OUString sTemp(rData.GetCondition()); if(sCondition != sTemp) - bConditionValid = sal_False; + bConditionValid = false; bHiddenValid = (bHidden == rData.IsHidden()); bProtectValid = (bProtect == rData.IsProtectFlag()); // edit in readonly sections @@ -671,7 +671,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) } else if (pEntry ) { - m_pCurName->Enable(sal_True); + m_pCurName->Enable(true); m_pOptionsPB->Enable(true); SectRepr* pRepr=(SectRepr*) pEntry->GetUserData(); SwSectionData const& rData( pRepr->GetSectionData() ); @@ -737,7 +737,7 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) m_pPasswdCB->Enable(false); m_pConditionFT->Enable(false); m_pConditionED->Enable(false); - m_pFileCB->Enable(sal_False); + m_pFileCB->Enable(false); m_pDDEFrame->Enable(false); m_pDDECB->Enable(false); m_pCurName->Enable(false); @@ -953,7 +953,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) { m_pConditionFT->Enable(false); m_pConditionED->Enable(false); - m_pDismiss-> Enable(sal_False); + m_pDismiss-> Enable(false); m_pCurName->Enable(false); m_pProtectCB->Enable(false); m_pPasswdCB->Enable(false); @@ -995,7 +995,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) pBox->Check( sal_False ); } if( bFile ) - pSectRepr->SetContent(sal_False); + pSectRepr->SetContent(false); else { pSectRepr->SetFile(aEmptyOUStr); @@ -2009,21 +2009,21 @@ void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn, switch( eState ) { case FTNEND_ATPGORDOCEND: - pNtNumCB->Enable( sal_False ); + pNtNumCB->Enable( false ); // no break; case FTNEND_ATTXTEND: - pNtNumFmtCB->Enable( sal_False ); - pOffsetFld->Enable( sal_False ); - pOffsetTxt->Enable( sal_False ); + pNtNumFmtCB->Enable( false ); + pOffsetFld->Enable( false ); + pOffsetTxt->Enable( false ); // no break; case FTNEND_ATTXTEND_OWNNUMSEQ: - pNumViewBox->Enable( sal_False ); - pPrefixFT->Enable( sal_False ); - pPrefixED->Enable( sal_False ); - pSuffixFT->Enable( sal_False ); - pSuffixED->Enable( sal_False ); + pNumViewBox->Enable( false ); + pPrefixFT->Enable( false ); + pPrefixED->Enable( false ); + pSuffixFT->Enable( false ); + pSuffixED->Enable( false ); // no break; } } diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 6960868b6fad..f4e82f11870b 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -1975,7 +1975,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, if( aURL.GetURL() != aINetImg.GetTargetURL() || aURL.GetTargetFrameName() != aINetImg.GetTargetFrame() ) { - aURL.SetURL( aINetImg.GetTargetURL(), sal_False ); + aURL.SetURL( aINetImg.GetTargetURL(), false ); aURL.SetTargetFrameName( aINetImg.GetTargetFrame() ); aSet.Put( aURL ); rSh.SetFlyFrmAttr( aSet ); @@ -2334,7 +2334,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); rSh.GetFlyFrmAttr( aSet ); SwFmtURL aURL( (SwFmtURL&)aSet.Get( RES_URL ) ); - aURL.SetURL( aBkmk.GetURL(), sal_False ); + aURL.SetURL( aBkmk.GetURL(), false ); aSet.Put( aURL ); rSh.SetFlyFrmAttr( aSet ); } @@ -2442,7 +2442,7 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData, SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); rSh.GetFlyFrmAttr( aSet ); SwFmtURL aURL2( (SwFmtURL&)aSet.Get( RES_URL ) ); - aURL2.SetURL( sFile, sal_False ); + aURL2.SetURL( sFile, false ); if( aURL2.GetName().isEmpty() ) aURL2.SetName( sFile ); aSet.Put( aURL2 ); @@ -2531,7 +2531,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData, SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); rSh.GetFlyFrmAttr( aSet ); SwFmtURL aURL2( (SwFmtURL&)aSet.Get( RES_URL ) ); - aURL2.SetURL( sFile, sal_False ); + aURL2.SetURL( sFile, false ); if( aURL2.GetName().isEmpty() ) aURL2.SetName( sFile ); aSet.Put( aURL2 ); @@ -3249,7 +3249,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); rSh.GetFlyFrmAttr( aSet ); SwFmtURL aURL( (SwFmtURL&)aSet.Get( RES_URL ) ); - aURL.SetURL( aTmp.GetURL(), sal_False ); + aURL.SetURL( aTmp.GetURL(), false ); aSet.Put( aURL ); rSh.SetFlyFrmAttr( aSet ); return true; diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index 3d77938d88d8..dd3bdf287812 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -73,7 +73,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) SwWrtShell &rSh = m_rView.GetWrtShell(); if( rSh.GetDrawView() ) { - CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, sal_True ); + CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, true ); if( rSh.GetDrawView()->Command( aDragEvent, this ) ) { m_rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False); diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 99ea70356bcc..039d7f8c95f7 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -1280,7 +1280,7 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir ) // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); + ((SdrDragStat&)rDragStat).SetNoSnap(true); if(bWasSnapEnabled) pSdrView->SetSnapEnabled(sal_False); @@ -1785,7 +1785,7 @@ KEYINPUT_CHECKTABLE: KEYINPUT_CHECKTABLE_INSDEL: if( rSh.IsTableMode() || !rSh.GetTableFmt() || !m_bTblInsDelMode || - sal_False /* table protected */ + false /* table protected */ ) { const int nSelectionType = rSh.GetSelectionType(); @@ -3342,7 +3342,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { // if it's a Readonly region, status has to be enabled sal_uInt16 nSlot = TYP_POSTITFLD == nTypeId ? FN_POSTIT : FN_JAVAEDIT; - SfxBoolItem aItem(nSlot, sal_True); + SfxBoolItem aItem(nSlot, true); pVFrame->GetBindings().SetState(aItem); pVFrame->GetBindings().Execute(nSlot); break; @@ -3923,7 +3923,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) EnterArea(); if ( m_rView.GetDrawFuncPtr() ) { - pSdrView->SetOrtho(sal_False); + pSdrView->SetOrtho(false); m_rView.GetDrawFuncPtr()->MouseMove( rMEvt ); } m_bIsInMove = sal_True; @@ -4014,12 +4014,12 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) if ( rMEvt.IsShift() ) { - pSdrView->SetOrtho(sal_True); + pSdrView->SetOrtho(true); pSdrView->SetAngleSnapEnabled(sal_True); } else { - pSdrView->SetOrtho(sal_False); + pSdrView->SetOrtho(false); pSdrView->SetAngleSnapEnabled(sal_False); } @@ -4046,9 +4046,9 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) if ( pSdrView ) { if ( rMEvt.IsShift() ) - pSdrView->SetOrtho(sal_True); + pSdrView->SetOrtho(true); else - pSdrView->SetOrtho(sal_False); + pSdrView->SetOrtho(false); } if ( !bInsWin ) { @@ -4214,7 +4214,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) SdrView *pSdrView = rSh.GetDrawView(); if ( pSdrView ) { - pSdrView->SetOrtho(sal_False); + pSdrView->SetOrtho(false); if ( pSdrView->MouseButtonUp( rMEvt,this ) ) { @@ -5352,7 +5352,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) rSh.GetCrsr()->GetPoint()->nContent = nPosIdx; rSh.GetCrsr()->GetMark()->nNode = nPosNodeIdx; rSh.GetCrsr()->GetMark()->nContent = - rSh.GetCrsr()->GetCntntNode( sal_True )->Len(); + rSh.GetCrsr()->GetCntntNode( true )->Len(); } else if( nPosNodeIdx == nMarkNodeIdx ) { @@ -5367,7 +5367,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) rSh.GetCrsr()->GetMark()->nContent = nMarkIdx; rSh.GetCrsr()->GetPoint()->nNode = nMarkNodeIdx; rSh.GetCrsr()->GetPoint()->nContent = - rSh.GetCrsr()->GetCntntNode( sal_False )->Len(); + rSh.GetCrsr()->GetCntntNode( false )->Len(); } rSh.EndCrsrMove( sal_True ); @@ -5650,7 +5650,7 @@ static SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType ) // determine Shell SfxShell* pShell; SfxDispatcher* pDispatcher = rView.GetViewFrame()->GetDispatcher(); - for(sal_uInt16 i = 0; sal_True; ++i ) + for(sal_uInt16 i = 0; true; ++i ) { pShell = pDispatcher->GetShell( i ); if( !pShell || pShell->IsA( nType ) ) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index d90d95325bc7..b75d39a9f429 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -215,7 +215,7 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit ) if (pEdit == m_pSizeWidthField || pEdit == m_pSizeHeightField) { Paper ePaper = SvxPaperInfo::GetSvxPaper( - Size(lHeight, lWidth), MAP_TWIP, sal_True); + Size(lHeight, lWidth), MAP_TWIP, true); for (sal_uInt16 i = 0; i < (sal_uInt16)aIDs.size(); i++) if (aIDs[i] == (sal_uInt16)ePaper) m_pSizeFormatBox->SelectEntryPos(i); @@ -506,7 +506,7 @@ void SwEnvFmtPage::Reset(const SfxItemSet& rSet) Paper ePaper = SvxPaperInfo::GetSvxPaper( Size( std::min(rItem.lWidth, rItem.lHeight), - std::max(rItem.lWidth, rItem.lHeight)), MAP_TWIP, sal_True); + std::max(rItem.lWidth, rItem.lHeight)), MAP_TWIP, true); for (sal_uInt16 i = 0; i < (sal_uInt16) aIDs.size(); i++) if (aIDs[i] == (sal_uInt16)ePaper) m_pSizeFormatBox->SelectEntryPos(i); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 52e142c0673c..4b3e052d89f5 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -197,18 +197,18 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, m_aDialogSize( GetSizePixel() ) { FreeResource(); - aSingleJobsCB.Show(sal_False); // not supported in since cws printerpullpages anymore + aSingleJobsCB.Show(false); // not supported in since cws printerpullpages anymore //task #97066# mailing of form letters is currently not supported - aMailingRB.Show(sal_False); - aSubjectFT.Show(sal_False); - aSubjectED.Show(sal_False); - aFormatFT.Show(sal_False); - aFormatSwCB.Show(sal_False); - aFormatHtmlCB.Show(sal_False); - aFormatRtfCB.Show(sal_False); - aAttachFT.Show(sal_False); - aAttachED.Show(sal_False); - aAttachPB.Show(sal_False); + aMailingRB.Show(false); + aSubjectFT.Show(false); + aSubjectED.Show(false); + aFormatFT.Show(false); + aFormatSwCB.Show(false); + aFormatHtmlCB.Show(false); + aFormatRtfCB.Show(false); + aAttachFT.Show(false); + aAttachED.Show(false); + aAttachPB.Show(false); Point aMailPos = aMailingRB.GetPosPixel(); Point aFilePos = aFileRB.GetPosPixel(); @@ -220,7 +220,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, m_aSelection = *pSelection; //move all controls long nDiff = aRecordFL.GetPosPixel().Y() - pBeamerWin->GetPosPixel().Y(); - pBeamerWin->Show(sal_False); + pBeamerWin->Show(false); ::Size aSize = GetSizePixel(); aSize.Height() -= nDiff; SetSizePixel(aSize); @@ -396,7 +396,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, else { aAllRB.Check(); - aMarkedRB.Enable(sal_False); + aMarkedRB.Enable(false); } SetMinOutputSizePixel(m_aDialogSize); try diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index cc7c14d67810..53ac270281f5 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -80,7 +80,7 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pParent, const SfxItemSet& rCoreSet) //enable 'active' language selection m_pFormatLB->SetShowLanguageControl(sal_True); - SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, sal_False ); + SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, false ); if ( pItem ) pItem->GetValue() >>= xCustomPropertySet; } @@ -242,7 +242,7 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl) if (!m_pSelectionLB->GetEntryCount()) { m_pFormatLB->Clear(); - m_pFormat->Enable(sal_False); + m_pFormat->Enable(false); if( nSubType == DI_CUSTOM ) { //find out which type the custom field has - for a start set to DATE format diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 430f9cbe4a97..42f3fc5552e8 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -240,7 +240,7 @@ IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl) m_pEditED->SetReadOnly( !bEnable); m_pTypeED->SetReadOnly( !bEnable); if( m_pUrlPB->IsEnabled() && !bEnable ) - m_pUrlPB->Enable( sal_False ); + m_pUrlPB->Enable( false ); } return 0; } diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 701fe1d55a82..3e04c0855a7a 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -428,7 +428,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } else if (nId == m_nAlignId) { - aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True)); + aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,true)); rPage.PageCreated(aSet); } else if (nId == m_nTypeId) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 7ed1227b9293..25b272819bb5 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -209,7 +209,7 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) pOK->SetClickHdl(LINK(this, SwColumnDlg, OkHdl)); //#i80458# if no columns can be set then disable OK if( !m_pApplyToLB->GetEntryCount() ) - pOK->Enable( sal_False ); + pOK->Enable( false ); //#i97810# set focus to the TabPage pTabPage->ActivateColumnControl(); pTabPage->Show(); @@ -594,7 +594,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) if(nHtmlMode & HTMLMODE_ON) { bHtmlMode = sal_True; - m_pAutoWidthBox->Enable(sal_False); + m_pAutoWidthBox->Enable(false); } FieldUnit aMetric = ::GetDfltMetric(bHtmlMode); aEd1.SetMetric(aMetric); @@ -880,7 +880,7 @@ void SwColumnPage::UpdateCols() const sal_Bool bEdit = !m_pAutoWidthBox->IsChecked(); if ( nCols > nVisCols ) { - bEnableBtns = sal_True && !bHtmlMode; + bEnableBtns = true && !bHtmlMode; bEnable12 = bEnable3 = bEdit; } else if( bEdit ) diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index c6ea424b0107..e6ef0660b442 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -87,7 +87,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : m_sNone( SW_RESSTR(SW_STR_NONE) ), rView( rV ), pMgr( new SwFldMgr(rView.GetWrtShellPtr()) ), - bCopyAttributes( sal_False ), + bCopyAttributes( false ), bOrderNumberingFirst( SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst() ) { get(m_pTextEdit, "caption_edit"); @@ -146,7 +146,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : { nPoolId = RES_POOLCOLL_LABEL_ABB; sString = ::GetOldGrfCat(); - bCopyAttributes = sal_True; + bCopyAttributes = true; sObjectName = rSh.GetFlyName(); //if not OLE if(!xNameAccess.is()) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 63c489b9f5b3..1559dda1a225 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -884,7 +884,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) { // at formats no anchor editing m_pAnchorFrame->Enable(false); - m_pFixedRatioCB->Enable(sal_False); + m_pFixedRatioCB->Enable(false); } else { @@ -977,13 +977,13 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) if(bHtmlMode) { - m_pAutoHeightCB->Enable(sal_False); - m_pAutoWidthCB->Enable(sal_False); - m_pMirrorPagesCB->Show(sal_False); + m_pAutoHeightCB->Enable(false); + m_pAutoWidthCB->Enable(false); + m_pMirrorPagesCB->Show(false); if (sDlgType == "FrameDialog") - m_pFixedRatioCB->Enable(sal_False); + m_pFixedRatioCB->Enable(false); // i#18732 hide checkbox in HTML mode - m_pFollowTextFlowCB->Show(sal_False); + m_pFollowTextFlowCB->Show(false); } else { @@ -1005,11 +1005,11 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) bNoModifyHdl = sal_False; //lock PercentFields - m_aWidthED.LockAutoCalculation(sal_True); - m_aHeightED.LockAutoCalculation(sal_True); + m_aWidthED.LockAutoCalculation(true); + m_aHeightED.LockAutoCalculation(true); RangeModifyHdl(&m_aWidthED); // set all maximum values initially - m_aHeightED.LockAutoCalculation(sal_False); - m_aWidthED.LockAutoCalculation(sal_False); + m_aHeightED.LockAutoCalculation(false); + m_aWidthED.LockAutoCalculation(false); m_pAutoHeightCB->SaveValue(); m_pAutoWidthCB->SaveValue(); @@ -1677,11 +1677,11 @@ void SwFrmPage::ActivatePage(const SfxItemSet& rSet) Init(rSet); bNoModifyHdl = sal_False; //lock PercentFields - m_aWidthED.LockAutoCalculation(sal_True); - m_aHeightED.LockAutoCalculation(sal_True); + m_aWidthED.LockAutoCalculation(true); + m_aHeightED.LockAutoCalculation(true); RangeModifyHdl(&m_aWidthED); // set all maximum values initially - m_aHeightED.LockAutoCalculation(sal_False); - m_aWidthED.LockAutoCalculation(sal_False); + m_aHeightED.LockAutoCalculation(false); + m_aWidthED.LockAutoCalculation(false); m_pFollowTextFlowCB->SaveValue(); } @@ -2218,7 +2218,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset) SwWrtShell* pSh = getFrmDlgParentShell(); const SwFrmFmt* pFmt = pSh->GetFlyFrmFmt(); if( pFmt && pFmt->GetChain().GetNext() ) - m_pAutoHeightCB->Enable( sal_False ); + m_pAutoHeightCB->Enable( false ); } } else @@ -2549,9 +2549,9 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) //another type of graphic that cannot be mirrored. m_pMirrorVertBox->Check(sal_False); m_pMirrorHorzBox->Check(sal_False); - m_pAllPagesRB->Enable(sal_False); - m_pLeftPagesRB->Enable(sal_False); - m_pRightPagesRB->Enable(sal_False); + m_pAllPagesRB->Enable(false); + m_pLeftPagesRB->Enable(false); + m_pRightPagesRB->Enable(false); m_pBmpWin->MirrorHorz(sal_False); m_pBmpWin->MirrorVert(sal_False); @@ -2740,7 +2740,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet ) pFrameCB->SaveValue(); } else - pClientCB->Enable( sal_False ); + pClientCB->Enable( false ); pServerCB->SaveValue(); pClientCB->SaveValue(); @@ -2904,10 +2904,10 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) } else { - pNameED->Enable( sal_False ); - pAltNameED->Enable(sal_False); - pNameFT->Enable( sal_False ); - pAltNameFT->Enable(sal_False); + pNameED->Enable( false ); + pAltNameED->Enable(false); + pNameFT->Enable( false ); + pAltNameFT->Enable(false); } if (sDlgType == "FrameDialog" && pAltNameFT->IsVisible()) { diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 98f0799eb360..89939caf7a0a 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -188,7 +188,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) } else { - m_pWrapAnchorOnlyCB->Enable( sal_False ); + m_pWrapAnchorOnlyCB->Enable( false ); } sal_Bool bContour = rSurround.IsContour(); @@ -282,7 +282,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) { const SvxOpaqueItem& rOpaque = (const SvxOpaqueItem&)GetItemSet().Get(RES_OPAQUE); aOp = rOpaque; - aOp.SetValue(sal_True); + aOp.SetValue(true); } if (m_pNoWrapRB->IsChecked()) @@ -297,7 +297,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) { aSur.SetSurround(SURROUND_THROUGHT); if (m_pWrapTransparentCB->IsChecked() && !bDrawMode) - aOp.SetValue(sal_False); + aOp.SetValue(false); } else if (m_pIdealWrapRB->IsChecked()) aSur.SetSurround(SURROUND_IDEAL); @@ -490,12 +490,12 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) (eHOrient == text::HoriOrientation::RIGHT || eHOrient == text::HoriOrientation::LEFT); m_pWrapAnchorOnlyCB->Enable( bAllHtmlModes && nSur != SURROUND_NONE ); m_pWrapOutsideCB->Hide(); - m_pIdealWrapRB->Enable( sal_False ); + m_pIdealWrapRB->Enable( false ); - m_pWrapTransparentCB->Enable( sal_False ); + m_pWrapTransparentCB->Enable( false ); m_pNoWrapRB->Enable( FLY_AT_PARA == nAnchorId ); - m_pWrapParallelRB->Enable( sal_False ); + m_pWrapParallelRB->Enable( false ); m_pWrapLeftRB->Enable ( (FLY_AT_PARA == nAnchorId) || ( (FLY_AT_CHAR == nAnchorId) diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 0476cbb7f948..4c100703daae 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -36,7 +36,7 @@ class SwScrollbar: public ScrollBar public: void ExtendedShow( sal_Bool bVisible = sal_True ); - void Hide() { Show( sal_False ); } + void Hide() { Show( false ); } void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); sal_Bool IsVisible(sal_Bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 07a815577406..24f6dee18390 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -291,7 +291,7 @@ public: sal_Bool IsValid() const {return bValid;} - void SetInvalid() {bValid = sal_False;} + void SetInvalid() {bValid = false;} OUString GetPattern() const; diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index fb8d0b6a68b2..b3fdbacf6c44 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -405,7 +405,7 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const; virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( bool bOn = sal_True ); + virtual void ShowCursor( bool bOn = true ); virtual ErrCode DoVerb( long nVerb ); virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index e6171eb9fede..7a0173b86c23 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -330,7 +330,7 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog() SW_MOD()->GetModuleConfig()->SetShowIndexPreview(m_pShowExampleCB->IsChecked()); // fdo#38515 Avoid setting focus on deleted controls in the destructors - EnableInput( sal_False ); + EnableInput( false ); for(sal_uInt16 i = 0; i < nTypeCount; i++) { @@ -969,8 +969,8 @@ void SwTOXSelectTabPage::SelectType(TOXTypes eSet) sal_IntPtr nData = lcl_TOXTypesToUserData(eCurType); m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos((void*)nData)); - m_pTypeFT->Enable(sal_False); - m_pTypeLB->Enable(sal_False); + m_pTypeFT->Enable(false); + m_pTypeLB->Enable(false); TOXTypeHdl(m_pTypeLB); } @@ -1056,9 +1056,9 @@ void SwTOXSelectTabPage::ApplyTOXDescription() m_pUseFFCB-> Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_FF) ); m_pUseDashCB-> Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_DASH) ); if(m_pUseFFCB->IsChecked()) - m_pUseDashCB->Enable(sal_False); + m_pUseDashCB->Enable(false); else if(m_pUseDashCB->IsChecked()) - m_pUseFFCB->Enable(sal_False); + m_pUseFFCB->Enable(false); m_pCaseSensitiveCB-> Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_CASE_SENSITIVE) ); m_pInitialCapsCB-> Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_INITIAL_CAPS) ); @@ -1248,8 +1248,8 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet& ) if(pTOXDlg->IsTOXEditMode()) { - m_pTypeFT->Enable(sal_False); - m_pTypeLB->Enable(sal_False); + m_pTypeFT->Enable(false); + m_pTypeLB->Enable(false); } if(!m_bWaitingInitialSettings) @@ -1877,7 +1877,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet m_pFillCharCB->InsertEntry(OUString('-')); m_pFillCharCB->InsertEntry(OUString('_')); - m_pEditStylePB->Enable(sal_False); + m_pEditStylePB->Enable(false); //fill the types in for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i) @@ -2283,7 +2283,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) { if(bInLevelHdl) return 0; - bInLevelHdl = sal_True; + bInLevelHdl = true; WriteBackLevel(); sal_uInt16 nLevel = static_cast< sal_uInt16 >(pBox->GetModel()->GetAbsPos(pBox->FirstSelected())); @@ -2318,7 +2318,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) } m_pAuthFieldsLB->SelectEntryPos(0); } - bInLevelHdl = sal_False; + bInLevelHdl = false; pBox->GrabFocus(); return 0; } @@ -2390,7 +2390,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken) } else { - m_pTabPosMF->Enable(sal_False); + m_pTabPosMF->Enable(false); } sal_Bool bIsChapterInfo = pToken->eTokenType == TOKEN_CHAPTER_INFO; @@ -2675,7 +2675,7 @@ SwTokenWindow::~SwTokenWindow() void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) { SetActiveControl(0); - bValid = sal_True; + bValid = true; if(pForm) { @@ -2943,14 +2943,14 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken& { if(bPostLinkStartFound) break; - bPostLinkStartFound = sal_True; + bPostLinkStartFound = true; pExchange = pControl; } else if(TOKEN_LINK_END == rNewToken.eTokenType ) { if(bPostLinkStartFound) { - bPostLinkStartFound = sal_False; + bPostLinkStartFound = false; pExchange = 0; } break; diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 706b0de750ed..d29df7439cf4 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -259,8 +259,8 @@ void SwIndexMarkPane::InitControls() m_pTypeFT->Show(); - m_pTypeDCB->Enable(sal_False); - m_pTypeFT->Enable(sal_False); + m_pTypeDCB->Enable(false); + m_pTypeFT->Enable(false); UpdateDialog(); } @@ -590,7 +590,7 @@ class SwNewUserIdxDlg : public ModalDialog get(m_pOKPB, "ok"); get(m_pNameED, "entry"); m_pNameED->SetModifyHdl(LINK(this, SwNewUserIdxDlg, ModifyHdl)); - m_pOKPB->Enable(sal_False); + m_pOKPB->Enable(false); m_pNameED->GrabFocus(); } @@ -1553,8 +1553,8 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, m_bNameAllowed = !pFields[nIndex].isEmpty(); if(!bCreate) { - pFixedTexts[nIndex]->Enable(sal_False); - pEdits[nIndex]->Enable(sal_False); + pFixedTexts[nIndex]->Enable(false); + pEdits[nIndex]->Enable(false); } } pFixedTexts[nIndex]->set_mnemonic_widget(pEdits[nIndex]); diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index af9a344c2e18..f3db53ed8fd8 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -449,7 +449,7 @@ SwSpellPopup::SwSpellPopup( if (bUseImagesInMenus) { uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(); - Image rImg = ::GetImage( xFrame, ".uno:SpellingAndGrammarDialog", sal_False ); + Image rImg = ::GetImage( xFrame, ".uno:SpellingAndGrammarDialog", false ); SetItemImage( MN_SPELLING_DLG, rImg ); } @@ -603,7 +603,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) if (bUseImagesInMenus) { uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(); - Image rImg = ::GetImage( xFrame, ".uno:SpellingAndGrammarDialog", sal_False ); + Image rImg = ::GetImage( xFrame, ".uno:SpellingAndGrammarDialog", false ); SetItemImage( MN_SPELLING_DLG, rImg ); } diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 9a28ad09050b..f60d28d2e8ff 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -78,7 +78,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) m_pBookmarkBox->RemoveEntryAt(m_pBookmarkBox->GetSelectEntryPos(i - 1)); m_pBookmarkBox->SetText(OUString()); - m_pDeleteBtn->Enable(sal_False); // no further entries there + m_pDeleteBtn->Enable(false); // no further entries there m_pOkBtn->Enable(); // the OK handler deletes return 0; diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index cc0c6d7615ba..423df7f5b151 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -135,8 +135,8 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) if ( rInf.ePos == FTNPOS_PAGE ) { m_pPosPageBox->Check(); - m_pPageTemplLbl->Enable(sal_False); - m_pPageTemplBox->Enable(sal_False); + m_pPageTemplLbl->Enable(false); + m_pPageTemplBox->Enable(false); } else { @@ -292,8 +292,8 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl) m_pNumCountBox->InsertEntry(aNumChapter, FTNNUM_CHAPTER); SelectNumbering(eNum); } - m_pPageTemplLbl->Enable(sal_False); - m_pPageTemplBox->Enable(sal_False); + m_pPageTemplLbl->Enable(false); + m_pPageTemplBox->Enable(false); return 0; } diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index ddf69f7ef366..c7d3aa8783f2 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -89,7 +89,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, m_pPathLB->SetEntryData(i, (void*)nCaseReadonly); } m_pPathLB->SelectEntryPos(0); - m_pPathLB->Enable(sal_True); + m_pPathLB->Enable(true); const sal_uInt16 nCount = pHdl->GetGroupCnt(); for( sal_uInt16 i = 0; i < nCount; ++i) @@ -178,7 +178,7 @@ void SwGlossaryGroupDlg::Apply() IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) { - m_pNewPB->Enable(sal_False); + m_pNewPB->Enable(false); SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected(); if(pFirstEntry) { @@ -229,7 +229,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); if(!pEntry) { - pButton->Enable(sal_False); + pButton->Enable(false); return 0; } GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); @@ -271,7 +271,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) delete pUserData; m_pGroupTLB->GetModel()->Remove(pEntry); if(!m_pGroupTLB->First()) - pButton->Enable(sal_False); + pButton->Enable(false); //the content must be deleted - otherwise the new handler would be called in Apply() m_pNameED->SetText(aEmptyOUStr); return 0; diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index c12b1d034aaa..34b98d15c8d1 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -616,7 +616,7 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString // this group does not exist (anymore) -> release the cached UNO object for it aSearch = m_aGlossaryGroups.erase( aSearch ); // so it won't be created below - _bCreate = sal_False; + _bCreate = false; break; } } diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index dec1c52727c7..8de657a2ebbb 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -221,7 +221,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, bIsDocReadOnly = pSh->GetView().GetDocShell()->IsReadOnly() || pSh->HasReadonlySel(); if( bIsDocReadOnly ) - m_pInsertBtn->Enable(sal_False); + m_pInsertBtn->Enable(false); m_pNameED->GrabFocus(); m_pCategoryBox->SetStyle(m_pCategoryBox->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT); m_pCategoryBox->GetModel()->SetSortMode(SortAscending); @@ -344,7 +344,7 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit ) { if(bNameED) m_pShortNameEdit->SetText(aName); - m_pInsertBtn->Enable(sal_False); + m_pInsertBtn->Enable(false); return 0; } const bool bNotFound = !DoesBlockExist(aName, bNameED ? OUString() : pEdit->GetText()); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 765c4af1505f..20c8f58da0d8 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -105,7 +105,7 @@ IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberEditHdl) IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberAutoBtnHdl) { - m_pOkBtn->Enable( sal_True ); + m_pOkBtn->Enable( true ); return 0; } IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberAutoBtnHdl) @@ -119,7 +119,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) const SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT ); SfxAllItemSet aAllSet( rSh.GetAttrPool() ); - aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); aAllSet.Put( rFont ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -127,8 +127,8 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if (RET_OK == pDlg->Execute()) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pItem ) { m_pNumberCharEdit->SetText( pItem->GetValue() ); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 3744ef49c836..b4b3595d142c 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -268,7 +268,7 @@ void SwNumPositionTabPage::InitControls() m_pDistBorderMF->SetValue(m_pDistBorderMF->Normalize(nDistBorderNum),FUNIT_TWIP); } else - bSetDistEmpty = sal_True; + bSetDistEmpty = true; if(bSameDist) m_pDistNumMF->SetValue(m_pDistNumMF->Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP); @@ -416,7 +416,7 @@ sal_Bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { *pSaveNum = *pActNum; rSet.Put(SwUINumRuleItem( *pSaveNum )); - rSet.Put(SfxBoolItem(FN_PARAM_NUM_PRESET, sal_False)); + rSet.Put(SfxBoolItem(FN_PARAM_NUM_PRESET, false)); } return bModified; } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 8c019a245d06..b8bb0f9ea1d4 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -499,8 +499,8 @@ void SwOutlineSettingsTabPage::Update() else m_pCharFmtLB->SetNoSelection(); - m_pAllLevelFT->Enable(sal_True); - m_pAllLevelNF->Enable(sal_True); + m_pAllLevelFT->Enable(true); + m_pAllLevelNF->Enable(true); m_pAllLevelNF->SetMax(MAXLEVEL); if(bSameComplete) { @@ -532,16 +532,16 @@ void SwOutlineSettingsTabPage::Update() if(nTmpLevel) { - m_pAllLevelFT->Enable(sal_True); - m_pAllLevelNF->Enable(sal_True); + m_pAllLevelFT->Enable(true); + m_pAllLevelNF->Enable(true); m_pAllLevelNF->SetMax(nTmpLevel + 1); m_pAllLevelNF->SetValue(rFmt.GetIncludeUpperLevels()); } else { m_pAllLevelNF->SetText(OUString()); - m_pAllLevelNF->Enable(sal_False); - m_pAllLevelFT->Enable(sal_False); + m_pAllLevelNF->Enable(false); + m_pAllLevelFT->Enable(false); } CheckForStartValue_Impl(rFmt.GetNumberingType()); m_pStartEdit->SetValue( rFmt.GetStart() ); diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 16888cdcc2f7..8e803d77ff8c 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -55,7 +55,7 @@ static sal_uInt16 aPageRg[] = { ------------------------------------------------------------------------*/ IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage) { - m_pMaxHeightEdit->Enable(sal_False); + m_pMaxHeightEdit->Enable(false); return 0; } IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightPage) @@ -172,7 +172,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) else { m_pMaxHeightPageBtn->Check(sal_True); - m_pMaxHeightEdit->Enable(sal_False); + m_pMaxHeightEdit->Enable(false); } m_pMaxHeightPageBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightPage)); m_pMaxHeightBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightMetric)); diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 05322d46c22c..03f226ac3059 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -475,11 +475,11 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton) bEnable = m_pLinesGridRB == pButton; if(bEnable && !m_bSquaredMode ) { - m_pCharsPerLineFT->Enable(sal_False); - m_pCharsPerLineNF->Enable(sal_False); - m_pCharsRangeFT->Enable(sal_False); - m_pCharWidthFT->Enable(sal_False); - m_pCharWidthMF->Enable(sal_False); + m_pCharsPerLineFT->Enable(false); + m_pCharsPerLineNF->Enable(false); + m_pCharsRangeFT->Enable(false); + m_pCharWidthFT->Enable(false); + m_pCharWidthMF->Enable(false); } GridModifyHdl(0); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index a54e192f6139..6f863f4677ea 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -110,7 +110,7 @@ void SwModelessRedlineAcceptDlg::Activate() pChildWin->SetOldDocShell(pDocSh); // avoid recursion (using modified-Hdl) sal_Bool bMod = pSh->IsModified(); - SfxBoolItem aShow(FN_REDLINE_SHOW, sal_True); + SfxBoolItem aShow(FN_REDLINE_SHOW, true); pSh->GetView().GetViewFrame()->GetDispatcher()->Execute( FN_REDLINE_SHOW, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aShow, 0L); if (!bMod) diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index f452f13833ec..2acd12d39715 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -167,13 +167,13 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) m_pColumnRB->Check(bCol); m_pColLbl->SetText(bCol ? aRowTxt : aColTxt); m_pRowRB->Check(!bCol); - m_pDelimTabRB->Enable(sal_False); - m_pDelimFreeRB->Enable(sal_False); - m_pDelimEdt->Enable(sal_False); + m_pDelimTabRB->Enable(false); + m_pDelimFreeRB->Enable(false); + m_pDelimEdt->Enable(false); } else { - m_pColumnRB->Enable(sal_False); + m_pColumnRB->Enable(false); m_pRowRB->Check(sal_True); m_pColLbl->SetText(aColTxt); } @@ -377,7 +377,7 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl) rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ); if( RET_OK == pMap->Execute() ) { - SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, sal_False ); + SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, false ); if ( pItem ) m_pDelimEdt->SetText( OUString(pItem->GetValue()) ); } diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/ui/ribbar/conrect.cxx index 172b09b2555c..383ff7e8310d 100644 --- a/sw/source/ui/ribbar/conrect.cxx +++ b/sw/source/ui/ribbar/conrect.cxx @@ -112,7 +112,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) if( pObj ) { SdrPageView* pPV = pSdrView->GetSdrPageView(); - m_pView->BeginTextEdit( pObj, pPV, m_pWin, sal_True ); + m_pView->BeginTextEdit( pObj, pPV, m_pWin, true ); } m_pView->LeaveDrawCreate(); // Switch to selection mode m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW); @@ -126,7 +126,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) pCaptObj->ForceOutlinerParaObject(); OutlinerParaObject* pOPO = pCaptObj->GetOutlinerParaObject(); if( pOPO && !pOPO->IsVertical() ) - pOPO->SetVertical( sal_True ); + pOPO->SetVertical( true ); } } break; diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index 2ae8b03f0e6c..658dbd49a0c1 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -435,7 +435,7 @@ void SwDrawBase::Activate(const sal_uInt16 nSlot) void SwDrawBase::Deactivate() { SdrView *pSdrView = m_pSh->GetDrawView(); - pSdrView->SetOrtho(sal_False); + pSdrView->SetOrtho(false); pSdrView->SetAngleSnapEnabled(sal_False); if (m_pWin->IsDrawAction() && m_pSh->IsDrawCreate()) diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 1ce307aff932..6e86f14a0873 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -234,7 +234,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) { if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -675,7 +675,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) if( !pSecondPool ) pSecondPool = aEditAttr.GetPool(); SvxScriptSetItem aSetItem( nSlotId, *pSecondPool ); - aSetItem.GetItemSet().Put( aEditAttr, sal_False ); + aSetItem.GetItemSet().Put( aEditAttr, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType ); if( pI ) rSet.Put( *pI, nWhich ); @@ -709,7 +709,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) pEscItem = &aEditAttr.Get( EE_CHAR_ESCAPEMENT ); if( nEsc == ((const SvxEscapementItem*)pEscItem)->GetEnumValue() ) - rSet.Put( SfxBoolItem( nWhich, sal_True )); + rSet.Put( SfxBoolItem( nWhich, true )); else rSet.InvalidateItem( nWhich ); break; @@ -739,7 +739,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) else { if ( eAdjust == ((const SvxAdjustItem*)pAdjust)->GetAdjust()) - rSet.Put( SfxBoolItem( nWhich, sal_True )); + rSet.Put( SfxBoolItem( nWhich, true )); else rSet.InvalidateItem( nWhich ); } @@ -767,7 +767,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) else { if( nLSpace == ((const SvxLineSpacingItem*)pLSpace)->GetPropLineSpace() ) - rSet.Put( SfxBoolItem( nWhich, sal_True )); + rSet.Put( SfxBoolItem( nWhich, true )); else rSet.InvalidateItem( nWhich ); } @@ -1091,7 +1091,7 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq) break; case FN_DELETE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, false); if ( pItem ) pPostItMgr->Delete( pItem->GetValue() ); break; @@ -1103,7 +1103,7 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq) break; case FN_HIDE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, false); if ( pItem ) pPostItMgr->Hide( pItem->GetValue() ); } @@ -1200,7 +1200,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) case SID_THES: { OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) @@ -1653,7 +1653,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) SvxFontItem aSetDlgFont( RES_CHRATR_FONT ); { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aSetDlgFont = *(SvxFontItem*)pI; @@ -1671,7 +1671,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAllItemSet aAllSet( GetPool() ); - aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions()); OUString sSymbolFont = aOpt.GetSymbolFont(); @@ -1687,8 +1687,8 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pFontItem ) { aFont.SetName( pFontItem->GetFamilyName() ); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index a284b793d49a..ebc90e1c960f 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -698,7 +698,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) break; case SID_GALLERY_FORMATS: { - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, sal_False ); + SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); if ( !pGalleryItem ) break; @@ -1326,7 +1326,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) break; case SID_GALLERY_ENABLE_ADDCOPY: // #108230# allow copy from gallery in Writer AND Writer/Web! - rSet.Put( SfxBoolItem( SID_GALLERY_ENABLE_ADDCOPY, sal_True ) ); + rSet.Put( SfxBoolItem( SID_GALLERY_ENABLE_ADDCOPY, true ) ); break; case FN_EDIT_REGION: if( !rSh.IsAnySectionInDoc() ) @@ -2091,7 +2091,7 @@ void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet ) } SfxItemPool& rPool = *rSet.GetPool(); SvxScriptSetItem aSetItem( rPool.GetSlotId( nWhich ), rPool ); - aSetItem.GetItemSet().Put( *pFntCoreSet, sal_False ); + aSetItem.GetItemSet().Put( *pFntCoreSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType ); if( pI ) rSet.Put( *pI, nWhich ); @@ -2492,11 +2492,11 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) if( pArgs && pArgs->Count() >= 2 ) { - SFX_REQUEST_ARG( _rRequest, pName, SfxStringItem, FN_INSERT_TABLE, sal_False ); - SFX_REQUEST_ARG( _rRequest, pCols, SfxUInt16Item, SID_ATTR_TABLE_COLUMN, sal_False ); - SFX_REQUEST_ARG( _rRequest, pRows, SfxUInt16Item, SID_ATTR_TABLE_ROW, sal_False ); - SFX_REQUEST_ARG( _rRequest, pFlags, SfxInt32Item, FN_PARAM_1, sal_False ); - SFX_REQUEST_ARG( _rRequest, pAuto, SfxStringItem, FN_PARAM_2, sal_False ); + SFX_REQUEST_ARG( _rRequest, pName, SfxStringItem, FN_INSERT_TABLE, false ); + SFX_REQUEST_ARG( _rRequest, pCols, SfxUInt16Item, SID_ATTR_TABLE_COLUMN, false ); + SFX_REQUEST_ARG( _rRequest, pRows, SfxUInt16Item, SID_ATTR_TABLE_ROW, false ); + SFX_REQUEST_ARG( _rRequest, pFlags, SfxInt32Item, FN_PARAM_1, false ); + SFX_REQUEST_ARG( _rRequest, pAuto, SfxStringItem, FN_PARAM_2, false ); if ( pName ) aTableName = pName->GetValue(); @@ -2689,8 +2689,8 @@ void SwBaseShell::ExecuteGallery(SfxRequest &rReq) if ( nSel & nsSelectionType::SEL_DRW_TXT ) break; - SFX_REQUEST_ARG( rReq, pPos, SfxUInt16Item, SID_GALLERY_BG_POS, sal_False ); - SFX_REQUEST_ARG( rReq, pBrush, SvxBrushItem, SID_GALLERY_BG_BRUSH, sal_False ); + SFX_REQUEST_ARG( rReq, pPos, SfxUInt16Item, SID_GALLERY_BG_POS, false ); + SFX_REQUEST_ARG( rReq, pBrush, SvxBrushItem, SID_GALLERY_BG_BRUSH, false ); if ( !pPos || !pBrush ) break; diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index fe87a0a8b93a..7b3751d86cac 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -264,8 +264,8 @@ void SwBezierShell::GetState(SfxItemSet &rSet) switch (eSegm) { case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break; - case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button pressed = curve - case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break; + case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,false)); break; // Button pressed = curve + case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,true)); break; default:; //prevent warning } } @@ -309,8 +309,8 @@ void SwBezierShell::GetState(SfxItemSet &rSet) switch (eClose) { case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break; - case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_False)); break; - case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_True)); break; + case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,false)); break; + case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,true)); break; default:; //prevent warning } } diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index 307789139a97..16a1f98eac84 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -329,7 +329,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) { // TTTT - needs to be adapted in aw080: // state is not kept for drawing objects --> provide not flipped state - rSet.Put( SfxBoolItem( nWhich, sal_False ) ); + rSet.Put( SfxBoolItem( nWhich, false ) ); } break; @@ -342,7 +342,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) { // TTTT - needs to be adapted in aw080: // state is not kept for drawing objects --> provide not flipped state - rSet.Put( SfxBoolItem( nWhich, sal_False ) ); + rSet.Put( SfxBoolItem( nWhich, false ) ); } break; diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index e4f7c781658c..e92e5f0664f2 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -230,7 +230,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) FieldUnit eMetric = ::GetDfltMetric(0 != dynamic_cast<SwWebView*>(&GetView())); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); - aSet.Put( aNewAttr, sal_False ); + aSet.Put( aNewAttr, false ); if (bCaption) pSdrView->GetAttributes( aSet ); diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 761e507e5af3..80a1049bf6da 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -138,7 +138,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) case SID_THES: { OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) @@ -501,7 +501,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) : text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION ) ); pTmpView->SetAttributes( aAttr ); - rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), sal_False); + rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), false); rSh.GetView().AttrChangedNotify( &rSh ); } return; @@ -544,7 +544,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) aAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); } pTmpView->SetAttributes( aAttr ); - rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), sal_False ); + rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), false ); rSh.GetView().AttrChangedNotify( &rSh ); } return; @@ -858,7 +858,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) if( !pEditPool ) pEditPool = aEditAttr.GetPool(); SvxScriptSetItem aSetItem( nSlotId, *pEditPool ); - aSetItem.GetItemSet().Put( aEditAttr, sal_False ); + aSetItem.GetItemSet().Put( aEditAttr, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType ); if( pI ) rSet.Put( *pI, nWhich ); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 6d410e576692..f4e162a22a4a 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -711,7 +711,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) SvxFontItem aSetDlgFont( RES_CHRATR_FONT ); { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aSetDlgFont = *(SvxFontItem*)pI; @@ -727,7 +727,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) if(sSym.isEmpty()) { SfxAllItemSet aAllSet( GetPool() ); - aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions()); OUString sSymbolFont = aOpt.GetSymbolFont(); @@ -743,8 +743,8 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pFontItem ) { aFont.SetName( pFontItem->GetFamilyName() ); @@ -868,7 +868,7 @@ void SwDrawTextShell::GetStatePropPanelAttr(SfxItemSet &rSet) } else { - rSet.Put(SfxBoolItem(nSlotId, sal_False)); + rSet.Put(SfxBoolItem(nSlotId, false)); } break; } diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index dedc9969cbcb..3b8deb34fb43 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -212,7 +212,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) } rSh.SetFlyName(sName); } - aURL.SetURL( rURL, sal_False ); + aURL.SetURL( rURL, false ); aURL.SetTargetFrameName(rTarget); aSet.Put( aURL ); @@ -391,7 +391,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) } else { - bUpdateMgr = sal_False; + bUpdateMgr = false; } } @@ -477,8 +477,8 @@ void SwFrameShell::Execute(SfxRequest &rReq) "FrameDialog", GetView().GetViewFrame(), GetView().GetWindow(), - aSet, sal_False, - sal_False, + aSet, false, + false, sDefPage); OSL_ENSURE(pDlg, "Dialogdiet fail!"); @@ -886,11 +886,11 @@ void SwFrameShell::GetState(SfxItemSet& rSet) if ( ( eProtection & FLYPROTECT_CONTENT ) || ( eProtection & FLYPROTECT_SIZE ) ) { - rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, true ) ); } else { - rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, false ) ); } } break; diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 06b3fcbafc5d..07af97ce38e6 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -113,7 +113,7 @@ namespace SwLangHelper // get the language OUString aNewLangTxt; - SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , false ); if (pItem) aNewLangTxt = pItem->GetValue(); diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index dd21ec6b1b4f..8f2935489dc6 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -168,7 +168,7 @@ void SwListShell::Execute(SfxRequest &rReq) { rReq.Ignore(); SfxRequest aReq( GetView().GetViewFrame(), FN_NUM_BULLET_ON ); - aReq.AppendItem( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aReq.AppendItem( SfxBoolItem( FN_PARAM_1, false ) ); aReq.Done(); rSh.DelNumRules(); break; diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 1ad2ad926407..3ac93a1c2c3e 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -900,9 +900,9 @@ void SwTableShell::Execute(SfxRequest &rReq) long nCount=0; sal_Bool bHorizontal=sal_True; sal_Bool bProportional = sal_False; - SFX_REQUEST_ARG( rReq, pSplit, SfxInt32Item, FN_TABLE_SPLIT_CELLS, sal_False ); - SFX_REQUEST_ARG( rReq, pHor, SfxBoolItem, FN_PARAM_1, sal_False ); - SFX_REQUEST_ARG( rReq, pProp, SfxBoolItem, FN_PARAM_2, sal_False ); + SFX_REQUEST_ARG( rReq, pSplit, SfxInt32Item, FN_TABLE_SPLIT_CELLS, false ); + SFX_REQUEST_ARG( rReq, pHor, SfxBoolItem, FN_PARAM_1, false ); + SFX_REQUEST_ARG( rReq, pProp, SfxBoolItem, FN_PARAM_2, false ); if ( pSplit ) { nCount = pSplit->GetValue(); @@ -943,7 +943,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_SPLIT_TABLE: { - SFX_REQUEST_ARG( rReq, pType, SfxUInt16Item, FN_PARAM_1, sal_False ); + SFX_REQUEST_ARG( rReq, pType, SfxUInt16Item, FN_PARAM_1, false ); if( pType ) { switch( pType->GetValue() ) @@ -1328,11 +1328,11 @@ void SwTableShell::GetState(SfxItemSet &rSet) break; case FN_TABLE_HEADLINE_REPEAT: if(0 != rSh.GetRowsToRepeat()) - rSet.Put(SfxBoolItem(nSlot, sal_True)); + rSet.Put(SfxBoolItem(nSlot, true)); else if(!rSh.GetRowSelectionFromTop()) rSet.DisableItem( nSlot ); else - rSet.Put(SfxBoolItem(nSlot, sal_False)); + rSet.Put(SfxBoolItem(nSlot, false)); break; case FN_TABLE_SELECT_CELL : if(rSh.HasBoxSelection()) diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index b99cadb63f7e..394855361d36 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -60,7 +60,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, rSh.StartUndo( UNDO_UI_INSERT_URLBTN ); if (rSh.BeginCreate(OBJ_FM_BUTTON, FmFormInventor, aStartPos)) { - pSdrView->SetOrtho(sal_False); + pSdrView->SetOrtho(false); Size aSz(GetView().GetEditWin().PixelToLogic(Size(140, 20))); Point aEndPos(aSz.Width(), aSz.Height()); diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 80579cc1b3af..047723733309 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -323,7 +323,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; case FN_DELETE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, false); if ( pNoteItem && GetView().GetPostItMgr() ) GetView().GetPostItMgr()->Delete( pNoteItem->GetValue() ); } @@ -341,7 +341,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; case FN_HIDE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, false); if ( pNoteItem && GetView().GetPostItMgr() ) GetView().GetPostItMgr()->Hide( pNoteItem->GetValue() ); } @@ -511,8 +511,8 @@ void SwTextShell::ExecField(SfxRequest &rReq) if ( pItem ) { aText = ((SfxStringItem*)pItem)->GetValue(); - SFX_REQUEST_ARG( rReq, pType, SfxStringItem, FN_PARAM_2 , sal_False ); - SFX_REQUEST_ARG( rReq, pIsUrl, SfxBoolItem, FN_PARAM_1 , sal_False ); + SFX_REQUEST_ARG( rReq, pType, SfxStringItem, FN_PARAM_2 , false ); + SFX_REQUEST_ARG( rReq, pIsUrl, SfxBoolItem, FN_PARAM_1 , false ); if ( pType ) aType = pType->GetValue(); if ( pIsUrl ) diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 46531183d2ea..a81641c1bfbb 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -191,12 +191,12 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) if(!pIdxMrk) rSet.DisableItem( FN_INSERT_IDX_ENTRY_DLG ); else - rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG, sal_True)); + rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG, true)); if(!pAuthMark) rSet.DisableItem( FN_INSERT_AUTH_ENTRY_DLG ); else - rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, sal_True)); + rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, true)); } else if ( rSh.CrsrInsideInputFld() ) diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index d2bbceef4606..7a9e181c7c7f 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -271,7 +271,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_OBJECT: case SID_INSERT_PLUGIN: { - SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, false ); SvGlobalName *pName = NULL; SvGlobalName aName; if ( pNameItem ) @@ -280,8 +280,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) pName = &aName; } - SFX_REQUEST_ARG( rReq, pClassLocationItem, SfxStringItem, FN_PARAM_2, sal_False ); - SFX_REQUEST_ARG( rReq, pCommandsItem, SfxStringItem, FN_PARAM_3, sal_False ); + SFX_REQUEST_ARG( rReq, pClassLocationItem, SfxStringItem, FN_PARAM_2, false ); + SFX_REQUEST_ARG( rReq, pCommandsItem, SfxStringItem, FN_PARAM_3, false ); //TODO/LATER: recording currently not working, need code for Commandlist svt::EmbeddedObjectRef xObj; if( nSlot == SID_INSERT_PLUGIN && ( pClassLocationItem || pCommandsItem ) ) @@ -342,11 +342,11 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_FLOATINGFRAME: { svt::EmbeddedObjectRef xObj; - SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, FN_PARAM_1, sal_False ); - SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, FN_PARAM_2, sal_False ); - SFX_REQUEST_ARG( rReq, pMarginItem, SvxSizeItem, FN_PARAM_3, sal_False ); - SFX_REQUEST_ARG( rReq, pScrollingItem, SfxByteItem, FN_PARAM_4, sal_False ); - SFX_REQUEST_ARG( rReq, pBorderItem, SfxBoolItem, FN_PARAM_5, sal_False ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, FN_PARAM_1, false ); + SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, FN_PARAM_2, false ); + SFX_REQUEST_ARG( rReq, pMarginItem, SvxSizeItem, FN_PARAM_3, false ); + SFX_REQUEST_ARG( rReq, pScrollingItem, SfxByteItem, FN_PARAM_4, false ); + SFX_REQUEST_ARG( rReq, pBorderItem, SfxBoolItem, FN_PARAM_5, false ); if(pURLItem) // URL is a _must_ { @@ -986,7 +986,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) SvxFontItem aFont( RES_CHRATR_FONT ); { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aFont = *(SvxFontItem*)pI; @@ -1003,7 +1003,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) { // Set selected font as default. SfxAllItemSet aAllSet( rSh.GetAttrPool() ); - aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); SwViewOption aOpt(*GetShell().GetViewOptions()); OUString sSymbolFont = aOpt.GetSymbolFont(); @@ -1017,8 +1017,8 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ); if( RET_OK == pDlg->Execute() ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pFontItem ) { aNewFont.SetName( pFontItem->GetFamilyName() ); @@ -1054,7 +1054,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) rSh.GetCurAttr( aSet ); SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aFont = *(SvxFontItem*)pI; diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index e50646a5daff..4be8724d0460 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -216,7 +216,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const aReq.Done(); SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(), FN_CHAR_LEFT ); aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) ); - aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, sal_True) ); + aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, true) ); aReq1.Done(); } } @@ -235,7 +235,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const { SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(), FN_CHAR_RIGHT ); aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) ); - aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, sal_False) ); + aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, false) ); aReq1.Done(); rWrtSh.SwapPam(); rWrtSh.ClearMark(); @@ -283,7 +283,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { // get the language OUString aNewLangTxt; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_LANGUAGE_STATUS , sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_LANGUAGE_STATUS , false ); if (pItem2) aNewLangTxt = pItem2->GetValue(); @@ -396,7 +396,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { // replace word/selection with text from selected sub menu entry OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES , sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES , false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) @@ -418,8 +418,8 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_INSERT_ENDNOTE: { OUString aStr; - SFX_REQUEST_ARG( rReq, pFont, SfxStringItem, FN_PARAM_1 , sal_False ); - SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, nSlot , sal_False ); + SFX_REQUEST_ARG( rReq, pFont, SfxStringItem, FN_PARAM_1 , false ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, nSlot , false ); if ( pNameItem ) aStr = pNameItem->GetValue(); bool bFont = pFont && !pFont->GetValue().isEmpty(); @@ -522,9 +522,9 @@ void SwTextShell::Execute(SfxRequest &rReq) if ( pItem ) { nKind = ((SfxInt16Item*)pItem)->GetValue(); - SFX_REQUEST_ARG( rReq, pTemplate, SfxStringItem, FN_PARAM_1 , sal_False ); - SFX_REQUEST_ARG( rReq, pNumber, SfxUInt16Item, FN_PARAM_2 , sal_False ); - SFX_REQUEST_ARG( rReq, pIsNumberFilled, SfxBoolItem, FN_PARAM_3, sal_False ); + SFX_REQUEST_ARG( rReq, pTemplate, SfxStringItem, FN_PARAM_1 , false ); + SFX_REQUEST_ARG( rReq, pNumber, SfxUInt16Item, FN_PARAM_2 , false ); + SFX_REQUEST_ARG( rReq, pIsNumberFilled, SfxBoolItem, FN_PARAM_3, false ); if ( pTemplate ) aTemplateName = pTemplate->GetValue(); if ( pNumber && pIsNumberFilled && pIsNumberFilled->GetValue() ) @@ -615,10 +615,10 @@ void SwTextShell::Execute(SfxRequest &rReq) { SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags()); // This must always be sal_False for the postprocessing. - aFlags.bAFmtByInput = sal_False; - aFlags.bWithRedlining = sal_True; + aFlags.bAFmtByInput = false; + aFlags.bWithRedlining = true; rWrtSh.AutoFormat( &aFlags ); - aFlags.bWithRedlining = sal_False; + aFlags.bWithRedlining = false; SfxViewFrame* pVFrame = GetView().GetViewFrame(); if (pVFrame->HasChildWindow(FN_REDLINE_ACCEPT)) @@ -659,7 +659,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags()); // This must always be sal_False for the postprocessing. - aFlags.bAFmtByInput = sal_False; + aFlags.bAFmtByInput = false; rWrtSh.AutoFormat( &aFlags ); rReq.Done(); } diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index b952a4ab7bc6..2059b5c253a5 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -103,10 +103,10 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) SfxBindings& rBind = GetView().GetViewFrame()->GetBindings(); if( nWhich == FN_SET_SUB_SCRIPT ) rBind.SetState( SfxBoolItem( FN_SET_SUPER_SCRIPT, - sal_False ) ); + false ) ); else rBind.SetState( SfxBoolItem( FN_SET_SUB_SCRIPT, - sal_False ) ); + false ) ); } break; @@ -311,7 +311,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) SET_ADJUST: { aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST)); - rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), sal_True ) ); + rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), true ) ); } break; @@ -617,7 +617,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, *rSet.GetPool() ); - aSetItem.GetItemSet().Put( aCoreSet, sal_False ); + aSetItem.GetItemSet().Put( aCoreSet, false ); if( !aSetItem.GetItemOfScript( rSh.GetScriptType() )) rSet.DisableItem( nSlot ); nSlot = 0; @@ -745,7 +745,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) nSlot = aIter.NextWhich(); } - rSet.Put(aCoreSet,sal_False); + rSet.Put(aCoreSet,false); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 2e10d58c194d..f82d828b0a98 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -50,7 +50,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) case FN_NUM_NUMBERING_ON: { GetShell().StartAllAction(); - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , false ); sal_Bool bMode = !GetShell().SelectionHasNumber(); // #i29560# if ( pItem ) bMode = pItem->GetValue(); @@ -79,7 +79,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) case FN_NUM_BULLET_ON: { GetShell().StartAllAction(); - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , false ); sal_Bool bMode = !GetShell().SelectionHasBullet(); // #i29560# if ( pItem ) bMode = pItem->GetValue(); @@ -176,7 +176,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) aSet.Put(SvxNumBulletItem(aSvxRule)); } - aSet.Put( SfxBoolItem( SID_PARAM_NUM_PRESET,sal_False )); + aSet.Put( SfxBoolItem( SID_PARAM_NUM_PRESET,false )); // Before the dialogue of the HTML mode will be dropped at the Docshell. pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh))); @@ -298,7 +298,7 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq) { case FN_SVX_SET_NUMBER: { - SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_NUMBER , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_NUMBER , false ); if (pItem) { sal_uInt16 nIdx = pItem->GetValue(); @@ -351,7 +351,7 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq) } case FN_SVX_SET_BULLET: { - SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_BULLET , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_BULLET , false ); if (pItem) { sal_uInt16 nIdx = pItem->GetValue(); diff --git a/sw/source/ui/sidebar/PagePropertyPanel.cxx b/sw/source/ui/sidebar/PagePropertyPanel.cxx index 684da1a65642..23d5a95066fc 100644 --- a/sw/source/ui/sidebar/PagePropertyPanel.cxx +++ b/sw/source/ui/sidebar/PagePropertyPanel.cxx @@ -644,7 +644,7 @@ void PagePropertyPanel::ChangeSizeImage() Swap( aTmpPaperSize ); // Swap(..) defined in editeng/paperinf.hxx } - mePaper = SvxPaperInfo::GetSvxPaper( aTmpPaperSize, static_cast<MapUnit>(meUnit), sal_True ); + mePaper = SvxPaperInfo::GetSvxPaper( aTmpPaperSize, static_cast<MapUnit>(meUnit), true ); sal_uInt16 nImageIdx = 0; switch ( mePaper ) diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/ui/sidebar/WrapPropertyPanel.cxx index 14c31a3d690b..cf8beb36bedd 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx @@ -104,17 +104,17 @@ void WrapPropertyPanel::Initialize() mpRBIdealWrap->SetClickHdl(aLink); aWrapIL.AddImage( UNO_WRAPOFF, - ::GetImage( mxFrame, UNO_WRAPOFF, sal_False ) ); + ::GetImage( mxFrame, UNO_WRAPOFF, false ) ); aWrapIL.AddImage( UNO_WRAPLEFT, - ::GetImage( mxFrame, UNO_WRAPLEFT, sal_False ) ); + ::GetImage( mxFrame, UNO_WRAPLEFT, false ) ); aWrapIL.AddImage( UNO_WRAPRIGHT, - ::GetImage( mxFrame, UNO_WRAPRIGHT, sal_False ) ); + ::GetImage( mxFrame, UNO_WRAPRIGHT, false ) ); aWrapIL.AddImage( UNO_WRAPON, - ::GetImage( mxFrame, UNO_WRAPON, sal_False ) ); + ::GetImage( mxFrame, UNO_WRAPON, false ) ); aWrapIL.AddImage( UNO_WRAPTHROUGH, - ::GetImage( mxFrame, UNO_WRAPTHROUGH, sal_False ) ); + ::GetImage( mxFrame, UNO_WRAPTHROUGH, false ) ); aWrapIL.AddImage( UNO_WRAPIDEAL, - ::GetImage( mxFrame, UNO_WRAPIDEAL, sal_False ) ); + ::GetImage( mxFrame, UNO_WRAPIDEAL, false ) ); mpRBNoWrap->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPOFF) ); if ( Application::GetSettings().GetLayoutRTL() ) @@ -174,7 +174,7 @@ IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) { nSlot = FN_FRAME_NOWRAP; } - SfxBoolItem bStateItem( nSlot, sal_True ); + SfxBoolItem bStateItem( nSlot, true ); mpBindings->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_RECORD, &bStateItem, 0L ); return 0; diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx index 795c91062661..79aa386c8b73 100644 --- a/sw/source/ui/smartmenu/stmenu.cxx +++ b/sw/source/ui/smartmenu/stmenu.cxx @@ -136,7 +136,7 @@ sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, Window* pWin ) if ( nId == MN_SMARTTAG_OPTIONS ) { - SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True); + SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, true); mpSwView->GetViewFrame()->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L ); } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 8e191e5f6429..e53054859e89 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -439,7 +439,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) m_pTopMF->Hide(); m_pBottomFT->Hide(); m_pBottomMF->Hide(); - m_pFreeBtn->Enable(sal_False); + m_pFreeBtn->Enable(false); } FieldUnit aMetric = ::GetDfltMetric(bHtmlMode); m_aWidthMF.SetMetric(aMetric); @@ -504,9 +504,9 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) { bSetRight = bSetLeft = true; m_pFullBtn->Check(); - m_aWidthMF.Enable(sal_False); - m_pRelWidthCB->Enable(sal_False); - m_pWidthFT->Enable(sal_False); + m_aWidthMF.Enable(false); + m_pRelWidthCB->Enable(false); + m_pWidthFT->Enable(false); } break; case text::HoriOrientation::LEFT: @@ -536,13 +536,13 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) } if ( bSetRight ) { - m_aRightMF.Enable(sal_False); - m_pRightFT->Enable(sal_False); + m_aRightMF.Enable(false); + m_pRightFT->Enable(false); } if ( bSetLeft ) { - m_aLeftMF.Enable(sal_False); - m_pLeftFT->Enable(sal_False); + m_aLeftMF.Enable(false); + m_pLeftFT->Enable(false); } } @@ -1521,7 +1521,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) if (oNumOffset) m_pPageNoNF->SetValue(oNumOffset.get()); else - m_pPageNoNF->Enable(sal_False); + m_pPageNoNF->Enable(false); if(pDesc) sPageDesc = pDesc->GetName(); @@ -1559,10 +1559,10 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) if ( eBreak != SVX_BREAK_NONE ) { m_pPgBrkCB->Check(); - m_pPageCollCB->Enable(sal_False); - m_pPageCollLB->Enable(sal_False); - m_pPageNoFT->Enable(sal_False); - m_pPageNoNF->Enable(sal_False); + m_pPageCollCB->Enable(false); + m_pPageCollLB->Enable(false); + m_pPageNoFT->Enable(false); + m_pPageNoNF->Enable(false); } switch ( eBreak ) { @@ -1603,15 +1603,15 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) } else { - m_pPgBrkRB->Enable(sal_False); - m_pColBrkRB->Enable(sal_False); - m_pPgBrkBeforeRB->Enable(sal_False); - m_pPgBrkAfterRB->Enable(sal_False); - m_pKeepCB->Enable(sal_False); - m_pSplitCB->Enable(sal_False); - m_pPgBrkCB->Enable(sal_False); - m_pPageCollCB->Enable(sal_False); - m_pPageCollLB->Enable(sal_False); + m_pPgBrkRB->Enable(false); + m_pColBrkRB->Enable(false); + m_pPgBrkBeforeRB->Enable(false); + m_pPgBrkAfterRB->Enable(false); + m_pKeepCB->Enable(false); + m_pSplitCB->Enable(false); + m_pPgBrkCB->Enable(false); + m_pPageCollCB->Enable(false); + m_pPageCollLB->Enable(false); } if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False, &pItem )) @@ -1661,8 +1661,8 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh) bHtmlMode = 0 != (::GetHtmlMode(pShell->GetView().GetDocShell()) & HTMLMODE_ON); if(bHtmlMode) { - m_pPageNoNF->Enable(sal_False); - m_pPageNoFT->Enable(sal_False); + m_pPageNoNF->Enable(false); + m_pPageNoFT->Enable(false); } } @@ -1692,14 +1692,14 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl) else { m_pPageCollCB->Check( sal_False ); - m_pPageCollCB->Enable(sal_False); - m_pPageCollLB->Enable(sal_False); - m_pPageNoFT->Enable(sal_False); - m_pPageNoNF->Enable(sal_False); - m_pPgBrkRB-> Enable(sal_False); - m_pColBrkRB-> Enable(sal_False); - m_pPgBrkBeforeRB-> Enable(sal_False); - m_pPgBrkAfterRB-> Enable(sal_False); + m_pPageCollCB->Enable(false); + m_pPageCollLB->Enable(false); + m_pPageNoFT->Enable(false); + m_pPageNoNF->Enable(false); + m_pPgBrkRB-> Enable(false); + m_pColBrkRB-> Enable(false); + m_pPgBrkBeforeRB-> Enable(false); + m_pPgBrkAfterRB-> Enable(false); } return 0; } @@ -1747,10 +1747,10 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn ) else if (pBtn == m_pPgBrkAfterRB) { m_pPageCollCB->Check( sal_False ); - m_pPageCollCB->Enable(sal_False); - m_pPageCollLB->Enable(sal_False); - m_pPageNoFT->Enable(sal_False); - m_pPageNoNF->Enable(sal_False); + m_pPageCollCB->Enable(false); + m_pPageCollLB->Enable(false); + m_pPageNoFT->Enable(false); + m_pPageNoNF->Enable(false); } } return 0; @@ -1761,10 +1761,10 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn ) if ( pBtn == m_pColBrkRB || m_pPgBrkAfterRB->IsChecked() ) { m_pPageCollCB->Check(sal_False); - m_pPageCollCB->Enable(sal_False); - m_pPageCollLB->Enable(sal_False); - m_pPageNoFT->Enable(sal_False); - m_pPageNoNF->Enable(sal_False); + m_pPageCollCB->Enable(false); + m_pPageCollLB->Enable(false); + m_pPageNoFT->Enable(false); + m_pPageNoNF->Enable(false); } else if ( m_pPgBrkBeforeRB->IsChecked() ) PageBreakPosHdl_Impl(m_pPgBrkBeforeRB); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index ce7566d22574..bdb1bf171cdb 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -319,7 +319,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl) m_pLbFormat->InsertEntry( aFormatName, nDfltStylePos + n ); m_pLbFormat->SelectEntryPos( nDfltStylePos + n ); bFmtInserted = true; - m_pBtnAdd->Enable( sal_False ); + m_pBtnAdd->Enable( false ); if ( !bCoreDataChanged ) { m_pBtnCancel->SetText( aStrClose ); @@ -364,8 +364,8 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl) if( !nIndex ) { - m_pBtnRemove->Enable(sal_False); - m_pBtnRename->Enable(sal_False); + m_pBtnRemove->Enable(false); + m_pBtnRename->Enable(false); } if( !bCoreDataChanged ) diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 72c80c3cd44f..b969162ce8a6 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1055,7 +1055,7 @@ void SwPagePreview::GetState( SfxItemSet& rSet ) break; case SID_PRINTPREVIEW: - rSet.Put( SfxBoolItem( nWhich, sal_True ) ); + rSet.Put( SfxBoolItem( nWhich, true ) ); break; case SID_PRINTDOC: diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index 6a1ef2338b8f..9ec9a41e9ec9 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -113,11 +113,11 @@ void SwScrollbar::AutoShow() if( nVis >= nLen - 1) { if(ScrollBar::IsVisible()) - ScrollBar::Show(sal_False); + ScrollBar::Show(false); } else if ( !ScrollBar::IsVisible() ) { - ScrollBar::Show(sal_True); + ScrollBar::Show(true); } } diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 10615b9ed5bd..29f001895aaa 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -269,7 +269,7 @@ void SwView::SelectShell() pBarCfg->SetTopToolbar( m_nSelectionType, nId ); SfxShell *pSfxShell; - for ( sal_uInt16 i = 0; sal_True; ++i ) + for ( sal_uInt16 i = 0; true; ++i ) { pSfxShell = rDispatcher.GetShell( i ); if ( pSfxShell->ISA( SwBaseShell ) @@ -959,7 +959,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_pWrtShell->GetDoc()->UpdateFlds(NULL, false); m_pWrtShell->EndAction(); } - m_pWrtShell->GetDoc()->SetUpdateExpFldStat( sal_False ); + m_pWrtShell->GetDoc()->SetUpdateExpFldStat( false ); } // Update all tables if necessary: @@ -967,7 +967,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) { SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() ); Execute( aSfxRequest ); - m_pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // reset again + m_pWrtShell->GetDoc()->SetUpdateTOX( false ); // reset again m_pWrtShell->SttEndDoc(sal_True); } @@ -993,7 +993,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) if( pDocSh->IsA(SwGlobalDocShell::StaticType()) && !pVFrame->GetChildWindow( SID_NAVIGATOR )) { - SfxBoolItem aNavi(SID_NAVIGATOR, sal_True); + SfxBoolItem aNavi(SID_NAVIGATOR, true); GetDispatcher().Execute(SID_NAVIGATOR, SFX_CALLMODE_ASYNCHRON, &aNavi, 0L); } diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 0e0953569bc2..4d66c6c325cc 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -335,7 +335,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) OSL_FAIL("control acces failed"); } - SFX_REQUEST_ARG( rReq, pName, SfxStringItem, SID_INSERT_GRAPHIC , sal_False ); + SFX_REQUEST_ARG( rReq, pName, SfxStringItem, SID_INSERT_GRAPHIC , false ); sal_Bool bShowError = !pName; if( pName || ERRCODE_NONE == pFileDlg->Execute() ) { @@ -344,7 +344,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) if ( pName ) { aFileName = pName->GetValue(); - SFX_REQUEST_ARG( rReq, pFilter, SfxStringItem, FN_PARAM_FILTER , sal_False ); + SFX_REQUEST_ARG( rReq, pFilter, SfxStringItem, FN_PARAM_FILTER , false ); if ( pFilter ) aFilterName = pFilter->GetValue(); } @@ -380,8 +380,8 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bAsLink ) ); } - SFX_REQUEST_ARG( rReq, pAsLink, SfxBoolItem, FN_PARAM_1 , sal_False ); - SFX_REQUEST_ARG( rReq, pStyle, SfxStringItem, FN_PARAM_2 , sal_False ); + SFX_REQUEST_ARG( rReq, pAsLink, SfxBoolItem, FN_PARAM_1 , false ); + SFX_REQUEST_ARG( rReq, pStyle, SfxStringItem, FN_PARAM_2 , false ); sal_Bool bAsLink = sal_False; if( nHtmlMode & HTMLMODE_ON ) @@ -812,7 +812,7 @@ void SwView::Execute(SfxRequest &rReq) } else { - SfxBoolItem aItem( SID_WIN_FULLSCREEN, sal_False ); + SfxBoolItem aItem( SID_WIN_FULLSCREEN, false ); GetViewFrame()->GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SFX_CALLMODE_RECORD, &aItem, 0L ); bIgnore = sal_True; } @@ -1293,7 +1293,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) if (m_nPageCnt != nCnt) // notify Basic { m_nPageCnt = nCnt; - SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_PAGE_COUNT, SwDocShell::GetEventName(STR_SW_EVENT_PAGE_COUNT), GetViewFrame()->GetObjectShell()), sal_False); + SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_PAGE_COUNT, SwDocShell::GetEventName(STR_SW_EVENT_PAGE_COUNT), GetViewFrame()->GetObjectShell()), false); } } break; @@ -2308,7 +2308,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) //to prevent creation of the dialog without mail merge active EnableMailMerge(); //then show the "Data base only" field dialog - SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, sal_True); + SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, true); pVFrame->GetDispatcher()->Execute(FN_INSERT_FIELD_DATA_ONLY, SFX_CALLMODE_SYNCHRON, &aOn, 0L); return; diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index 3fc492defb20..83c5d16c6aee 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -114,7 +114,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } else if (nSlotId == SID_FM_CREATE_CONTROL) { - SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, sal_False ); + SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, false ); if( pIdentifierItem ) { sal_uInt16 nNewId = pIdentifierItem->GetValue(); @@ -130,7 +130,7 @@ void SwView::ExecDraw(SfxRequest& rReq) FmFormView* pFormView = PTR_CAST( FmFormView, pSdrView ); if ( pFormView ) { - SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, sal_False ); + SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, false ); OSL_ENSURE( pDescriptorItem, "SwView::ExecDraw(SID_FM_CREATE_FIELDCONTROL): invalid request args!" ); if( pDescriptorItem ) { @@ -296,7 +296,7 @@ void SwView::ExecDraw(SfxRequest& rReq) case SID_FM_CREATE_CONTROL: { - SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, sal_False ); + SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, false ); if( pIdentifierItem ) nSlotId = pIdentifierItem->GetValue(); pFuncPtr = new ConstFormControl(m_pWrtShell, m_pEditWin, this); @@ -452,7 +452,7 @@ void SwView::NoRotate() m_pWrtShell->SetDragMode(SDRDRAG_MOVE); FlipDrawRotate(); - const SfxBoolItem aTmp( SID_OBJECT_ROTATE, sal_False ); + const SfxBoolItem aTmp( SID_OBJECT_ROTATE, false ); GetViewFrame()->GetBindings().SetState( aTmp ); } } @@ -483,7 +483,7 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos) !m_pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT)) { - bReturn = BeginTextEdit( pObj, pPV, m_pEditWin, sal_False ); + bReturn = BeginTextEdit( pObj, pPV, m_pEditWin, false ); } pSdrView->SetHitTolerancePixel( nOld ); diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 7c7dc1e2b351..efd72f062a69 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -1238,8 +1238,8 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) // scrolling the deltaX deltaY Point deltaPoint( deltaX, deltaY ); - CommandWheelData cmd( 0, 0, 0, COMMAND_WHEEL_SCROLL, 0, 0, true); - CommandEvent event(deltaPoint , COMMAND_WHEEL, sal_True, &cmd ); + CommandWheelData cmd( 0, 0, 0, COMMAND_WHEEL_SCROLL, 0, false, true); + CommandEvent event(deltaPoint , COMMAND_WHEEL, true, &cmd ); m_pEditWin->HandleScrollCommand(event, m_pHScrollbar, m_pVScrollbar); } diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 2c9d5eb41c03..38369d42bfcb 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -167,7 +167,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) if (!sFaxName.isEmpty()) { SfxStringItem aPrinterName(SID_PRINTER_NAME, sFaxName); - SfxBoolItem aSilent( SID_SILENT, sal_True ); + SfxBoolItem aSilent( SID_SILENT, true ); GetViewFrame()->GetDispatcher()->Execute( SID_PRINTDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aPrinterName, &aSilent, 0L ); @@ -191,9 +191,9 @@ void SwView::ExecutePrint(SfxRequest& rReq) case SID_PRINTDOCDIRECT: { SwWrtShell* pSh = &GetWrtShell(); - SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False); + SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, false); sal_Bool bSilent = pSilentItem ? pSilentItem->GetValue() : sal_False; - SFX_REQUEST_ARG(rReq, pPrintFromMergeItem, SfxBoolItem, FN_QRY_MERGE, sal_False); + SFX_REQUEST_ARG(rReq, pPrintFromMergeItem, SfxBoolItem, FN_QRY_MERGE, false); if(pPrintFromMergeItem) rReq.RemoveItem(FN_QRY_MERGE); sal_Bool bFromMerge = pPrintFromMergeItem ? pPrintFromMergeItem->GetValue() : sal_False; @@ -206,7 +206,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) short nRet = aBox.Execute(); if(RET_YES == nRet) { - SfxBoolItem aBool(FN_QRY_MERGE, sal_True); + SfxBoolItem aBool(FN_QRY_MERGE, true); GetViewFrame()->GetDispatcher()->Execute( FN_QRY_MERGE, SFX_CALLMODE_ASYNCHRON, &aBool, 0L); rReq.Ignore(); @@ -265,7 +265,7 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent, SfxAllItemSet aSet(*(rOptions.GetPool())); aSet.Put(SfxBoolItem(SID_PREVIEWFLAG_TYPE, bPreview)); - aSet.Put(SfxBoolItem(SID_FAX_LIST, sal_True)); + aSet.Put(SfxBoolItem(SID_FAX_LIST, true)); pPage->PageCreated(aSet); return pPage; } diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 138a54866432..7bf41a51d482 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -115,7 +115,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) { if(bApi) { - rReq.SetReturnValue(SfxBoolItem(nSlot, sal_False)); + rReq.SetReturnValue(SfxBoolItem(nSlot, false)); nSlot = 0; } } @@ -312,7 +312,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) case SVX_SEARCHCMD_REPLACE_ALL: { SwSearchOptions aOpts( m_pWrtShell, m_pSrchItem->GetBackward() ); - m_bExtra = sal_False; + m_bExtra = false; sal_uLong nFound; { //Scope for SwWait-Object @@ -380,7 +380,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) GetViewFrame()->GetBindings().GetRecorder(); //prevent additional dialogs in recorded macros if ( xRecorder.is() ) - rReq.AppendItem(SfxBoolItem(SID_SEARCH_QUIET, sal_True)); + rReq.AppendItem(SfxBoolItem(SID_SEARCH_QUIET, true)); rReq.Done(); } @@ -857,10 +857,10 @@ void SwView::StateSearch(SfxItemSet &rSet) !( aTxt = m_pWrtShell->SwCrsrShell::GetSelTxt() ).isEmpty() ) { m_pSrchItem->SetSearchString( aTxt ); - m_pSrchItem->SetSelection( sal_False ); + m_pSrchItem->SetSelection( false ); } else - m_pSrchItem->SetSelection( sal_True ); + m_pSrchItem->SetSelection( true ); } m_bJustOpened = false; diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index bbc915c4e282..7ee9cdb84c24 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -185,7 +185,7 @@ void SwView::GetState(SfxItemSet &rSet) if(m_pWrtShell->IsInVerticalText()) aImgItem.SetRotation(2700); if(m_pWrtShell->IsInRightToLeftText()) - aImgItem.SetMirrored(sal_True); + aImgItem.SetMirrored(true); } rSet.Put(aImgItem); } @@ -207,7 +207,7 @@ void SwView::GetState(SfxItemSet &rSet) if (m_pWrtShell->IsInVerticalText()) aImgItem.SetRotation(2700); if (m_pWrtShell->IsInRightToLeftText()) - aImgItem.SetMirrored(sal_True); + aImgItem.SetMirrored(true); } rSet.Put(aImgItem); } @@ -368,7 +368,7 @@ void SwView::GetState(SfxItemSet &rSet) if(m_pWrtShell->IsInVerticalText()) aImageItem.SetRotation( 2700 ); if(m_pWrtShell->IsInRightToLeftText()) - aImageItem.SetMirrored( sal_True ); + aImageItem.SetMirrored( true ); rSet.Put(aImageItem); } break; diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index 2ca1fbf9d108..df5334181948 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -884,13 +884,13 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf break; case HANDLE_PRINTER_NAME: { - SfxPrinter *pPrinter = mpDoc->getPrinter( sal_False ); + SfxPrinter *pPrinter = mpDoc->getPrinter( false ); rValue <<= pPrinter ? OUString ( pPrinter->GetName()) : OUString(); } break; case HANDLE_PRINTER_SETUP: { - SfxPrinter *pPrinter = mpDoc->getPrinter( sal_False ); + SfxPrinter *pPrinter = mpDoc->getPrinter( false ); if (pPrinter) { SvMemoryStream aStream; diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 81a0f11403eb..d62a6b0ada46 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -159,7 +159,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor SfxApplication* pApp = SFX_APP(); SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() ); TransformParameters( SID_OPENDOC, lDescriptor, *pSet ); - SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, sal_False ); + SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, false ); bWasReadOnly = pItem && pItem->GetValue(); diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index eaea948e8433..205bf031fc53 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -126,7 +126,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) uno::Reference< text::XAutoTextGroup > xGroup; if ( pGlossaries && hasByName( GroupName ) ) // group name already known? // sal_True = create group if not already available - xGroup = pGlossaries->GetAutoTextGroup( GroupName, sal_True ); + xGroup = pGlossaries->GetAutoTextGroup( GroupName, true ); if ( !xGroup.is() ) throw container::NoSuchElementException(); @@ -807,7 +807,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) { if(SFX_EVENT_PREPARECLOSEDOC == static_cast< const SfxEventHint& >( _rHint ).GetEventId()) { - implFlushDocument( sal_False ); + implFlushDocument( false ); xBodyText = 0; xDocSh.Clear(); } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 67086b3275cb..7088968999d9 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1140,7 +1140,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption SfxViewFrame* pFrame = SfxViewFrame::LoadHiddenDocument( *pDocShell, 7 ); SfxRequest aReq(FN_PRINT_PAGEPREVIEW, SFX_CALLMODE_SYNCHRON, pDocShell->GetDoc()->GetAttrPool()); - aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, sal_True)); + aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, true)); for ( int n = 0; n < xOptions.getLength(); ++n ) { @@ -3016,7 +3016,7 @@ void SAL_CALL SwXTextDocument::render( if (bIsPDFExport && bFirstPage && pWrtShell) { - SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_False ); + SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, false ); } SwPrintData const& rSwPrtOptions = @@ -3034,7 +3034,7 @@ void SAL_CALL SwXTextDocument::render( // if (bIsPDFExport && bLastPage && pWrtShell) { - SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_True ); + SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, true ); } pVwSh->SetPDFExportOption( sal_False ); @@ -3058,7 +3058,7 @@ void SAL_CALL SwXTextDocument::render( // prevent crash described in #i108805 SwDocShell *pRenderDocShell = pDoc->GetDocShell(); SfxItemSet *pSet = pRenderDocShell->GetMedium()->GetItemSet(); - pSet->Put( SfxBoolItem( SID_HIDDEN, sal_False ) ); + pSet->Put( SfxBoolItem( SID_HIDDEN, false ) ); } } diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 35e7b7285bae..efc49d617b70 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -1942,7 +1942,7 @@ bool SwContentTree::ToggleToRoot() { HideFocus(); ShowFocus( oldRectangle); - bIsKeySpace = sal_False; + bIsKeySpace = false; } } pConfig->SetRootType( nRootType ); @@ -2142,7 +2142,7 @@ bool SwContentTree::HasContentChanged() } if(!nChildCount) { - pEntry->EnableChildrenOnDemand(sal_False); + pEntry->EnableChildrenOnDemand(false); InvalidateEntry(pEntry); } @@ -2653,7 +2653,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) SvTreeListEntry* pEntry = GetCurEntry(); if( GetChildCount( pEntry ) == 0 ) - bIsKeySpace = sal_True; + bIsKeySpace = true; Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration oldRectangle = GetFocusRect( pEntry,tempPoint.Y() ); @@ -2755,7 +2755,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) } - bViewHasChanged = sal_True; + bViewHasChanged = true; } } diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index a82f7d1a46f2..a931580c934a 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -1178,7 +1178,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) if(!bFound) { SfxStringItem aURL(SID_FILE_NAME, sFileName); - SfxBoolItem aReadOnly(SID_DOC_READONLY, sal_False); + SfxBoolItem aReadOnly(SID_DOC_READONLY, false); SfxStringItem aTargetFrameName( SID_TARGETNAME, "_blank" ); SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle()); pActiveShell->GetView().GetViewFrame()->GetDispatcher()-> diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index a35495907eb6..09df3cd4a85a 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -155,7 +155,7 @@ void SwNavigationPI::FillBox() if(pContentWrtShell) { aContentTree.SetHiddenShell( pContentWrtShell ); - aContentTree.Display( sal_False ); + aContentTree.Display( false ); } else { @@ -170,7 +170,7 @@ void SwNavigationPI::FillBox() aContentTree.SetActiveShell(pWrtShell); } else - aContentTree.Display( sal_True ); + aContentTree.Display( true ); pActContView = pView; } } diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 6f54165addf7..1523fe512582 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -31,7 +31,7 @@ PercentField::PercentField() , nLastValue(-1) , nOldDigits(0) , eOldUnit(FUNIT_NONE) - , bLockAutoCalculation(sal_False) + , bLockAutoCalculation(false) { } diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 1fad9cdbf6f9..2e0a8312b9c9 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -72,7 +72,7 @@ SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, m_pOk->SetClickHdl(LINK(this, SwRenameXNamedDlg, OkHdl)); m_pNewNameED->SetModifyHdl(LINK(this, SwRenameXNamedDlg, ModifyHdl)); - m_pOk->Enable(sal_False); + m_pOk->Enable(false); } IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl) diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 870f752432bc..1b9309eda652 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -458,7 +458,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) 0); // Dynamic or fixed height - SfxBoolItem aOn(SID_ATTR_PAGE_ON, sal_True); + SfxBoolItem aOn(SID_ATTR_PAGE_ON, true); aHeaderSet.Put(aOn); const SwFmtFrmSize &rFrmSize = pHeaderFmt->GetFrmSize(); @@ -502,7 +502,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) 0); // Dynamic or fixed height - SfxBoolItem aOn(SID_ATTR_PAGE_ON, sal_True); + SfxBoolItem aOn(SID_ATTR_PAGE_ON, true); aFooterSet.Put(aOn); const SwFmtFrmSize &rFrmSize = pFooterFmt->GetFrmSize(); diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx index 60098a6378df..838e29eee56b 100644 --- a/sw/source/ui/vba/vbainformationhelper.cxx +++ b/sw/source/ui/vba/vbainformationhelper.cxx @@ -53,7 +53,7 @@ double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css sal_Int32 nCurrentPage = handleWdActiveEndPageNumber( xTVCursor ); SwDoc* pDoc = word::getDocShell( xModel )->GetDoc(); SwViewShell* pViewSh = pDoc->GetCurrentViewShell(); - sal_Int32 nPageHeight = pViewSh ? pViewSh->GetPageSize( nCurrentPage, sal_False ).Height() : 0; + sal_Int32 nPageHeight = pViewSh ? pViewSh->GetPageSize( nCurrentPage, false ).Height() : 0; // FIXME: handle multipul page style // it is very strange that the curros position is incorrect when open Word file. // e.g. if current cursor in the top left of the text body of the first page without header, diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index b98d4207b3ff..785e5e23278b 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -62,7 +62,7 @@ SwVbaRevision::Accept() throw ( css::uno::RuntimeException ) { SwDoc* pDoc = word::getDocShell( mxModel )->GetDoc(); if( pDoc ) - pDoc->AcceptRedline( GetPosition(), sal_True ); + pDoc->AcceptRedline( GetPosition(), true ); } void SAL_CALL @@ -70,7 +70,7 @@ SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException ) { SwDoc* pDoc = word::getDocShell( mxModel )->GetDoc(); if( pDoc ) - pDoc->RejectRedline( GetPosition(), sal_True ); + pDoc->RejectRedline( GetPosition(), true ); } OUString diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 6b06b6a3fa8f..9b1e5530e838 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -116,7 +116,7 @@ OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol ) break; nCol /= coDiff; --nCol; - }while(1); + }while(true); return sRet; } diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index e60cfa0fa884..ee71392215f7 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -131,7 +131,7 @@ void SwWebView::SelectShell() SfxShell *pSfxShell; sal_uInt16 i; - for ( i = 0; sal_True; ++i ) + for ( i = 0; true; ++i ) { pSfxShell = rDispatcher.GetShell( i ); if ( !( pSfxShell->ISA( SwBaseShell ) || diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 68811c399b2b..d29aac7dfc5a 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -88,7 +88,7 @@ void SwWrtShell::Insert(SwField &rFld) // - collapse cursor to its end if ( IsTableMode() ) { - GetTblCrs()->Normalize( sal_False ); + GetTblCrs()->Normalize( false ); const SwPosition rStartPos( *(GetTblCrs()->GetMark()->nNode.GetNode().GetCntntNode()), 0 ); KillPams(); EndPara(); @@ -459,9 +459,9 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, SfxStringItem aTargetFrameName( SID_TARGETNAME, sTargetFrame ); SfxStringItem aReferer( SID_REFERER, sReferer ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_False ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, false ); //#39076# Silent can be removed accordingly to SFX. - SfxBoolItem aBrowse( SID_BROWSE, sal_True ); + SfxBoolItem aBrowse( SID_BROWSE, true ); if( nFilter & URLLOAD_NEWVIEW ) aTargetFrameName.SetValue( OUString("_blank") ); |