From 9f1c57b4f829a0faf28e436bca1aed49694c7cb6 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Mon, 2 Apr 2012 20:19:27 -0400
Subject: Bool-ness.

---
 editeng/source/editeng/editdoc.cxx | 12 ++++++------
 editeng/source/editeng/editdoc.hxx | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index df899c5a3440..608e68149450 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -873,7 +873,9 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map
     }
 }
 
-EditLine::EditLine()
+EditLine::EditLine() :
+    bHangingPunctuation(false),
+    bInvalid(true)
 {
     DBG_CTOR( EE_EditLine, 0 );
 
@@ -887,11 +889,11 @@ EditLine::EditLine()
     nTxtWidth = 0;
     nCrsrHeight = 0;
     nMaxAscent = 0;
-    bHangingPunctuation = sal_False;
-    bInvalid = sal_True;
 }
 
-EditLine::EditLine( const EditLine& r )
+EditLine::EditLine( const EditLine& r ) :
+    bHangingPunctuation(r.bHangingPunctuation),
+    bInvalid(true)
 {
     DBG_CTOR( EE_EditLine, 0 );
 
@@ -899,7 +901,6 @@ EditLine::EditLine( const EditLine& r )
     nStart = r.nStart;
     nStartPortion = r.nStartPortion;
     nEndPortion = r.nEndPortion;
-    bHangingPunctuation = r.bHangingPunctuation;
 
     nHeight = 0;
     nStartPosX = 0;
@@ -907,7 +908,6 @@ EditLine::EditLine( const EditLine& r )
     nTxtWidth = 0;
     nCrsrHeight = 0;
     nMaxAscent = 0;
-    bInvalid = sal_True;
 }
 
 EditLine::~EditLine()
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index c71229a33934..0c995c90e8df 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -464,8 +464,8 @@ private:
     sal_uInt16          nTxtHeight; // Pure Text height
     sal_uInt16          nCrsrHeight;    // For contour flow high lines => cursor is large.
     sal_uInt16          nMaxAscent;
-    sal_Bool            bHangingPunctuation;
-    sal_Bool            bInvalid;   // for skillful formatting
+    bool            bHangingPunctuation:1;
+    bool            bInvalid:1;   // for skillful formatting
 
 public:
                     EditLine();
@@ -509,8 +509,8 @@ public:
     void            SetMaxAscent( sal_uInt16 n )        { nMaxAscent = n; }
     sal_uInt16          GetMaxAscent() const            { return nMaxAscent; }
 
-    void            SetHangingPunctuation( sal_Bool b )     { bHangingPunctuation = b; }
-    sal_Bool            IsHangingPunctuation() const        { return bHangingPunctuation; }
+    void            SetHangingPunctuation( bool b )     { bHangingPunctuation = b; }
+    bool            IsHangingPunctuation() const        { return bHangingPunctuation; }
 
     sal_uInt16          GetLen() const                  { return nEnd - nStart; }
 
@@ -519,10 +519,10 @@ public:
 
     Size            CalcTextSize( ParaPortion& rParaPortion );
 
-    sal_Bool            IsInvalid() const               { return bInvalid; }
-    sal_Bool            IsValid() const                 { return !bInvalid; }
-    void            SetInvalid()                    { bInvalid = sal_True; }
-    void            SetValid()                      { bInvalid = sal_False; }
+    bool            IsInvalid() const               { return bInvalid; }
+    bool            IsValid() const                 { return !bInvalid; }
+    void            SetInvalid()                    { bInvalid = true; }
+    void            SetValid()                      { bInvalid = false; }
 
     sal_Bool            IsEmpty() const                 { return (nEnd > nStart) ? sal_False : sal_True; }
 
-- 
cgit