diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-11-07 10:56:27 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-11-07 10:57:55 +0900 |
commit | eb020150e174335a9956f5259ddced0026163373 (patch) | |
tree | 31bbc7980ae901f5a7fc763abaae32352f1a0c8f | |
parent | b31416123ba8c073b707cb500806f0efb5a018b0 (diff) |
sal_Bool to bool
Change-Id: Ia1001ff0f4778bdf5e22bf2800f533dfba80c048
35 files changed, 75 insertions, 76 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index d360c510dbaf..75e3ead5b9f3 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -118,7 +118,7 @@ public: TYPEINFO(); // get information about attribute - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; }; inline SwClient::SwClient() : @@ -165,7 +165,7 @@ public: const SwClient* GetDepends() const { return pRoot; } // get information about attribute - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; void LockModify() { bModifyLocked = sal_True; } void UnlockModify() { bModifyLocked = sal_False; } @@ -199,7 +199,7 @@ public: SwClient* GetToTell() { return pToTell; } /** get Client information */ - virtual sal_Bool GetInfo( SfxPoolItem & ) const; + virtual bool GetInfo( SfxPoolItem & ) const; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ); virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 0f6158bb19a3..23233cde48c5 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -152,7 +152,7 @@ class SwPageNumberFieldType : public SwFieldType { sal_Int16 nNumberingType; sal_uInt16 nNum, nMax; - sal_Bool bVirtuell; + bool bVirtuell; public: SwPageNumberFieldType(); diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 0a911f054bb5..7253ec56aa8b 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -76,7 +76,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const; void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); } diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 5cc7ddb6df7c..850de3fe1e3b 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -75,7 +75,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const; const SwField *GetFld() const { return pField; } SwField *GetFld() { return pField; } diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 593cb55b38ab..8b8b61b8cab4 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -81,7 +81,7 @@ public: /// Query format information. - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; /// Copy attributes even among documents. void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True ); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 0a139fc0f10a..cd544d9bea0c 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -183,7 +183,7 @@ public: virtual Graphic MakeGraphic( ImageMap* pMap = NULL ); - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const; const String GetObjTitle() const; void SetObjTitle( const String& rTitle, diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 35ba3f226ef2..f12e760a8b06 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -440,7 +440,7 @@ public: virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0; /// Get information from Client. - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; /// SS for PoolItems: hard attributation. diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index a7f8f3b92aba..1de256149b86 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -238,7 +238,7 @@ public: void SetPoolHlpFileId( sal_uInt8 nId ) { aMaster.SetPoolHlpFileId( nId ); } /// Query information from Client. - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd, sal_Bool bCheckForThisPgDc = sal_True ) const; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index f03b39bc6da1..2035d897b6de 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -99,7 +99,7 @@ public: inline SwCharFmt *GetCharFmt() { return (SwCharFmt*)GetRegisteredIn(); } void SetCharFmt( SwCharFmt *pNew ); /// Get information from Client. - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; /// Get and set Modify pointer. inline const SwModify* GetDefinedIn() const { return pDefinedIn; } diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index e095d6f8bcc0..252d00c396ae 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -323,7 +323,7 @@ public: virtual void MakeFrms(); // Get information from Format. - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; SwSection* GetSection() const; inline SwSectionFmt* GetParent() const; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index d6192c38e75f..c1f81a6d4838 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -313,7 +313,7 @@ public: SwSelBoxes& rBoxes, sal_Bool bToTop = sal_True ) const; // Get information from client. - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; // Search in format for registered table. static SwTable * FindTable( SwFrmFmt const*const pFmt ); diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index c6a33c3146cb..c7e3cc4970b5 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -489,7 +489,7 @@ public: SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 ); virtual ~SwTOXBase(); - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const; // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc. // If not, so create it an copy all other used things. The return is this diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index f15e4e75c0f0..b8a34f9ceb8d 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -105,7 +105,7 @@ public: virtual ~SwTxtRuby(); TYPEINFO(); - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const; SW_DLLPRIVATE void InitRuby(SwTxtNode & rNode); diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index f6e35addb183..6008496628b0 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -51,7 +51,7 @@ public: virtual ~SwTxtINetFmt(); TYPEINFO(); - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const; SW_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode); diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 44373ed95c03..6b25b726e8ef 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -88,9 +88,9 @@ SwClient::~SwClient() pRegisteredIn->Remove( this ); } -sal_Bool SwClient::GetInfo( SfxPoolItem& ) const +bool SwClient::GetInfo( SfxPoolItem& ) const { - return sal_True; + return true; } // ---------- @@ -207,9 +207,9 @@ void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* p UnlockModify(); } -sal_Bool SwModify::GetInfo( SfxPoolItem& rInfo ) const +bool SwModify::GetInfo( SfxPoolItem& rInfo ) const { - sal_Bool bRet = sal_True; // means: continue with next + bool bRet = true; // means: continue with next if( pRoot ) { @@ -218,7 +218,7 @@ sal_Bool SwModify::GetInfo( SfxPoolItem& rInfo ) const SwClient* pLast = aIter.GoStart(); if( pLast ) { - while( 0 != ( bRet = pLast->GetInfo( rInfo ) ) && + while( ( bRet = pLast->GetInfo( rInfo ) ) && 0 != ( pLast = aIter++ ) ) ; } @@ -392,9 +392,9 @@ void SwDepend::SwClientNotify( const SwModify& rMod, const SfxHint& rHint ) pToTell->SwClientNotifyCall( rMod, rHint ); } -sal_Bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const +bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const { - return pToTell ? pToTell->GetInfo( rInfo ) : sal_True; + return pToTell ? pToTell->GetInfo( rInfo ) : true; } // ------------ diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index c2e4fbece23e..f9287c3feaa3 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -539,10 +539,9 @@ sal_uInt16 SwFmt::ResetAllFmtAttr() return aNew.Count(); } -sal_Bool SwFmt::GetInfo( SfxPoolItem& rInfo ) const +bool SwFmt::GetInfo( SfxPoolItem& rInfo ) const { - sal_Bool bRet = SwModify::GetInfo( rInfo ); - return bRet; + return SwModify::GetInfo( rInfo ); } void SwFmt::DelDiffs( const SfxItemSet& rSet ) diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index d9b786a90e0b..0d04f3d131bd 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -2327,7 +2327,7 @@ void SwTOXBase::SetAttrSet( const SfxItemSet& rSet ) pSect->GetFmt()->SetFmtAttr( rSet ); } -sal_Bool SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const +bool SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const { switch( rInfo.Which() ) { @@ -2337,9 +2337,9 @@ sal_Bool SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const if( pSect && pSect->GetFmt() ) pSect->GetFmt()->GetInfo( rInfo ); } - return sal_False; + return false; } - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index eea21de11463..779dad583ff6 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1309,7 +1309,7 @@ SwCntntNode *SwCntntNode::JoinPrev() // Get info from Modify -sal_Bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const +bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const { switch( rInfo.Which() ) { @@ -1317,21 +1317,21 @@ sal_Bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const if( &GetNodes() == ((SwAutoFmtGetDocNode&)rInfo).pNodes ) { ((SwAutoFmtGetDocNode&)rInfo).pCntntNode = this; - return sal_False; + return false; } break; case RES_FINDNEARESTNODE: if( ((SwFmtPageDesc&)GetAttr( RES_PAGEDESC )).GetPageDesc() ) ((SwFindNearestNode&)rInfo).CheckNode( *this ); - return sal_True; + return true; case RES_CONTENT_VISIBLE: { ((SwPtrMsgPoolItem&)rInfo).pObject = SwIterator<SwFrm,SwCntntNode>::FirstElement(*this); } - return sal_False; + return false; } return SwModify::GetInfo( rInfo ); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 4a16a7807ff9..1625561d0921 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -856,7 +856,7 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } // Get info from the Format -sal_Bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const +bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const { switch( rInfo.Which() ) { @@ -867,7 +867,7 @@ sal_Bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const if( pNd ) ((SwFindNearestNode&)rInfo).CheckNode( *pNd ); } - return sal_True; + return true; case RES_CONTENT_VISIBLE: { @@ -885,7 +885,7 @@ sal_Bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const } ((SwPtrMsgPoolItem&)rInfo).pObject = pFrm; } - return sal_False; + return false; } return SwModify::GetInfo( rInfo ); } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 181f474a1038..d3550fd200bf 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -118,7 +118,7 @@ SwPageNumberFieldType::SwPageNumberFieldType() nNumberingType( SVX_NUM_ARABIC ), nNum( 0 ), nMax( USHRT_MAX ), - bVirtuell( sal_False ) + bVirtuell( false ) { } @@ -162,7 +162,7 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc, sal_uInt16 nPage, if( pNumFmt ) nNumberingType = *pNumFmt; - bVirtuell = sal_False; + bVirtuell = false; if( bVirt ) { // dann muss das Flag ueberprueft werden, denn das Layout setzt @@ -178,7 +178,7 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc, sal_uInt16 nPage, if( pNd ) { if ( SwIterator<SwFrm,SwCntntNode>::FirstElement(*pNd) ) - bVirtuell = sal_True; + bVirtuell = true; } else if( pDesc->GetDefinedIn()->ISA( SwFmt )) { diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 5373eb3119f8..d3f62a6dc7f7 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -162,7 +162,7 @@ public: virtual ~SwFlyFrm(); // get client information - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; virtual void Paint( SwRect const&, SwPrintData const*const pPrintData = NULL ) const; virtual Size ChgSize( const Size& aNewSize ); diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index ea2ee13e4d69..271e161a88e7 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -182,7 +182,7 @@ public: virtual sal_Bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; // erfrage vom Client Informationen - virtual sal_Bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const; virtual void Cut(); virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 18066808f540..47f33216812d 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -127,7 +127,7 @@ public: inline SwTabFrm *GetFollow(); SwTabFrm* FindMaster( bool bFirstMaster = false ) const; - virtual sal_Bool GetInfo( SfxPoolItem &rHnt ) const; + virtual bool GetInfo( SfxPoolItem &rHnt ) const; virtual void Paint( SwRect const&, SwPrintData const*const pPrintData = NULL ) const; virtual void CheckDirection( sal_Bool bVert ); diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index f056fd717384..3942759dc1d1 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -288,7 +288,7 @@ public: SwRect Paint(); virtual void Paint( SwRect const&, SwPrintData const*const pPrintData = NULL ) const; - virtual sal_Bool GetInfo( SfxPoolItem & ) const; + virtual bool GetInfo( SfxPoolItem & ) const; //Layoutorientiertes Cursortravelling: Linker, rechter Rand, //vorhergehende/naechste Zeile, gleiche horizontale Position. diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 5e6768e98a04..8d180aee3426 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2933,7 +2933,7 @@ SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const sal_Bo } -sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const +bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const { switch( rInfo.Which() ) { @@ -2941,7 +2941,7 @@ sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const { ((SwPtrMsgPoolItem&)rInfo).pObject = SwIterator<SwFrm,SwFmt>::FirstElement( *this ); } - return sal_False; + return false; default: return SwFrmFmt::GetInfo( rInfo ); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 2172dbe8ec10..5a1c9fefd2e6 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1148,11 +1148,11 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, *************************************************************************/ // erfrage vom Modify Informationen -sal_Bool SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const +bool SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const { if( RES_AUTOFMT_DOCNODE == rInfo.Which() ) - return sal_False; // es gibt einen FlyFrm also wird er benutzt - return sal_True; // weiter suchen + return false; // es gibt einen FlyFrm also wird er benutzt + return true; // weiter suchen } /************************************************************************* diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 53a329f5e7cf..40b3b7a0a611 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -752,14 +752,14 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, |* *************************************************************************/ // erfrage vom Modify Informationen -sal_Bool SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const +bool SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const { if( RES_AUTOFMT_DOCNODE == rInfo.Which() ) { // es gibt einen PageFrm also wird er benutzt - return sal_False; + return false; } - return sal_True; // weiter suchen + return true; // weiter suchen } /************************************************************************* diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 1fa5c3186818..d48517ee7cd8 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -162,10 +162,10 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft ) // gets information from Modify -sal_Bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const +bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const { if( !aMaster.GetInfo( rInfo ) ) - return sal_False; // found + return false; // found return aLeft.GetInfo( rInfo ); } diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index af3373a65106..7e217694e951 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3278,7 +3278,7 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, |* SwTabFrm::GetInfo() |* |*************************************************************************/ -sal_Bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const +bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const { if ( RES_VIRTPAGENUM_INFO == rHnt.Which() && IsInDocBody() && !IsFollow() ) { @@ -3291,7 +3291,7 @@ sal_Bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const //Here it should be (can temporary be different, should we be // concerned about this?) rInfo.SetInfo( pPage, this ); - return sal_False; + return false; } if ( pPage->GetPhyPageNum() < rInfo.GetOrigPage()->GetPhyPageNum() && (!rInfo.GetPage() || pPage->GetPhyPageNum() > rInfo.GetPage()->GetPhyPageNum())) @@ -3301,7 +3301,7 @@ sal_Bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const } } } - return sal_True; + return true; } /************************************************************************* diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 2b8138d7fec6..dc07e9fcebcf 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -126,9 +126,9 @@ void SwFmtDrop::Modify( const SfxPoolItem*, const SfxPoolItem * ) } } -sal_Bool SwFmtDrop::GetInfo( SfxPoolItem& ) const +bool SwFmtDrop::GetInfo( SfxPoolItem& ) const { - return sal_True; // weiter + return true; // weiter } int SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index b727954d9348..b790bbe66207 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1951,7 +1951,7 @@ sal_uLong SwTableBox::GetSttIdx() const } // retrieve informations from the client -sal_Bool SwTable::GetInfo( SfxPoolItem& rInfo ) const +bool SwTable::GetInfo( SfxPoolItem& rInfo ) const { switch( rInfo.Which() ) { @@ -1966,7 +1966,7 @@ sal_Bool SwTable::GetInfo( SfxPoolItem& rInfo ) const ((SwAutoFmtGetDocNode&)rInfo).pCntntNode = GetFrmFmt()->GetDoc()->GetNodes().GoNext( &aIdx ); } - return sal_False; + return false; } break; } @@ -1983,9 +1983,9 @@ sal_Bool SwTable::GetInfo( SfxPoolItem& rInfo ) const { ((SwPtrMsgPoolItem&)rInfo).pObject = SwIterator<SwFrm,SwFmt>::FirstElement( *GetFrmFmt() ); } - return sal_False; + return false; } - return sal_True; + return true; } SwTable * SwTable::FindTable( SwFrmFmt const*const pFmt ) diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 870741bdadfb..27b034b1bf8b 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -1358,7 +1358,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) CalcFtnFlag(); } -sal_Bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const +bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const { if ( RES_VIRTPAGENUM_INFO == rHnt.Which() && IsInDocBody() && ! IsFollow() ) { @@ -1371,7 +1371,7 @@ sal_Bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const //Das sollte er sein (kann allenfalls temporaer anders sein, // sollte uns das beunruhigen?) rInfo.SetInfo( pPage, this ); - return sal_False; + return false; } if ( pPage->GetPhyPageNum() < rInfo.GetOrigPage()->GetPhyPageNum() && (!rInfo.GetPage() || pPage->GetPhyPageNum() > rInfo.GetPage()->GetPhyPageNum())) @@ -1381,7 +1381,7 @@ sal_Bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const } } } - return sal_True; + return true; } /************************************************************************* diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index b0b07573f187..dccc014a7b75 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -248,16 +248,16 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) pTxtAttr->Expand(); } -sal_Bool SwFmtFld::GetInfo( SfxPoolItem& rInfo ) const +bool SwFmtFld::GetInfo( SfxPoolItem& rInfo ) const { const SwTxtNode* pTxtNd; if( RES_AUTOFMT_DOCNODE != rInfo.Which() || !pTxtAttr || 0 == ( pTxtNd = pTxtAttr->GetpTxtNode() ) || &pTxtNd->GetNodes() != ((SwAutoFmtGetDocNode&)rInfo).pNodes ) - return sal_True; + return true; ((SwAutoFmtGetDocNode&)rInfo).pCntntNode = pTxtNd; - return sal_False; + return false; } diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index c8f8f0129ee2..6c53257c47b9 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -119,9 +119,9 @@ void SwFmtCharFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) // weiterleiten an das TextAttribut -sal_Bool SwFmtCharFmt::GetInfo( SfxPoolItem& rInfo ) const +bool SwFmtCharFmt::GetInfo( SfxPoolItem& rInfo ) const { - return pTxtAttr ? pTxtAttr->GetInfo( rInfo ) : sal_False; + return pTxtAttr ? pTxtAttr->GetInfo( rInfo ) : false; } bool SwFmtCharFmt::QueryValue( uno::Any& rVal, sal_uInt8 ) const { diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 8e5b65d57c18..73df9bf7c71b 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -199,16 +199,16 @@ void SwTxtINetFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } // erfrage vom Modify Informationen -sal_Bool SwTxtINetFmt::GetInfo( SfxPoolItem& rInfo ) const +bool SwTxtINetFmt::GetInfo( SfxPoolItem& rInfo ) const { if ( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTxtNode || &m_pTxtNode->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes ) { - return sal_True; + return true; } static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = m_pTxtNode; - return sal_False; + return false; } sal_Bool SwTxtINetFmt::IsProtect( ) const @@ -247,16 +247,16 @@ void SwTxtRuby::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } } -sal_Bool SwTxtRuby::GetInfo( SfxPoolItem& rInfo ) const +bool SwTxtRuby::GetInfo( SfxPoolItem& rInfo ) const { if( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTxtNode || &m_pTxtNode->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes ) { - return sal_True; + return true; } static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = m_pTxtNode; - return sal_False; + return false; } SwCharFmt* SwTxtRuby::GetCharFmt() |