diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-02-15 17:39:35 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-02-16 22:52:30 +0100 |
| commit | 781b17a577991b8a830038ab0e61de0c048f11aa (patch) | |
| tree | 3e99667534cab5c1e687432d9e5e7959c904e68c | |
| parent | 54cbd46dc52c51dda1594ee090f0619a7b92d56a (diff) | |
sal_Bool to bool
Change-Id: I98da667e406aef18e0f8b8bdb9b380cf76b36952
| -rw-r--r-- | sw/source/core/inc/txtfrm.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/txthyph.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 06b8d1aaef46..689720fa865f 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -344,7 +344,7 @@ public: // Wir formatieren eine Zeile fuer die interaktive Trennung // Return: found - sal_Bool Hyphenate( SwInterHyphInfo &rInf ); + bool Hyphenate( SwInterHyphInfo &rInf ); // Probegrow inline SwTwips GrowTst( const SwTwips nGrow ); diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index ed18cee3d60b..5aef79091ee5 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -61,19 +61,19 @@ Reference< XHyphenatedWord > SwTxtFormatInfo::HyphWord( * Wir formatieren eine Zeile fuer die interaktive Trennung *************************************************************************/ -sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf ) +bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf ) { OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"swapped frame at SwTxtFrm::Hyphenate" ); if( !g_pBreakIt->GetBreakIter().is() ) - return sal_False; + return false; // Wir machen den Laden erstmal dicht: OSL_ENSURE( !IsLocked(), "SwTxtFrm::Hyphenate: this is locked" ); // 4935: Der frame::Frame muss eine gueltige SSize haben! Calc(); GetFormatted(); - sal_Bool bRet = sal_False; + bool bRet = false; if( !IsEmpty() ) { // Wir muessen die Trennung immer einschalten. @@ -230,7 +230,7 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) Boundary aBound = g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nWrdStart, - g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ), WordType::DICTIONARY_WORD, sal_True ); + g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ), WordType::DICTIONARY_WORD, true ); nWrdStart = aBound.startPos; nLen = aBound.endPos - nWrdStart; if ( nLen == 0 ) @@ -481,12 +481,12 @@ void SwSoftHyphPortion::Paint( const SwTxtPaintInfo &rInf ) const * Fall 1: "Au-to" * 1) {Au}{-}{to}, {to} passt nicht mehr => Underflow * 2) {-} ruft Hyphenate => keine Alternative - * 3) FormatEOL() und bFull = sal_True + * 3) FormatEOL() und bFull = true * * Fall 2: "Zuc-ker" * 1) {Zuc}{-}{ker}, {ker} passt nicht mehr => Underflow * 2) {-} ruft Hyphenate => Alternative! - * 3) Underflow() und bFull = sal_True + * 3) Underflow() und bFull = true * 4) {Zuc} ruft Hyphenate => {Zuk}{-}{ker} */ |