diff options
author | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
commit | 2b9ee96b5d07cff557ea25deb6d6fbd908a08f24 (patch) | |
tree | 1c918787691e9d69e1f952768a08406931cd34e9 /sw/source/core/inc/ftnboss.hxx | |
parent | a3c0c3a8762e47be72de05ac3ae1fc5032f2a1a9 (diff) | |
parent | c50e8a2df2e04d9d2c225df0ea648f0501acc250 (diff) |
sw34bf03: merge to-be-m100 DEV300_next
Diffstat (limited to 'sw/source/core/inc/ftnboss.hxx')
-rw-r--r-- | sw/source/core/inc/ftnboss.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index 8b9ea8348395..6c13fa75bff3 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -64,7 +64,7 @@ class SwFtnBossFrm: public SwLayoutFrm SwFtnContFrm *MakeFtnCont(); SwFtnFrm *FindFirstFtn(); - BYTE _NeighbourhoodAdjustment( const SwFrm* pFrm ) const; + sal_uInt8 _NeighbourhoodAdjustment( const SwFrm* pFrm ) const; protected: void InsertFtn( SwFtnFrm * ); @@ -78,16 +78,16 @@ public: //Fussnotenschnittstelle void AppendFtn( SwCntntFrm *, SwTxtFtn * ); - void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, BOOL bPrep = TRUE ); + void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, sal_Bool bPrep = sal_True ); static SwFtnFrm *FindFtn( const SwCntntFrm *, const SwTxtFtn * ); SwFtnContFrm *FindFtnCont(); inline const SwFtnContFrm *FindFtnCont() const; const SwFtnFrm *FindFirstFtn( SwCntntFrm* ) const; - SwFtnContFrm *FindNearestFtnCont( BOOL bDontLeave = FALSE ); + SwFtnContFrm *FindNearestFtnCont( sal_Bool bDontLeave = sal_False ); void ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *, SwCntntFrm *pNew ); - void RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock = FALSE, + void RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock = sal_False, const SwTxtFtn *pAttr = 0 ); //SS damit der Textformatierer Temporaer die Fussnotenhoehe begrenzen @@ -117,11 +117,11 @@ public: SwFtnBossFrm* _pOld, SvPtrarr& _rFtnArr, const sal_Bool _bCollectOnlyPreviousFtns = sal_False ); - void _MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc = FALSE ); + void _MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc = sal_False ); void MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, SwTxtFtn *pAttr ); // Sollte AdjustNeighbourhood gerufen werden (oder Grow/Shrink)? - BYTE NeighbourhoodAdjustment( const SwFrm* pFrm ) const + sal_uInt8 NeighbourhoodAdjustment( const SwFrm* pFrm ) const { return IsPageFrm() ? NA_ONLY_ADJUST : _NeighbourhoodAdjustment( pFrm ); } }; |