summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-02-10 23:17:29 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-02-16 22:52:26 +0100
commit32d5fa2cc0f1144735e93851083ef25f7588b324 (patch)
tree35c5074d3fc302fba445a1e7e3bf555934b70e30
parent4e36974dcc9448768542c2acf558f27f0189b651 (diff)
sal_Bool to bool
Change-Id: I3aa78011065bcdfa834b810966c6542aa70e0112
-rw-r--r--sw/source/core/text/portab.hxx6
-rw-r--r--sw/source/core/text/txttab.cxx8
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index b5042809a63a..285826c378c8 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -32,14 +32,14 @@ class SwTabPortion : public SwFixPortion
const bool bAutoTabStop;
// Format() branches either into PreFormat() or PostFormat()
- sal_Bool PreFormat( SwTxtFormatInfo &rInf );
+ bool PreFormat( SwTxtFormatInfo &rInf );
public:
SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
- sal_Bool PostFormat( SwTxtFormatInfo &rInf );
- inline sal_Bool IsFilled() const { return 0 != cFill; }
+ bool PostFormat( SwTxtFormatInfo &rInf );
+ inline bool IsFilled() const { return 0 != cFill; }
inline KSHORT GetTabPos() const { return nTabPos; }
inline bool IsAutoTabStop() const { return bAutoTabStop; }
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 225f040e28c7..99404ea915e7 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -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" );
@@ -462,14 +462,14 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
SetAscent( 0 );
SetPortion( NULL ); //?????
}
- return sal_True;
+ return true;
}
else
{
// A trick with impact: The new Tabportions now behave like
// FlyFrms, located in the line - including adjustment !
SetFixWidth( PrtWidth() );
- return sal_False;
+ return false;
}
}
@@ -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);
// If the tab position is larger than the right margin, it gets scaled down by default.