diff options
-rw-r--r-- | sw/inc/doc.hxx | 20 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 4 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/SwNumberTree/SwNodeNum.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docfly.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/doc/docfmt.cxx | 26 | ||||
-rw-r--r-- | sw/source/core/doc/docnum.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docruby.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/edatmisc.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/edfmt.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/undo/SwUndoFmt.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/undo/unattr.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/undo/unspnd.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unochart.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 20 | ||||
-rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/unocore/unoobj.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/unocore/unoparagraph.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/shells/drwbassh.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/content.cxx | 8 |
23 files changed, 79 insertions, 79 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 88f13a827cad..2e7357c47784 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1175,10 +1175,10 @@ public: Introduce new optional parameter <bSendDataChangedEvents> in order to control, if the side effect "send data changed events" is triggered or not. */ void ResetAttrs( const SwPaM &rRg, - sal_Bool bTxtAttr = sal_True, + bool bTxtAttr = true, const std::set<sal_uInt16> &rAttrs = std::set<sal_uInt16>(), const bool bSendDataChangedEvents = true ); - void RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark = sal_False ); + void RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark = false ); /** Set attribute in given format. If Undo is activated, the old one is listed in Undo-History. */ @@ -1226,15 +1226,15 @@ public: SwFrmFmt *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom, sal_Bool bBroadcast = sal_False, sal_Bool bAuto = sal_True); - void DelFrmFmt( SwFrmFmt *pFmt, sal_Bool bBroadcast = sal_False ); + void DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false ); SwFrmFmt* FindFrmFmtByName( const String& rName ) const { return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*pFrmFmtTbl, rName ); } SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom, sal_Bool bBroadcast = sal_False, sal_Bool bAuto = sal_True ); - void DelCharFmt(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False); - void DelCharFmt(SwCharFmt* pFmt, sal_Bool bBroadcast = sal_False); + void DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false); + void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false); SwCharFmt* FindCharFmtByName( const String& rName ) const { return (SwCharFmt*)FindFmtByName( (SwFmtsBase&)*pCharFmtTbl, rName ); } @@ -1276,8 +1276,8 @@ public: /// Table formating const SwFrmFmts* GetTblFrmFmts() const { return pTblFrmFmtTbl; } SwFrmFmts* GetTblFrmFmts() { return pTblFrmFmtTbl; } - sal_uInt16 GetTblFrmFmtCount( sal_Bool bUsed ) const; - SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const; + sal_uInt16 GetTblFrmFmtCount( bool bUsed ) const; + SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const; SwTableFmt* MakeTblFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom); void DelTblFrmFmt( SwTableFmt* pFmt ); SwTableFmt* FindTblFmtByName( const String& rName, sal_Bool bAll = sal_False ) const; @@ -1887,10 +1887,10 @@ public: // -------------------- FeShell - Interfaces ----------------------- // !!! These assume always an existing layout !!! - sal_Bool ChgAnchor( const SdrMarkList& _rMrkList, + bool ChgAnchor( const SdrMarkList& _rMrkList, RndStdIds _eAnchorType, - const sal_Bool _bSameOnly, - const sal_Bool _bPosCorr ); + const bool _bSameOnly, + const bool _bPosCorr ); void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew ); void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index ba5fcbd3d133..3b1c1bb5b0bd 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -296,8 +296,8 @@ public: sal_uInt16 GetCurLang() const; /// TABLE - sal_uInt16 GetTblFrmFmtCount( sal_Bool bUsed = sal_False ) const; - SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed = sal_False ) const; + sal_uInt16 GetTblFrmFmtCount( bool bUsed = false ) const; + SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed = false ) const; String GetUniqueTblName() const; /// CHAR diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 81ebaae7c193..6c8faeee8475 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -508,8 +508,8 @@ public: /** frmatr.hxx. Here no enum because of dependencies. bool value only for internal use! Anchor is newly set according to current document position. Anchor is not re-set. */ - void ChgAnchor( int eAnchorId, sal_Bool bSameOnly = sal_False, - sal_Bool bPosCorr = sal_True ); + void ChgAnchor( int eAnchorId, bool bSameOnly = false, + bool bPosCorr = true ); sal_Bool SetDrawingAttr( SfxItemSet &rSet ); diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index 51c43b20d381..c2def731581b 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -378,7 +378,7 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ) aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ISCOUNTED ); aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_NUMRULE ); SwPaM aPam( *pTxtNode ); - pTxtNode->GetDoc()->ResetAttrs( aPam, sal_False, + pTxtNode->GetDoc()->ResetAttrs( aPam, false, aResetAttrsArray, false ); } diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 203426d7d107..dce06ddebc8a 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -602,10 +602,10 @@ void SwDoc::GetGrfNms( const SwFlyFrmFmt& rFmt, String* pGrfName, pGrfNd->GetFileFilterNms( pGrfName, pFltName ); } -sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, +bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, RndStdIds _eAnchorType, - const sal_Bool _bSameOnly, - const sal_Bool _bPosCorr ) + const bool _bSameOnly, + const bool _bPosCorr ) { OSL_ENSURE( GetCurrentLayout(), "No layout!" ); @@ -617,7 +617,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, GetIDocumentUndoRedo().StartUndo( UNDO_INSATTR, NULL ); - sal_Bool bUnmark = sal_False; + bool bUnmark = false; for ( sal_uInt16 i = 0; i < _rMrkList.GetMarkCount(); ++i ) { SdrObject* pObj = _rMrkList.GetMark( i )->GetMarkedSdrObj(); @@ -912,13 +912,13 @@ int SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest ) const SwFmtAnchor &rSrcAnchor = rSource.GetAnchor(), &rDstAnchor = rDest.GetAnchor(); sal_uLong nEndOfExtras = GetNodes().GetEndOfExtras().GetIndex(); - sal_Bool bAllowed = sal_False; + bool bAllowed = false; if ( FLY_AT_PAGE == rSrcAnchor.GetAnchorId() ) { if ( (FLY_AT_PAGE == rDstAnchor.GetAnchorId()) || ( rDstAnchor.GetCntntAnchor() && rDstAnchor.GetCntntAnchor()->nNode.GetIndex() > nEndOfExtras )) - bAllowed = sal_True; + bAllowed = true; } else if( rSrcAnchor.GetCntntAnchor() && rDstAnchor.GetCntntAnchor() ) { @@ -937,7 +937,7 @@ int SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest ) pSttNd == rDstIdx.GetNode().FindHeaderStartNode() ) || ( !pSttNd && rDstIdx.GetIndex() > nEndOfExtras && rSrcIdx.GetIndex() > nEndOfExtras )) - bAllowed = sal_True; + bAllowed = true; } return bAllowed ? SW_CHAIN_OK : SW_CHAIN_WRONG_AREA; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index dfaaffc56c1a..93e6faf43a71 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -310,7 +310,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) return true; } -void SwDoc::RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark ) +void SwDoc::RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark ) { SwHistory* pHst = 0; SwDataChanged aTmp( rRg ); @@ -322,20 +322,20 @@ void SwDoc::RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark ) } const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End(); ParaRstFmt aPara( pStt, pEnd, pHst ); - aPara.bInclRefToxMark = ( bInclRefToxMark == sal_True ); + aPara.bInclRefToxMark = bInclRefToxMark; GetNodes().ForEach( pStt->nNode.GetIndex(), pEnd->nNode.GetIndex()+1, lcl_RstTxtAttr, &aPara ); SetModified(); } void SwDoc::ResetAttrs( const SwPaM &rRg, - sal_Bool bTxtAttr, + bool bTxtAttr, const std::set<sal_uInt16> &rAttrs, const bool bSendDataChangedEvents ) { SwPaM* pPam = (SwPaM*)&rRg; if( !bTxtAttr && !rAttrs.empty() && RES_TXTATR_END > *(rAttrs.begin()) ) - bTxtAttr = sal_True; + bTxtAttr = true; if( !rRg.HasMark() ) { @@ -433,7 +433,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, aPara.pDelSet = &aDelSet; } - sal_Bool bAdd = sal_True; + bool bAdd = true; SwNodeIndex aTmpStt( pStt->nNode ); SwNodeIndex aTmpEnd( pEnd->nNode ); if( pStt->nContent.GetIndex() ) // just one part @@ -457,7 +457,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, } if( pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len() ) // set up a later, and all CharFmtAttr -> TxtFmtAttr - aTmpEnd++, bAdd = sal_False; + aTmpEnd++, bAdd = false; else if( pStt->nNode != pEnd->nNode || !pStt->nContent.GetIndex() ) { SwTxtNode* pTNd = aTmpEnd.GetNode().GetTxtNode(); @@ -971,7 +971,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet, pDoc->GetNodes().ForEach( aSt, aEnd, lcl_RstTxtAttr, &aPara ); } - sal_Bool bCreateSwpHints = pCharSet && ( + bool bCreateSwpHints = pCharSet && ( SFX_ITEM_SET == pCharSet->GetItemState( RES_TXTATR_CHARFMT, sal_False ) || SFX_ITEM_SET == pCharSet->GetItemState( RES_TXTATR_INETFMT, sal_False ) ); @@ -1167,7 +1167,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet ) SfxItemPool* pSdrPool = GetAttrPool().GetSecondaryPool(); while( sal_True ) { - sal_Bool bCheckSdrDflt = sal_False; + bool bCheckSdrDflt = false; nWhich = pItem->Which(); aOld.Put( GetAttrPool().GetDefaultItem( nWhich ) ); GetAttrPool().SetPoolDefaultItem( *pItem ); @@ -1282,7 +1282,7 @@ const SfxPoolItem& SwDoc::GetDefault( sal_uInt16 nFmtHint ) const /* * Delete the formats */ -void SwDoc::DelCharFmt(sal_uInt16 nFmt, sal_Bool bBroadcast) +void SwDoc::DelCharFmt(sal_uInt16 nFmt, bool bBroadcast) { SwCharFmt * pDel = (*pCharFmtTbl)[nFmt]; @@ -1304,14 +1304,14 @@ void SwDoc::DelCharFmt(sal_uInt16 nFmt, sal_Bool bBroadcast) SetModified(); } -void SwDoc::DelCharFmt( SwCharFmt *pFmt, sal_Bool bBroadcast ) +void SwDoc::DelCharFmt( SwCharFmt *pFmt, bool bBroadcast ) { sal_uInt16 nFmt = pCharFmtTbl->GetPos( pFmt ); OSL_ENSURE( USHRT_MAX != nFmt, "Fmt not found," ); DelCharFmt( nFmt, bBroadcast ); } -void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, sal_Bool bBroadcast ) +void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast ) { if( pFmt->ISA( SwTableBoxFmt ) || pFmt->ISA( SwTableLineFmt )) { @@ -1384,7 +1384,7 @@ SwDrawFrmFmt *SwDoc::MakeDrawFrmFmt( const String &rFmtName, } -sal_uInt16 SwDoc::GetTblFrmFmtCount(sal_Bool bUsed) const +sal_uInt16 SwDoc::GetTblFrmFmtCount(bool bUsed) const { sal_uInt16 nCount = pTblFrmFmtTbl->size(); if(bUsed) @@ -1401,7 +1401,7 @@ sal_uInt16 SwDoc::GetTblFrmFmtCount(sal_Bool bUsed) const } -SwFrmFmt& SwDoc::GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const +SwFrmFmt& SwDoc::GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const { sal_uInt16 nRemoved = 0; if(bUsed) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 4e0d3c118c78..b36437e111ea 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -80,11 +80,11 @@ namespace { rPam.End()->nNode ); aPam.Start()->nContent = 0; aPam.End()->nContent = rPam.End()->nNode.GetNode().GetTxtNode()->Len(); - pDoc->ResetAttrs( aPam, sal_False, aResetAttrsArray ); + pDoc->ResetAttrs( aPam, false, aResetAttrsArray ); } else { - pDoc->ResetAttrs( rPam, sal_False, aResetAttrsArray ); + pDoc->ResetAttrs( rPam, false, aResetAttrsArray ); } } } diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 4513f580640b..fc4b0faaaf37 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -143,7 +143,7 @@ sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, } else { - ResetAttrs( aPam, sal_True, aDelArr ); + ResetAttrs( aPam, true, aDelArr ); } } diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx index 56dfdffcf1e7..5f66a04ecad9 100644 --- a/sw/source/core/edit/edatmisc.cxx +++ b/sw/source/core/edit/edatmisc.cxx @@ -56,7 +56,7 @@ void SwEditShell::ResetAttr( const std::set<sal_uInt16> &attrs, SwPaM* pPaM ) SwPaM* pStartCrsr = pCrsr; do { - GetDoc()->ResetAttrs(*pCrsr, sal_True, attrs); + GetDoc()->ResetAttrs(*pCrsr, true, attrs); } while ( ( pCrsr = ( SwPaM* ) pCrsr->GetNext() ) != pStartCrsr ); if( bUndoGroup ) diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index 38ba4be3720e..e47e68ffe4cc 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -123,12 +123,12 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, sal_Bool bReset) } // Frm -sal_uInt16 SwEditShell::GetTblFrmFmtCount(sal_Bool bUsed) const +sal_uInt16 SwEditShell::GetTblFrmFmtCount(bool bUsed) const { return GetDoc()->GetTblFrmFmtCount(bUsed); } -SwFrmFmt& SwEditShell::GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const +SwFrmFmt& SwEditShell::GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const { return GetDoc()->GetTblFrmFmt(nFmt, bUsed ); } diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 04b8ee292909..84f8d9a2a64c 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -690,7 +690,7 @@ long SwFEShell::EndDrag( const Point *, sal_Bool ) // DrawUndo on to flyframes are not stored // The flys change the flag. GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(true); - ChgAnchor( 0, sal_True ); + ChgAnchor( 0, true ); EndUndo( UNDO_END ); @@ -2115,7 +2115,7 @@ short SwFEShell::GetAnchorId() const |* *************************************************************************/ -void SwFEShell::ChgAnchor( int eAnchorId, sal_Bool bSameOnly, sal_Bool bPosCorr ) +void SwFEShell::ChgAnchor( int eAnchorId, bool bSameOnly, bool bPosCorr ) { OSL_ENSURE( Imp()->HasDrawView(), "ChgAnchor without DrawView?" ); const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 7975b17bdbc8..83ef8f6425e8 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3376,7 +3376,7 @@ namespace { SwPaM aPam( rTxtNode ); // #i96644# // suppress side effect "send data changed events" - rTxtNode.GetDoc()->ResetAttrs( aPam, sal_False, aAttrs, false ); + rTxtNode.GetDoc()->ResetAttrs( aPam, false, aAttrs, false ); } // Helper method for special handling of modified attributes at text node. diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx index 3dfb373cb3d6..b2d8bab7888e 100644 --- a/sw/source/core/undo/SwUndoFmt.cxx +++ b/sw/source/core/undo/SwUndoFmt.cxx @@ -270,7 +270,7 @@ SwFmt * SwUndoCharFmtCreate::Create(SwFmt * pDerivedFrom) void SwUndoCharFmtCreate::Delete() { - pDoc->DelCharFmt((SwCharFmt *) pNew, sal_True); + pDoc->DelCharFmt((SwCharFmt *) pNew, true); } SwFmt * SwUndoCharFmtCreate::Find(const String & rName) const @@ -290,7 +290,7 @@ SwFmt * SwUndoCharFmtDelete::Create(SwFmt * pDerivedFrom) void SwUndoCharFmtDelete::Delete(SwFmt * pFmt) { - pDoc->DelCharFmt((SwCharFmt *) pFmt, sal_True); + pDoc->DelCharFmt((SwCharFmt *) pFmt, true); } SwFmt * SwUndoCharFmtDelete::Find(const String & rName) const @@ -325,7 +325,7 @@ SwFmt * SwUndoFrmFmtCreate::Create(SwFmt * pDerivedFrom) void SwUndoFrmFmtCreate::Delete() { - pDoc->DelFrmFmt((SwFrmFmt *) pNew, sal_True); + pDoc->DelFrmFmt((SwFrmFmt *) pNew, true); } SwFmt * SwUndoFrmFmtCreate::Find(const String & rName) const @@ -345,7 +345,7 @@ SwFmt * SwUndoFrmFmtDelete::Create(SwFmt * pDerivedFrom) void SwUndoFrmFmtDelete::Delete(SwFmt * pFmt) { - pDoc->DelFrmFmt((SwFrmFmt *) pFmt, sal_True); + pDoc->DelFrmFmt((SwFrmFmt *) pFmt, true); } SwFmt * SwUndoFrmFmtDelete::Find(const String & rName) const diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 1dbce4397ffc..d8efc07fe0b2 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -674,10 +674,10 @@ void SwUndoResetAttr::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.RstTxtAttrs(rPam); break; case RES_TXTFMTCOLL: - rDoc.ResetAttrs(rPam, sal_False, m_Ids ); + rDoc.ResetAttrs(rPam, false, m_Ids ); break; case RES_CONDTXTFMTCOLL: - rDoc.ResetAttrs(rPam, sal_True, m_Ids ); + rDoc.ResetAttrs(rPam, true, m_Ids ); break; case RES_TXTATR_TOXMARK: diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index 5fb481478a57..c10122336866 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -141,7 +141,7 @@ void SwUndoSplitNode::UndoImpl(::sw::UndoRedoContext & rContext) rPam.SetMark(); rPam.GetPoint()->nContent = pTNd->GetTxt().Len(); - pDoc->RstTxtAttrs( rPam, sal_True ); + pDoc->RstTxtAttrs( rPam, true ); pHistory->TmpRollback( pDoc, 0, false ); } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 8e3bca554c66..9ba30bdc2440 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -372,10 +372,10 @@ static void GetTableByName( const SwDoc &rDoc, const String &rTableName, // find frame format of table //! see SwXTextTables::getByName - sal_uInt16 nCount = rDoc.GetTblFrmFmtCount(sal_True); + sal_uInt16 nCount = rDoc.GetTblFrmFmtCount(true); for (sal_uInt16 i = 0; i < nCount && !pTblFmt; ++i) { - SwFrmFmt& rTblFmt = rDoc.GetTblFrmFmt(i, sal_True); + SwFrmFmt& rTblFmt = rDoc.GetTblFrmFmt(i, true); if(rTableName == rTblFmt.GetName()) pTblFmt = &rTblFmt; } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 912bc40cef3b..95fac205454e 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -878,7 +878,7 @@ sal_Int32 SwXTextTables::getCount(void) throw( uno::RuntimeException ) SolarMutexGuard aGuard; sal_Int32 nRet = 0; if(IsValid()) - nRet = GetDoc()->GetTblFrmFmtCount(sal_True); + nRet = GetDoc()->GetTblFrmFmtCount(true); return nRet; } @@ -889,9 +889,9 @@ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex) uno::Any aRet; if(IsValid()) { - if(0 <= nIndex && GetDoc()->GetTblFrmFmtCount(sal_True) > nIndex) + if(0 <= nIndex && GetDoc()->GetTblFrmFmtCount(true) > nIndex) { - SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt( static_cast< xub_StrLen >(nIndex), sal_True); + SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt( static_cast< xub_StrLen >(nIndex), true); uno::Reference< XTextTable > xTbl = SwXTextTables::GetObject(rFmt); aRet.setValue( &xTbl, ::getCppuType((uno::Reference< XTextTable>*)0)); @@ -911,12 +911,12 @@ uno::Any SwXTextTables::getByName(const OUString& rItemName) uno::Any aRet; if(IsValid()) { - sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(sal_True); + sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(true); uno::Reference< XTextTable > xTbl; for( sal_uInt16 i = 0; i < nCount; i++) { String aName(rItemName); - SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, sal_True); + SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, true); if(aName == rFmt.GetName()) { xTbl = SwXTextTables::GetObject(rFmt); @@ -939,14 +939,14 @@ uno::Sequence< OUString > SwXTextTables::getElementNames(void) SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); - sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(sal_True); + sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(true); uno::Sequence<OUString> aSeq(nCount); if(nCount) { OUString* pArray = aSeq.getArray(); for( sal_uInt16 i = 0; i < nCount; i++) { - SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, sal_True); + SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, true); pArray[i] = OUString(rFmt.GetName()); } @@ -961,11 +961,11 @@ sal_Bool SwXTextTables::hasByName(const OUString& rName) sal_Bool bRet= sal_False; if(IsValid()) { - sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(sal_True); + sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(true); for( sal_uInt16 i = 0; i < nCount; i++) { String aName(rName); - SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, sal_True); + SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, true); if(aName == rFmt.GetName()) { bRet = sal_True; @@ -990,7 +990,7 @@ sal_Bool SwXTextTables::hasElements(void) throw( uno::RuntimeException ) SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); - return 0 != GetDoc()->GetTblFrmFmtCount(sal_True); + return 0 != GetDoc()->GetTblFrmFmtCount(true); } OUString SwXTextTables::getImplementationName(void) throw( uno::RuntimeException ) diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 7d673108ea6a..55127b130112 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -765,7 +765,7 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa { std::set<sal_uInt16> aWhichIds; aWhichIds.insert( RES_TXTATR_CHARFMT); - pDoc->ResetAttrs(rPam, sal_True, aWhichIds); + pDoc->ResetAttrs(rPam, true, aWhichIds); } break; } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 8605b97bdf11..f3e87cba0925 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -790,7 +790,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkedObjectList(), FLY_AT_PARA/*int eAnchorId*/, - sal_True, sal_False ); + true, false ); pPage->GetDrawView()->UnmarkAll(); if(pContact) @@ -824,7 +824,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG pDoc->UnGroupSelection( *pPage->GetDrawView() ); pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkedObjectList(), FLY_AT_PARA/*int eAnchorId*/, - sal_True, sal_False ); + true, false ); pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); } pPage->RemovePageView(); @@ -1257,7 +1257,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A sal_Int32 nAnchor = 0; cppu::enum2int( nAnchor, aValue ); pDoc->ChgAnchor( aList, (RndStdIds)nAnchor, - sal_False, sal_True ); + false, true ); } else { diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index d85983f2216d..c3a74f28504d 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -2048,7 +2048,7 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc, { pTemp->MovePara(fnParaCurr, fnParaEnd); } - rDoc.ResetAttrs(*pTemp, sal_True, rWhichIds); + rDoc.ResetAttrs(*pTemp, true, rWhichIds); } void SwUnoCursorHelper::SetPropertyToDefault( @@ -2079,7 +2079,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) aWhichIds.insert( pEntry->nWID ); if (pEntry->nWID < RES_PARATR_BEGIN) { - rDoc.ResetAttrs(rPaM, sal_True, aWhichIds); + rDoc.ResetAttrs(rPaM, true, aWhichIds); } else { @@ -2346,7 +2346,7 @@ throw (uno::RuntimeException) } if (!aWhichIds.empty()) { - rUnoCursor.GetDoc()->ResetAttrs(rUnoCursor, sal_True, aWhichIds); + rUnoCursor.GetDoc()->ResetAttrs(rUnoCursor, true, aWhichIds); } } @@ -2416,7 +2416,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) } if (!aWhichIds.empty()) { - rDoc.ResetAttrs(rUnoCursor, sal_True, aWhichIds); + rDoc.ResetAttrs(rUnoCursor, true, aWhichIds); } } } diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 278202f86b4f..9041348eaa76 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -1018,7 +1018,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) aWhichIds.insert( pEntry->nWID ); if (pEntry->nWID < RES_PARATR_BEGIN) { - aCursor.GetDoc()->ResetAttrs(aCursor, sal_True, aWhichIds); + aCursor.GetDoc()->ResetAttrs(aCursor, true, aWhichIds); } else { @@ -1040,7 +1040,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) { pTemp->MovePara(fnParaCurr, fnParaEnd); } - pTemp->GetDoc()->ResetAttrs(*pTemp, sal_True, aWhichIds); + pTemp->GetDoc()->ResetAttrs(*pTemp, true, aWhichIds); } } else diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 69e7bed8b5fe..1db86541c8ca 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -282,7 +282,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) if (bCaption) pSdrView->SetAttributes(*pOutSet); - sal_Bool bPosCorr = + bool bPosCorr = SFX_ITEM_SET != pOutSet->GetItemState( SID_ATTR_TRANSFORM_POS_X, sal_False ) && SFX_ITEM_SET != pOutSet->GetItemState( @@ -298,7 +298,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) { if(!bSingleSelection) pSh->ChgAnchor(((const SfxInt16Item*)pAnchorItem) - ->GetValue(), sal_False, bPosCorr ); + ->GetValue(), false, bPosCorr ); else { SwFmtAnchor aAnchor(pFrmFmt->GetAnchor()); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index fdf845e8397a..86f8718c62b6 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -246,7 +246,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) case CONTENT_TYPE_TABLE : sTypeToken = rtl::OUString::createFromAscii(pMarkToTable); - nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); + nMemberCount = pWrtShell->GetTblFrmFmtCount(true); bEdit = sal_True; break; @@ -535,13 +535,13 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged) case CONTENT_TYPE_TABLE : { - OSL_ENSURE(nMemberCount == pWrtShell->GetTblFrmFmtCount(sal_True), + OSL_ENSURE(nMemberCount == pWrtShell->GetTblFrmFmtCount(true), "MemberCount differs"); Point aNullPt; - nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); + nMemberCount = pWrtShell->GetTblFrmFmtCount(true); for(sal_uInt16 i = 0; i < nMemberCount; i++) { - const SwFrmFmt& rTblFmt = pWrtShell->GetTblFrmFmt(i, sal_True); + const SwFrmFmt& rTblFmt = pWrtShell->GetTblFrmFmt(i, true); String sTblName( rTblFmt.GetName() ); SwContent* pCnt = new SwContent(this, sTblName, |