Kaydet (Commit) 32d5fa2c authored tarafından Matteo Casalin's avatar Matteo Casalin

sal_Bool to bool

Change-Id: I3aa78011065bcdfa834b810966c6542aa70e0112
üst 4e36974d
...@@ -32,14 +32,14 @@ class SwTabPortion : public SwFixPortion ...@@ -32,14 +32,14 @@ class SwTabPortion : public SwFixPortion
const bool bAutoTabStop; const bool bAutoTabStop;
// Format() branches either into PreFormat() or PostFormat() // Format() branches either into PreFormat() or PostFormat()
sal_Bool PreFormat( SwTxtFormatInfo &rInf ); bool PreFormat( SwTxtFormatInfo &rInf );
public: public:
SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true ); SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
virtual void Paint( const SwTxtPaintInfo &rInf ) const; virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual bool Format( SwTxtFormatInfo &rInf ); virtual bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf ); virtual void FormatEOL( SwTxtFormatInfo &rInf );
sal_Bool PostFormat( SwTxtFormatInfo &rInf ); bool PostFormat( SwTxtFormatInfo &rInf );
inline sal_Bool IsFilled() const { return 0 != cFill; } inline bool IsFilled() const { return 0 != cFill; }
inline KSHORT GetTabPos() const { return nTabPos; } inline KSHORT GetTabPos() const { return nTabPos; }
inline bool IsAutoTabStop() const { return bAutoTabStop; } inline bool IsAutoTabStop() const { return bAutoTabStop; }
......
...@@ -359,7 +359,7 @@ void SwTabPortion::FormatEOL( SwTxtFormatInfo &rInf ) ...@@ -359,7 +359,7 @@ void SwTabPortion::FormatEOL( SwTxtFormatInfo &rInf )
sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
{ {
OSL_ENSURE( rInf.X() <= GetTabPos(), "SwTabPortion::PreFormat: rush hour" ); OSL_ENSURE( rInf.X() <= GetTabPos(), "SwTabPortion::PreFormat: rush hour" );
...@@ -462,14 +462,14 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) ...@@ -462,14 +462,14 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
SetAscent( 0 ); SetAscent( 0 );
SetPortion( NULL ); //????? SetPortion( NULL ); //?????
} }
return sal_True; return true;
} }
else else
{ {
// A trick with impact: The new Tabportions now behave like // A trick with impact: The new Tabportions now behave like
// FlyFrms, located in the line - including adjustment ! // FlyFrms, located in the line - including adjustment !
SetFixWidth( PrtWidth() ); SetFixWidth( PrtWidth() );
return sal_False; return false;
} }
} }
...@@ -479,7 +479,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) ...@@ -479,7 +479,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf ) bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
{ {
const bool bTabOverMargin = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_OVER_MARGIN); const bool bTabOverMargin = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_OVER_MARGIN);
// If the tab position is larger than the right margin, it gets scaled down by default. // If the tab position is larger than the right margin, it gets scaled down by default.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment