lotuswordpro: sal_Bool->bool

Change-Id: I017d284a2fbc8d50a9928c9d934ffe710b0c652f
author: Noel Grandin <noel@peralex.com> 2014-04-22 14:14:14 +0200
committer: Noel Grandin <noel@peralex.com> 2014-04-23 11:11:50 +0200
commit: 2692047aacef7b4288f995ce6ff2db5e16b71014 (patch)
tree: 2d43552ad1a01cfb6287d54f35b5ae3ca538393b /lotuswordpro
parent: ca56379f27c53d4fa015d7adbb9494186f506de6 (diff)
165 files changed, 1569 insertions, 1570 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 0cbc29578fe0..a1ce6d2ba61e 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -60,7 +60,7 @@ using com::sun::star::xml::sax::XParser;
 //                                 W     o     r     d     P     r     o
 static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
 
-sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
     throw (RuntimeException)
 {
 
@@ -76,7 +76,7 @@ sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::s
 
     SvFileStream inputStream( sURL, STREAM_READ );
     if ( inputStream.IsEof() || ( inputStream.GetError() != SVSTREAM_OK ) )
-         return sal_False;
+         return false;
 
     // An XML import service: what we push sax messages to..
     OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLImporter" );
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index bcf811f4e324..37285c56d8e3 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -50,7 +50,7 @@ protected:
     OUString msFilterName;
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
 
-    sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+    bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
         throw (::com::sun::star::uno::RuntimeException);
 
 public:
@@ -91,7 +91,7 @@ public:
 OUString LotusWordProImportFilter_getImplementationName()
     throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName )
+bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName )
     throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames(  )
diff --git a/lotuswordpro/source/filter/lwpatomholder.hxx b/lotuswordpro/source/filter/lwpatomholder.hxx
index 89a9e871591d..2450bb34edd5 100644
--- a/lotuswordpro/source/filter/lwpatomholder.hxx
+++ b/lotuswordpro/source/filter/lwpatomholder.hxx
@@ -77,9 +77,9 @@ public:
     void ReadPathAtom(LwpObjectStream *pStrm);
     void Skip(LwpObjectStream *pStrm);
     OUString str(){return m_String;}
-    inline sal_Bool HasValue();
+    inline bool HasValue();
 };
-inline sal_Bool LwpAtomHolder::HasValue()
+inline bool LwpAtomHolder::HasValue()
 {
     return (m_nAtom != BAD_ATOM);
 }
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index 8e5588a8f0a3..085e0926e1ec 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -152,8 +152,8 @@ public:
     LwpColor* GetFillColor();
     XFBGImage* GetFillPattern();
 
-    inline sal_Bool IsTransparent() {return (m_nID == BACK_TRANSPARENT);}
-    inline sal_Bool IsPatternFill() { return (sal_Bool)(m_nID > 2 && m_nID < 72); }
+    inline bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); }
+    inline bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); }
 
     friend class LwpBackgroundOverride;
 private:
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
index dbf5d2cdc9fc..b3b01f916916 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
+++ b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
@@ -91,14 +91,14 @@ void LwpBookmarkMgr::AddXFBookmarkEnd(const OUString& sName,XFBookmarkEnd* pMark
         m_MapEnd[sName] = pMark;
     }
 }
-sal_Bool LwpBookmarkMgr::FindBookmark(const OUString& sName)
+bool LwpBookmarkMgr::FindBookmark(const OUString& sName)
 {
     std::map<OUString,XFBookmarkStart*>::iterator iter;
     iter = m_MapStart.find(sName);
     if (iter != m_MapStart.end())
-        return sal_True;
+        return true;
     else
-        return sal_False;
+        return false;
 }
 
 LwpBookmarkMgr::LwpBookmarkMgr()
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx b/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
index 4db85d56a014..ffc44d8bda89 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
+++ b/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
@@ -74,7 +74,7 @@ class LwpBookmarkMgr
 public:
     void AddXFBookmarkEnd(const OUString& sName,XFBookmarkEnd* pMark);
     void AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* pMark);
-    sal_Bool FindBookmark(const OUString& sName);
+    bool FindBookmark(const OUString& sName);
     ~LwpBookmarkMgr();
     LwpBookmarkMgr();
 private:
diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx b/lotuswordpro/source/filter/lwpborderstuff.cxx
index 8e7bcf961a18..e1d5e88702dd 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.cxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.cxx
@@ -156,7 +156,7 @@ void    LwpBorderStuff::Read(LwpObjectStream *pStrm)
     }
 }
 
-sal_Bool    LwpBorderStuff::HasSide(sal_uInt16 side)
+bool    LwpBorderStuff::HasSide(sal_uInt16 side)
 {
     return m_nSides&side;
 }
diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx
index a8de3e149068..7e1dae9f66ec 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.hxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.hxx
@@ -82,7 +82,7 @@ public:
     void    Read(LwpObjectStream *pStrm);
 
     sal_uInt16  GetSide(){ return m_nSides; }
-    sal_Bool    HasSide(sal_uInt16 side);
+    bool    HasSide(sal_uInt16 side);
     sal_uInt16  GetSideType(sal_uInt16 side);
     LwpColor    GetSideColor(sal_uInt16 side);
     float       GetSideWidth(sal_uInt16 side);
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.cxx b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
index 8356a2b46edc..bdc689ef2582 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.cxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
@@ -193,7 +193,7 @@ void LwpBreaksOverride::Override(LwpBreaksOverride* pOther)
     }
 }
 
-void LwpBreaksOverride::OverridePageBreakBefore(sal_Bool bVal)
+void LwpBreaksOverride::OverridePageBreakBefore(bool bVal)
 {
     if(bVal)
     {
@@ -204,7 +204,7 @@ void LwpBreaksOverride::OverridePageBreakBefore(sal_Bool bVal)
         LwpOverride::Override(BO_PAGEBEFORE, STATE_OFF);
     }
 }
-void LwpBreaksOverride::OverridePageBreakAfter(sal_Bool bVal)
+void LwpBreaksOverride::OverridePageBreakAfter(bool bVal)
 {
     if(bVal)
     {
@@ -215,7 +215,7 @@ void LwpBreaksOverride::OverridePageBreakAfter(sal_Bool bVal)
         LwpOverride::Override(BO_PAGEAFTER, STATE_OFF);
     }
 }
-void LwpBreaksOverride::OverridePageBreakWithin(sal_Bool bVal)
+void LwpBreaksOverride::OverridePageBreakWithin(bool bVal)
 {
     // Note the flipped logic
     if(!bVal)
@@ -227,7 +227,7 @@ void LwpBreaksOverride::OverridePageBreakWithin(sal_Bool bVal)
         LwpOverride::Override(BO_KEEPTOGETHER, STATE_OFF);
     }
 }
-void LwpBreaksOverride::OverrideColumnBreakBefore(sal_Bool bVal)
+void LwpBreaksOverride::OverrideColumnBreakBefore(bool bVal)
 {
     if(bVal)
     {
@@ -238,7 +238,7 @@ void LwpBreaksOverride::OverrideColumnBreakBefore(sal_Bool bVal)
         LwpOverride::Override(BO_COLBEFORE, STATE_OFF);
     }
 }
-void LwpBreaksOverride::OverrideColumnBreakAfter(sal_Bool bVal)
+void LwpBreaksOverride::OverrideColumnBreakAfter(bool bVal)
 {
     if(bVal)
     {
@@ -249,7 +249,7 @@ void LwpBreaksOverride::OverrideColumnBreakAfter(sal_Bool bVal)
         LwpOverride::Override(BO_COLAFTER, STATE_OFF);
     }
 }
-void LwpBreaksOverride::OverrideKeepWithNext(sal_Bool bVal)
+void LwpBreaksOverride::OverrideKeepWithNext(bool bVal)
 {
     if(bVal)
     {
@@ -260,7 +260,7 @@ void LwpBreaksOverride::OverrideKeepWithNext(sal_Bool bVal)
         LwpOverride::Override(BO_KEEPNEXT, STATE_OFF);
     }
 }
-void LwpBreaksOverride::OverrideKeepWithPrevious(sal_Bool bVal)
+void LwpBreaksOverride::OverrideKeepWithPrevious(bool bVal)
 {
     if(bVal)
     {
@@ -271,7 +271,7 @@ void LwpBreaksOverride::OverrideKeepWithPrevious(sal_Bool bVal)
         LwpOverride::Override(BO_KEEPPREV, STATE_OFF);
     }
 }
-void LwpBreaksOverride::OverrideUseNextStyle(sal_Bool bVal)
+void LwpBreaksOverride::OverrideUseNextStyle(bool bVal)
 {
     if(bVal)
     {
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
index d44a5ae050e7..dff45ea2ef25 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
@@ -91,23 +91,23 @@ public:
     //add by , 01/28/2005
     void Override(LwpBreaksOverride* pOther);
 
-    inline sal_Bool IsPageBreakBefore();
-    inline sal_Bool IsPageBreakAfter();
-    inline sal_Bool IsPageBreakWithin();
-    inline sal_Bool IsColumnBreakBefore();
-    inline sal_Bool IsColumnBreakAfter();
-    inline sal_Bool IsKeepWithNext();
-    inline sal_Bool IsKeepWithPrevious();
-    inline sal_Bool IsUseNextStyle();
-
-    inline sal_Bool IsPageBreakBeforeOverridden();
-    inline sal_Bool IsPageBreakAfterOverridden();
-    inline sal_Bool IsPageBreakWithinOverridden();
-    inline sal_Bool IsColumnBreakBeforeOverridden();
-    inline sal_Bool IsColumnBreakAfterOverridden();
-    inline sal_Bool IsKeepWithNextOverridden();
-    inline sal_Bool IsKeepWithPreviousOverridden();
-    inline sal_Bool IsUseNextStyleOverridden();
+    inline bool IsPageBreakBefore();
+    inline bool IsPageBreakAfter();
+    inline bool IsPageBreakWithin();
+    inline bool IsColumnBreakBefore();
+    inline bool IsColumnBreakAfter();
+    inline bool IsKeepWithNext();
+    inline bool IsKeepWithPrevious();
+    inline bool IsUseNextStyle();
+
+    inline bool IsPageBreakBeforeOverridden();
+    inline bool IsPageBreakAfterOverridden();
+    inline bool IsPageBreakWithinOverridden();
+    inline bool IsColumnBreakBeforeOverridden();
+    inline bool IsColumnBreakAfterOverridden();
+    inline bool IsKeepWithNextOverridden();
+    inline bool IsKeepWithPreviousOverridden();
+    inline bool IsUseNextStyleOverridden();
 
     inline void RevertPageBreakBefore();
     inline void RevertPageBreakAfter();
@@ -118,14 +118,14 @@ public:
     inline void RevertKeepWithPrevious();
     inline void RevertUseNextStyle();
 
-    void OverridePageBreakBefore(sal_Bool bVal);
-    void OverridePageBreakAfter(sal_Bool bVal);
-    void OverridePageBreakWithin(sal_Bool bVal);
-    void OverrideColumnBreakBefore(sal_Bool bVal);
-    void OverrideColumnBreakAfter(sal_Bool bVal);
-    void OverrideKeepWithNext(sal_Bool bVal);
-    void OverrideKeepWithPrevious(sal_Bool bVal);
-    void OverrideUseNextStyle(sal_Bool bVal);
+    void OverridePageBreakBefore(bool bVal);
+    void OverridePageBreakAfter(bool bVal);
+    void OverridePageBreakWithin(bool bVal);
+    void OverrideColumnBreakBefore(bool bVal);
+    void OverrideColumnBreakAfter(bool bVal);
+    void OverrideKeepWithNext(bool bVal);
+    void OverrideKeepWithPrevious(bool bVal);
+    void OverrideUseNextStyle(bool bVal);
 
     inline LwpAtomHolder* GetNextStyle();
     //end add
@@ -140,71 +140,71 @@ private:
     LwpAtomHolder       *m_pNextStyle;
 };
 
-inline sal_Bool LwpBreaksOverride::IsPageBreakBefore()
+inline bool LwpBreaksOverride::IsPageBreakBefore()
 {
-    return (sal_Bool)((m_nValues & BO_PAGEBEFORE) != 0);
+    return ((m_nValues & BO_PAGEBEFORE) != 0);
 }
 
-inline sal_Bool LwpBreaksOverride::IsPageBreakAfter()
+inline bool LwpBreaksOverride::IsPageBreakAfter()
 {
-    return (sal_Bool)((m_nValues & BO_PAGEAFTER) != 0);
+    return ((m_nValues & BO_PAGEAFTER) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsPageBreakWithin()
+inline bool LwpBreaksOverride::IsPageBreakWithin()
 {
-    return (sal_Bool)((m_nValues & BO_KEEPTOGETHER) != 0);
+    return ((m_nValues & BO_KEEPTOGETHER) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsColumnBreakBefore()
+inline bool LwpBreaksOverride::IsColumnBreakBefore()
 {
-    return (sal_Bool)((m_nValues & BO_COLBEFORE) != 0);
+    return ((m_nValues & BO_COLBEFORE) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsColumnBreakAfter()
+inline bool LwpBreaksOverride::IsColumnBreakAfter()
 {
-    return (sal_Bool)((m_nValues & BO_COLAFTER) != 0);
+    return ((m_nValues & BO_COLAFTER) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsKeepWithNext()
+inline bool LwpBreaksOverride::IsKeepWithNext()
 {
-    return (sal_Bool)((m_nValues & BO_KEEPNEXT) != 0);
+    return ((m_nValues & BO_KEEPNEXT) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsKeepWithPrevious()
+inline bool LwpBreaksOverride::IsKeepWithPrevious()
 {
-    return (sal_Bool)((m_nValues & BO_KEEPPREV) != 0);
+    return ((m_nValues & BO_KEEPPREV) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsUseNextStyle()
+inline bool LwpBreaksOverride::IsUseNextStyle()
 {
-    return (sal_Bool)((m_nValues & BO_USENEXTSTYLE) != 0);
+    return ((m_nValues & BO_USENEXTSTYLE) != 0);
 }
 
-inline sal_Bool LwpBreaksOverride::IsPageBreakBeforeOverridden()
+inline bool LwpBreaksOverride::IsPageBreakBeforeOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_PAGEBEFORE) != 0);
+    return ((m_nOverride& BO_PAGEBEFORE) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsPageBreakAfterOverridden()
+inline bool LwpBreaksOverride::IsPageBreakAfterOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_PAGEAFTER) != 0);
+    return ((m_nOverride& BO_PAGEAFTER) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsPageBreakWithinOverridden()
+inline bool LwpBreaksOverride::IsPageBreakWithinOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_KEEPTOGETHER) != 0);
+    return ((m_nOverride& BO_KEEPTOGETHER) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsColumnBreakBeforeOverridden()
+inline bool LwpBreaksOverride::IsColumnBreakBeforeOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_COLBEFORE) != 0);
+    return ((m_nOverride& BO_COLBEFORE) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsColumnBreakAfterOverridden()
+inline bool LwpBreaksOverride::IsColumnBreakAfterOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_COLAFTER) != 0);
+    return ((m_nOverride& BO_COLAFTER) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsKeepWithNextOverridden()
+inline bool LwpBreaksOverride::IsKeepWithNextOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_KEEPNEXT) != 0);
+    return ((m_nOverride& BO_KEEPNEXT) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsKeepWithPreviousOverridden()
+inline bool LwpBreaksOverride::IsKeepWithPreviousOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_KEEPPREV) != 0);
+    return ((m_nOverride& BO_KEEPPREV) != 0);
 }
-inline sal_Bool LwpBreaksOverride::IsUseNextStyleOverridden()
+inline bool LwpBreaksOverride::IsUseNextStyleOverridden()
 {
-    return (sal_Bool)((m_nOverride& BO_USENEXTSTYLE) != 0);
+    return ((m_nOverride& BO_USENEXTSTYLE) != 0);
 }
 
 inline void LwpBreaksOverride::RevertPageBreakBefore()
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 5c6719c27fb6..f8f6225772a1 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -77,8 +77,8 @@
 LwpBulletStyleMgr::LwpBulletStyleMgr()
     : m_pFoundry(NULL)
     , m_pBulletList(NULL)
-    , m_bContinue(sal_True)
-    , m_bIsBulletSkipped(sal_False)
+    , m_bContinue(true)
+    , m_bIsBulletSkipped(false)
     , m_nCurrentPos(0xFF)
 {
 }
@@ -156,7 +156,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
     OUString aStyleName;
 
     LwpFribPtr* pBulletParaFribs = pBulletPara->GetFribs();
-    sal_Bool bIsNumbering = (sal_Bool)(pBulletParaFribs->HasFrib(FRIB_TAG_PARANUMBER) != 0);
+    bool bIsNumbering = (pBulletParaFribs->HasFrib(FRIB_TAG_PARANUMBER) != 0);
 
     enumXFAlignType eAlign = enumXFAlignStart;
     if (pBullOver->IsRightAligned())
@@ -258,15 +258,15 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
 //Create nested XFList and XFItems and then add it to XFContentContainer(pCont)
 //Return the inner XFItem created.
 XFContentContainer* LwpBulletStyleMgr::AddBulletList(
-        XFContentContainer* pCont, sal_Bool bIsOrdered,
-        const OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped)
+        XFContentContainer* pCont, bool bIsOrdered,
+        const OUString& rStyleName, sal_Int16 nLevel, bool bIsBulletSkiped)
 {
     assert(nLevel>0);
 
     m_bIsBulletSkipped = bIsBulletSkiped;
 
     //todo: need judge here.
-    sal_Bool bContinue = m_bContinue;
+    bool bContinue = m_bContinue;
 
     XFList* theList;
     XFList* prevList = NULL;
@@ -280,12 +280,12 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
 
         if (bIsOrdered)
         {
-            theList->SetOrdered(sal_True);
+            theList->SetOrdered(true);
         }
         else
         {
-            bContinue = sal_False;
-            theList->SetOrdered(sal_False);
+            bContinue = false;
+            theList->SetOrdered(false);
         }
 
         if (nC == nLevel-1)
@@ -301,9 +301,9 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
 
         if ((nC == nLevel-1) && bIsBulletSkiped)
         {
-            theItem->SetIsHeader(sal_True);
+            theItem->SetIsHeader(true);
 
-            theList->SetContinueNumber(sal_True);
+            theList->SetContinueNumber(true);
             // end of add
         }
 
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index 773738a8fd05..94622b2c9f46 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -87,9 +87,9 @@ public:
     OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
         LwpIndentOverride* pIndent);
     inline void SetFoundry(LwpFoundry* pFoundry);
-    inline void SetContinueFlag(sal_Bool bFlag);
-    XFContentContainer* AddBulletList(XFContentContainer* pCont, sal_Bool bIsOrdered,
-        const OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped);
+    inline void SetContinueFlag(bool bFlag);
+    XFContentContainer* AddBulletList(XFContentContainer* pCont, bool bIsOrdered,
+        const OUString& rStyleName, sal_Int16 nLevel, bool bIsBulletSkiped);
     inline void SetCurrentPos(sal_uInt16 nNewPos);
     inline void SetCurrentSilverBullet(const LwpObjectID& rNewID);
     inline LwpObjectID GetCurrentSilverBullet();
@@ -104,8 +104,8 @@ private:
     OUString m_aCurrentStyleName;
     LwpFoundry* m_pFoundry;
     XFList* m_pBulletList;
-    sal_Bool m_bContinue;
-    sal_Bool m_bIsBulletSkipped;
+    bool m_bContinue;
+    bool m_bIsBulletSkipped;
     LwpObjectID m_aCurrentNumberingID;
     boost::scoped_ptr<LwpNumberingOverride> m_pCurrentNumOverride;
     sal_uInt16 m_nCurrentPos;
@@ -116,7 +116,7 @@ inline void LwpBulletStyleMgr::SetFoundry(LwpFoundry* pFoundry)
 {
     m_pFoundry = pFoundry;
 }
-inline void LwpBulletStyleMgr::SetContinueFlag(sal_Bool bFlag)
+inline void LwpBulletStyleMgr::SetContinueFlag(bool bFlag)
 {
     m_bContinue = bFlag;
 }
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 290924d43fae..59d3a08d83ce 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -435,8 +435,8 @@ LwpCellBorderType LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 n
     }
     XFBorder *pLeftBorder = pBorders->GetLeft();
     XFBorder *pBottomBorder = pBorders->GetBottom();
-    sal_Bool bNoLeftBorder = sal_False;
-    sal_Bool bNoBottomBorder = sal_False;
+    bool bNoLeftBorder = false;
+    bool bNoBottomBorder = false;
 
     LwpCellLayout * pLeftNeighbour = GetCellByRowCol(nRow, GetLeftColID(nCol), pTableLayout);
     if (pLeftNeighbour)
@@ -450,7 +450,7 @@ LwpCellBorderType LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 n
                 // for these 2 types cell, left border should be ignored for sake of avoiding duplication border
                 // but if left border is different with right border of left cell
                 // we should not ignored it
-                bNoLeftBorder = sal_True;
+                bNoLeftBorder = true;
             }
             delete pNeighbourBorders;
         }
@@ -469,7 +469,7 @@ LwpCellBorderType LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 n
                 // for these 2 types cell, bottom border should be ignored for sake of avoiding duplication border
                 // but if bottom border is different with right border of left cell
                 // we should not ignored it
-                bNoBottomBorder = sal_True;
+                bNoBottomBorder = true;
             }
             delete pBelowBorders;
         }
@@ -648,11 +648,11 @@ void LwpCellLayout::Read()
 */
 void LwpCellLayout::ApplyProtect(XFCell * pCell, LwpObjectID aTableID)
 {
-    sal_Bool bProtected = sal_False;
+    bool bProtected = false;
     // judge current cell
     if (IsProtected())
     {
-        bProtected = sal_True;
+        bProtected = true;
     }
     else
     {
@@ -660,7 +660,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, LwpObjectID aTableID)
         LwpCellLayout * pBase = dynamic_cast<LwpCellLayout *>(m_BasedOnStyle.obj());
         if (pBase && pBase->IsProtected())
         {
-            bProtected = sal_True;
+            bProtected = true;
         }
         else
         {
@@ -670,7 +670,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, LwpObjectID aTableID)
             LwpSuperTableLayout * pSuper = pTableLayout ? pTableLayout->GetSuperTableLayout() : NULL;
             if (pSuper && pSuper->IsProtected())
             {
-                bProtected = sal_True;
+                bProtected = true;
             }
         }
     }
@@ -732,12 +732,12 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
     }
     XFBorder *pLeftBorder = pBorders->GetLeft();
     XFBorder *pBottomBorder = pBorders->GetBottom();
-    sal_Bool bNoLeftBorder = sal_True;
-    sal_Bool bNoBottomBorder = sal_True;
+    bool bNoLeftBorder = true;
+    bool bNoBottomBorder = true;
 
     if (nCol == 0)
     {
-        bNoLeftBorder = sal_False;
+        bNoLeftBorder = false;
     }
     else
     {
@@ -754,7 +754,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
                     {
                         // if left border is different with right border of left cell
                         // we should not ignored it
-                        bNoLeftBorder = sal_False;
+                        bNoLeftBorder = false;
                         break;
                     }
                 }
@@ -764,7 +764,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
 
     if ( (nRow + nRowSpan) == pTableLayout->GetTable()->GetRow() )
     {
-        bNoBottomBorder = sal_False;
+        bNoBottomBorder = false;
     }
     else
     {
@@ -781,7 +781,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
                     {
                         // if bottom border is different with right border of left cell
                         // we should not ignored it
-                        bNoBottomBorder = sal_False;
+                        bNoBottomBorder = false;
                         break;
                     }
                 }
diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx
index dc5114d521b3..af69a82faa66 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.cxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.cxx
@@ -157,9 +157,9 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream)
     }
     m_ChangeList.clear();
 }
-void LwpChangeMgr::SetHeadFootFribMap(sal_Bool bFlag)
+void LwpChangeMgr::SetHeadFootFribMap(bool bFlag)
 {
-    if (bFlag == sal_True)
+    if (bFlag)
         m_pFribMap = &m_HeadFootFribMap;
     else
     {
diff --git a/lotuswordpro/source/filter/lwpchangemgr.hxx b/lotuswordpro/source/filter/lwpchangemgr.hxx
index 9c9cdb70cefd..dab541abad5f 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.hxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.hxx
@@ -80,7 +80,7 @@ public:
     void AddChangeFrib(LwpFrib* pFrib);
     OUString GetChangeID(LwpFrib* pFrib);
     void ConvertAllChange(IXFStream* pStream);
-    void SetHeadFootFribMap(sal_Bool bFlag);
+    void SetHeadFootFribMap(bool bFlag);
     void SetHeadFootChange(XFContentContainer* pCont);
     ~LwpChangeMgr();
     LwpChangeMgr();
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
index cdce105ad97b..2a8528ea9d64 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
@@ -85,10 +85,10 @@ public:
     inline sal_Int32 GetAboveWidth() const;
     inline sal_Int32 GetBelowWidth() const;
 
-    inline sal_Bool IsBorderStuffOverridden();
-    inline sal_Bool IsMarginsOverridden();
-    inline sal_Bool IsAboveWidthOverridden();
-    inline sal_Bool IsBelowWidthOverridden();
+    inline bool IsBorderStuffOverridden();
+    inline bool IsMarginsOverridden();
+    inline bool IsAboveWidthOverridden();
+    inline bool IsBelowWidthOverridden();
 
     inline void OverrideBorderStuff(LwpBorderStuff* pOther);
     inline void OverrideMargins(LwpMargins* pOther);
@@ -141,24 +141,24 @@ inline sal_Int32 LwpCharacterBorderOverride::GetBelowWidth() const
     return m_nBelowWidth;
 }
 
-inline sal_Bool LwpCharacterBorderOverride::IsBorderStuffOverridden()
+inline bool LwpCharacterBorderOverride::IsBorderStuffOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_STUFF) != 0);
+    return ((m_nOverride & PBO_STUFF) != 0);
 }
 
-inline sal_Bool LwpCharacterBorderOverride::IsMarginsOverridden()
+inline bool LwpCharacterBorderOverride::IsMarginsOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_MARGINS) != 0);
+    return ((m_nOverride & PBO_MARGINS) != 0);
 }
 
-inline sal_Bool LwpCharacterBorderOverride::IsAboveWidthOverridden()
+inline bool LwpCharacterBorderOverride::IsAboveWidthOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_ABOVE) != 0);
+    return ((m_nOverride & PBO_ABOVE) != 0);
 }
 
-inline sal_Bool LwpCharacterBorderOverride::IsBelowWidthOverridden()
+inline bool LwpCharacterBorderOverride::IsBelowWidthOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_BELOW) != 0);
+    return ((m_nOverride & PBO_BELOW) != 0);
 }
 
 inline void LwpCharacterBorderOverride::OverrideBorderStuff(LwpBorderStuff* pOther)
diff --git a/lotuswordpro/source/filter/lwpcolor.hxx b/lotuswordpro/source/filter/lwpcolor.hxx
index 9f58c1a62375..868f1d361d39 100644
--- a/lotuswordpro/source/filter/lwpcolor.hxx
+++ b/lotuswordpro/source/filter/lwpcolor.hxx
@@ -81,10 +81,10 @@ public:
     sal_uInt16 GetRed();
     sal_uInt16 GetGreen();
     sal_uInt16 GetBlue();
-    sal_Bool IsValidColor();
+    bool IsValidColor();
     sal_uInt32 To24Color();
     LwpColor& operator = (const LwpColor& rOther);
-    sal_Bool IsTransparent();
+    bool IsTransparent();
 private:
     sal_uInt16 m_nRed;          // When extra is AGLRGB_INDEX, m_nRed holds the
     sal_uInt16 m_nGreen;        // hi 16 bits and m_nGreen holds the lo 16 bits of
@@ -118,11 +118,11 @@ inline sal_uInt16 LwpColor::GetBlue()
 {
     return m_nBlue;
 }
-inline sal_Bool LwpColor::IsValidColor()
+inline bool LwpColor::IsValidColor()
 {
     return ((m_nExtra!=AGLRGB_INVALID) && (m_nExtra!=AGLRGB_TRANSPARENT));
 }
-inline sal_Bool LwpColor::IsTransparent()
+inline bool LwpColor::IsTransparent()
 {
     return (m_nExtra==AGLRGB_TRANSPARENT);
 }
diff --git a/lotuswordpro/source/filter/lwpcontent.cxx b/lotuswordpro/source/filter/lwpcontent.cxx
index 4b6e12a8e23c..77ae0d3ad9cb 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -130,26 +130,26 @@ LwpVirtualLayout* LwpContent::GetLayout(LwpVirtualLayout* pStartLayout)
     return m_LayoutsWithMe.GetLayout(pStartLayout);
 }
 
-sal_Bool LwpContent::HasNonEmbeddedLayouts()
+bool LwpContent::HasNonEmbeddedLayouts()
 {
     LwpVirtualLayout* pLayout = NULL;
     while( (pLayout = GetLayout(pLayout)) )
     {
         if(!pLayout->NoContentReference())
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool LwpContent::IsStyleContent()
+bool LwpContent::IsStyleContent()
 {
     LwpVirtualLayout* pLayout = NULL;
     while( (pLayout = GetLayout(pLayout)) )
     {
         if(pLayout->IsStyleLayout())
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index aaca21980649..fae9fccab048 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -111,12 +111,12 @@ protected:
 public:
     inline LwpAssociatedLayouts* GetLayoutsWithMe();
     LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout);
-    inline sal_Bool IsActive();
-    virtual sal_Bool IsTable();
+    inline bool IsActive();
+    virtual bool IsTable();
     inline OUString GetClassName();
     inline LwpContent* GetNextEnumerated();
-    sal_Bool HasNonEmbeddedLayouts();
-    sal_Bool IsStyleContent();
+    bool HasNonEmbeddedLayouts();
+    bool IsStyleContent();
 };
 
 LwpAssociatedLayouts* LwpContent::GetLayoutsWithMe()
@@ -124,14 +124,14 @@ LwpAssociatedLayouts* LwpContent::GetLayoutsWithMe()
     return &m_LayoutsWithMe;
 }
 
-inline sal_Bool LwpContent::IsActive()
+inline bool LwpContent::IsActive()
 {
     return !(m_nFlags & CF_DEACTIVATED);
 }
 
-inline sal_Bool LwpContent::IsTable()
+inline bool LwpContent::IsTable()
 {
-    return sal_False;
+    return false;
 }
 
 inline OUString LwpContent::GetClassName()
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index 01ab6456cc21..a2a094fd2d9c 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -86,10 +86,10 @@ public:
     // end add
 
     OUString GetClassName() { return m_ClassName.str(); }
-    inline sal_Bool HasContents();
-    inline sal_Bool IsOleDivision();
-    inline sal_Bool IsScrollable();
-    inline sal_Bool IsGotoable();
+    inline bool HasContents();
+    inline bool IsOleDivision();
+    inline bool IsScrollable();
+    inline bool IsGotoable();
     inline LwpDocument* GetDivision();
     void GetNumberOfPages(sal_uInt16& nPageno);
     sal_uInt16 GetMaxNumberOfPages();
@@ -136,25 +136,25 @@ private:
 
 };
 
-inline sal_Bool LwpDivInfo::HasContents()
+inline bool LwpDivInfo::HasContents()
 {
     return (m_nFlags & DI_HASCONTENTS) ? sal_True : sal_False;
 }
 
-inline sal_Bool LwpDivInfo::IsOleDivision()
+inline bool LwpDivInfo::IsOleDivision()
 {
     OUString strClassName = GetClassName();
     if (strClassName == STR_OleDivisionClassName)
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
-inline sal_Bool LwpDivInfo::IsScrollable()
+inline bool LwpDivInfo::IsScrollable()
 {
     return (m_nFlags & DI_SCROLLABLE) ? sal_True : sal_False;
 }
 
-inline sal_Bool LwpDivInfo::IsGotoable()
+inline bool LwpDivInfo::IsGotoable()
 {
     return HasContents() && (IsScrollable() || IsOleDivision());
 }
diff --git a/lotuswordpro/source/filter/lwpdlvlist.cxx b/lotuswordpro/source/filter/lwpdlvlist.cxx
index 01198b33fe79..1698e68f8085 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.cxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.cxx
@@ -123,7 +123,7 @@ void LwpDLNFVList::ReadName(LwpObjectStream* pObjStrm)
  **/
 LwpDLNFPVList::LwpDLNFPVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm),
-    m_bHasProperties(sal_True),m_pPropList(NULL)
+    m_bHasProperties(true),m_pPropList(NULL)
 {}
 /**
  * @descr       Read name of LwpDLNFVList from object stream
diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx
index a00ba30154ec..dea314e388ba 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.hxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.hxx
@@ -147,7 +147,7 @@ public:
     LwpDLNFPVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpDLNFPVList();
 protected:
-    sal_Bool m_bHasProperties;
+    bool m_bHasProperties;
     LwpPropList* m_pPropList;
 protected:
     void Read() SAL_OVERRIDE;
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index bca8886c50db..32967258c9a5 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -170,16 +170,16 @@ void LwpDocument::Parse(IXFStream* pOutputStream)
     }
 }
 
-sal_Bool LwpDocument::IsSkippedDivision()
+bool LwpDocument::IsSkippedDivision()
 {
     OUString sDivName;
-    sal_uInt8 ret = sal_False;
+    bool ret = false;
     LwpDivInfo* pDiv = dynamic_cast<LwpDivInfo*>(GetDivInfoID()->obj(VO_DIVISIONINFO));
     if (pDiv == NULL)
-        return sal_True;
+        return true;
     sDivName = pDiv->GetDivName();
     if (!sDivName.isEmpty() && !pDiv->IsGotoable()) //including toa,scripts division
-        return sal_True;
+        return true;
     //skip endnote division
     OUString strClassName = pDiv->GetClassName();
     if ((strClassName == STR_DivisionEndnote)
@@ -197,7 +197,7 @@ sal_Bool LwpDocument::IsSkippedDivision()
                 LwpObjectID* pFirst = pStory->GetFirstPara();
                 LwpObjectID* pLast = pStory->GetLastPara();
                 if(*pFirst == *pLast)
-                    ret = sal_True;
+                    ret = true;
             }
         }
     }
@@ -664,10 +664,10 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 /**
  * @descr    Get the numbers of page  before pEndDivision, copy from lwp source code
  */
- sal_Bool LwpDocument::GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount)
+bool LwpDocument::GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount)
 {
     if(this == pEndDivision)
-        return sal_True;
+        return true;
 
     LwpDivInfo* pDivInfo = dynamic_cast<LwpDivInfo*>(m_DivInfo.obj());
     if(pDivInfo)
@@ -679,11 +679,11 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     while(pDivision)
     {
         if(pDivision->GetNumberOfPages(pEndDivision,nCount))
-            return sal_True;
+            return true;
         pDivision = pDivision->GetNextDivision();
 
     }
-    return sal_False;
+    return false;
 }
 /**
  * @descr    Get the numbers of page  before curruent division
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index fb10521aec50..44155873e9cc 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -136,8 +136,8 @@ public:
     void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
     void RegisterStyle() SAL_OVERRIDE;
 
-    inline sal_Bool IsChildDoc();
-    inline sal_Bool HonorProtection();
+    inline bool IsChildDoc();
+    inline bool HonorProtection();
     inline LwpObjectID* GetContentList();
     inline LwpObjectID* GetDocData();
     inline LwpObjectID* GetSocket();
@@ -166,7 +166,7 @@ public:
     LwpDocument* GetLastDivision();
     LwpDocument* GetFirstDivision();
     LwpVirtualLayout* GetEnSuperTableLayout();
-    sal_Bool GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount);
+    bool GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount);
 
     sal_uInt16 GetNumberOfPagesBefore();
     void ParseFrameInPage(IXFStream* pOutputStream);
@@ -175,16 +175,16 @@ private:
     void MaxNumberOfPages(sal_uInt16& nNumPages);
     void XFConvertFrameInPage(XFContentContainer* pCont);
     void ChangeStyleName();
-    sal_Bool IsSkippedDivision();
+    bool IsSkippedDivision();
 };
 
-inline sal_Bool LwpDocument::IsChildDoc()
+inline bool LwpDocument::IsChildDoc()
 {
-    return (sal_Bool) ((m_nPersistentFlags & DOC_CHILDDOC) ? sal_True : sal_False);
+    return (m_nPersistentFlags & DOC_CHILDDOC);
 }
-inline sal_Bool LwpDocument::HonorProtection()
+inline bool LwpDocument::HonorProtection()
 {
-    return m_nPersistentFlags & DOC_PROTECTED ? sal_True : sal_False;
+    return m_nPersistentFlags & DOC_PROTECTED;
 }
 inline LwpObjectID* LwpDocument::GetContentList()
 {
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 26ecedc45ce4..d3ac87db2bb8 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -317,11 +317,11 @@ void LwpDrawObj::SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag
 
     if (nLeftArrow)
     {
-        pOpenedObjStyle->SetArrowStart( this->GetArrowName(nLeftArrow), fArrowSize, sal_True);
+        pOpenedObjStyle->SetArrowStart( this->GetArrowName(nLeftArrow), fArrowSize, true);
     }
     if (nRightArrow)
     {
-        pOpenedObjStyle->SetArrowEnd( this->GetArrowName(nRightArrow), fArrowSize, sal_True);
+        pOpenedObjStyle->SetArrowEnd( this->GetArrowName(nRightArrow), fArrowSize, true);
     }
 
 }
@@ -710,7 +710,7 @@ XFFrame* LwpDrawRectangle::CreateDrawObj(const OUString& rStyleName)
         }
         pRect->LineTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
                 (double)m_aVector[0].y/TWIPS_PER_CM * m_pTransData->fScaleY));
-        pRect->ClosePath(sal_True);
+        pRect->ClosePath(true);
         this->SetPosition(pRect);
 
         pRect->SetStyleName(rStyleName);
@@ -754,7 +754,7 @@ XFFrame* LwpDrawRectangle::CreateRoundedRect(const OUString& rStyleName)
 
     pRoundedRect->LineTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
                 (double)m_aVector[0].y/TWIPS_PER_CM * m_pTransData->fScaleY));
-    pRoundedRect->ClosePath(sal_True);
+    pRoundedRect->ClosePath(true);
     this->SetPosition(pRoundedRect);
 
     pRoundedRect->SetStyleName(rStyleName);
@@ -871,7 +871,7 @@ XFFrame* LwpDrawEllipse::CreateDrawObj(const OUString& rStyleName )
 
         pEllipse->CurveTo(aDest, aCtrl1, aCtrl2);
     }
-    pEllipse->ClosePath(sal_True);
+    pEllipse->ClosePath(true);
     this->SetPosition(pEllipse);
 
     pEllipse->SetStyleName(rStyleName);
@@ -981,9 +981,9 @@ void LwpDrawTextBox::SetFontStyle(XFFont* pFont, SdwTextBoxRecord* pRec)
     //size
     pFont->SetFontSize(pRec->nTextSize/20);
     // bold
-    pFont->SetBold((sal_Bool)((pRec->nTextAttrs & TA_BOLD) != 0));
+    pFont->SetBold(((pRec->nTextAttrs & TA_BOLD) != 0));
     // italic
-    pFont->SetItalic((sal_Bool)((pRec->nTextAttrs & TA_ITALIC) != 0));
+    pFont->SetItalic(((pRec->nTextAttrs & TA_ITALIC) != 0));
     // strike-through
     if (pRec->nTextAttrs & TA_STRIKETHRU)
     {
@@ -1000,7 +1000,7 @@ void LwpDrawTextBox::SetFontStyle(XFFont* pFont, SdwTextBoxRecord* pRec)
     }
     else if (pRec->nTextAttrs & TA_WORDUNDERLINE)
     {
-        pFont->SetUnderline(enumXFUnderlineSingle, sal_True);
+        pFont->SetUnderline(enumXFUnderlineSingle, true);
     }
     else if (pRec->nTextAttrs & TA_DOUBLEUNDER)
     {
@@ -1082,7 +1082,7 @@ OUString LwpDrawTextBox::RegisterStyle()
 
 XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName )
 {
-    XFFrame* pTextBox = new XFFrame(sal_True);
+    XFFrame* pTextBox = new XFFrame(true);
 
     sal_Int16 TextLength = m_aObjHeader.nRecLen - 71;
     rtl_TextEncoding aEncoding;
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 6f5ef47c5d67..010ac9fa73fc 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -136,7 +136,7 @@ void LWPFilterReader::cancel() throw (com::sun::star::uno::RuntimeException, std
 #include "bento.hxx"
 using namespace OpenStormBento;
 #include "explode.hxx"
- sal_Bool Decompress(SvStream *pCompressed, SvStream * & pOutDecompressed)
+ bool Decompress(SvStream *pCompressed, SvStream * & pOutDecompressed)
 {
     pCompressed->Seek(0);
     std::auto_ptr<SvStream> aDecompressed(new SvMemoryStream(4096, 4096));
@@ -148,17 +148,17 @@ using namespace OpenStormBento;
     LtcBenContainer* pBentoContainer;
     sal_uLong ulRet = BenOpenContainer(aLwpStream.get(), &pBentoContainer);
     if (ulRet != BenErr_OK)
-        return sal_False;
+        return false;
 
     boost::scoped_ptr<LtcUtBenValueStream> aWordProData((LtcUtBenValueStream *)pBentoContainer->FindValueStreamWithPropertyName("WordProData"));
 
     if (!aWordProData.get())
-        return sal_False;
+        return false;
 
     // decompressing
     Decompression decompress(aWordProData.get(), aDecompressed.get());
     if (0!= decompress.explode())
-        return sal_False;
+        return false;
 
     sal_uInt32 nPos = aWordProData->GetSize();
     nPos += 0x10;
@@ -169,7 +169,7 @@ using namespace OpenStormBento;
 
     //transfer ownership of aDecompressed's ptr
     pOutDecompressed = aDecompressed.release();
-    return sal_True;
+    return true;
 }
 
  /**
@@ -179,7 +179,7 @@ using namespace OpenStormBento;
  * @param    LwpSvStream * , created inside, deleted outside
  * @param      sal_Bool, sal_True -
  */
- sal_Bool GetLwpSvStream(SvStream *pStream, LwpSvStream * & pLwpSvStream)
+ bool GetLwpSvStream(SvStream *pStream, LwpSvStream * & pLwpSvStream)
 {
     SvStream * pDecompressed = NULL;
 
@@ -192,19 +192,19 @@ using namespace OpenStormBento;
         if (!Decompress(pStream, pDecompressed))
         {
             pLwpSvStream = NULL;
-            return sal_True;
+            return true;
         }
         pStream->Seek(0);
         pDecompressed->Seek(0);
     }
 
     pLwpSvStream = NULL;
-    sal_Bool bCompressed = sal_False;
+    bool bCompressed = false;
     if (pDecompressed)
     {
         LwpSvStream *pOriginalLwpSvStream = new LwpSvStream(pStream);
         pLwpSvStream  = new LwpSvStream(pDecompressed, pOriginalLwpSvStream);
-        bCompressed = sal_True;
+        bCompressed = true;
     }
     else
     {
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 607feab20cfa..b7e72f6cb400 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -94,13 +94,13 @@ void LwpFontAttrEntry::Override( XFFont*pFont )
     if (IsSuperOverridden())
     {
         if(Is(SUPERSCRIPT))
-            pFont->SetPosition(sal_True);
+            pFont->SetPosition(true);
     }
 
     if (IsSubOverridden())
     {
         if(Is(SUBSCRIPT))
-            pFont->SetPosition(sal_False);
+            pFont->SetPosition(false);
     }
 
     if (IsUnderlineOverridden())
@@ -168,44 +168,44 @@ void LwpFontAttrEntry::Override( XFFont*pFont )
     //  pFont->SetTightness(cTightness);*/
 }
 
-sal_Bool LwpFontAttrEntry::Is(sal_uInt16 Attr)
+bool LwpFontAttrEntry::Is(sal_uInt16 Attr)
 {
     return (0 != (m_nAttrBits & Attr));
 }
 
-sal_Bool LwpFontAttrEntry::IsBoldOverridden()
+bool LwpFontAttrEntry::IsBoldOverridden()
 {
     return (0 != (m_nAttrOverrideBits & BOLD));
 }
 
-sal_Bool LwpFontAttrEntry::IsItalicOverridden()
+bool LwpFontAttrEntry::IsItalicOverridden()
 {
     return (0 != (m_nAttrOverrideBits & ITALIC));
 }
-sal_Bool LwpFontAttrEntry::IsStrikeThruOverridden()
+bool LwpFontAttrEntry::IsStrikeThruOverridden()
 {
     return (0 != (m_nAttrOverrideBits & STRIKETHRU));
 }
-sal_Bool LwpFontAttrEntry::IsSmallCapsOverridden()
+bool LwpFontAttrEntry::IsSmallCapsOverridden()
 {
     return (0 != (m_nAttrOverrideBits & SMALLCAPS));
 }
-sal_Bool LwpFontAttrEntry::IsSuperOverridden()
+bool LwpFontAttrEntry::IsSuperOverridden()
 {
     return (0 != (m_nAttrOverrideBits & SUPERSCRIPT));
 
 }
-sal_Bool LwpFontAttrEntry::IsSubOverridden()
+bool LwpFontAttrEntry::IsSubOverridden()
 {
     return (0 != (m_nAttrOverrideBits & SUBSCRIPT));
 
 }
 
-sal_Bool LwpFontAttrEntry::IsUnderlineOverridden()
+bool LwpFontAttrEntry::IsUnderlineOverridden()
 {
     return (0 != (m_nAttrOverrideBits2 & UNDER));
 }
-sal_Bool LwpFontAttrEntry::IsCaseOverridden()
+bool LwpFontAttrEntry::IsCaseOverridden()
 {
     return (0 != (m_nAttrOverrideBits2 & CASE));
 }
@@ -322,27 +322,27 @@ void LwpFontNameEntry::Override(XFFont* pFont)
     //  pFont->SetTightness(cTightness);
 }
 
-sal_Bool LwpFontNameEntry::IsFaceNameOverridden()
+bool LwpFontNameEntry::IsFaceNameOverridden()
 {
     return (0 != (m_nOverrideBits & FACENAME));
 }
 
-sal_Bool LwpFontNameEntry::IsAltFaceNameOverridden()
+bool LwpFontNameEntry::IsAltFaceNameOverridden()
 {
     return (0 != (m_nOverrideBits & ALTFACENAME));
 }
 
-sal_Bool LwpFontNameEntry::IsPointSizeOverridden()
+bool LwpFontNameEntry::IsPointSizeOverridden()
 {
     return (0 != (m_nOverrideBits & POINTSIZE));
 }
 
-sal_Bool LwpFontNameEntry::IsColorOverridden()
+bool LwpFontNameEntry::IsColorOverridden()
 {
     return (0 != (m_nOverrideBits & COLOR));
 }
 
-sal_Bool LwpFontNameEntry::IsBackgroundColorOverridden()
+bool LwpFontNameEntry::IsBackgroundColorOverridden()
 {
     return (0 != (m_nOverrideBits & BKCOLOR));
 }
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 7ea545126860..f8e057802719 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -125,8 +125,8 @@ public:
     inline sal_uInt16 GetFaceID(){return m_nFaceName;}
     inline sal_uInt16 GetAltFaceID(){return m_nAltFaceName;}
     void Override(XFFont* pFont);
-    inline sal_Bool IsFaceNameOverridden();
-    inline sal_Bool IsAltFaceNameOverridden();
+    inline bool IsFaceNameOverridden();
+    inline bool IsAltFaceNameOverridden();
 private:
     //Data of CFontDescriptionOverrideBase
     sal_uInt8 m_nOverrideBits;
@@ -153,9 +153,9 @@ private:
                             | TIGHTNESS | FACENAME | BKCOLOR)
     };
 
-    inline sal_Bool IsPointSizeOverridden();
-    inline sal_Bool IsColorOverridden();
-    inline sal_Bool IsBackgroundColorOverridden();
+    inline bool IsPointSizeOverridden();
+    inline bool IsColorOverridden();
+    inline bool IsBackgroundColorOverridden();
 //TODO
 //    inline sal_Bool IsTightnessOverridden();
 //    inline sal_Bool IsAnythingOverridden();
@@ -235,15 +235,15 @@ private:
         UNDER   = 0x02,
         ALL_ATTRS2          = CASE | UNDER
     };
-    sal_Bool Is(sal_uInt16 Attr);
-    sal_Bool IsBoldOverridden();
-    sal_Bool IsItalicOverridden();
-    sal_Bool IsStrikeThruOverridden();
-    sal_Bool IsSmallCapsOverridden();
-    sal_Bool IsSuperOverridden();
-    sal_Bool IsSubOverridden();
-    sal_Bool IsUnderlineOverridden();
-    sal_Bool IsCaseOverridden();
+    bool Is(sal_uInt16 Attr);
+    bool IsBoldOverridden();
+    bool IsItalicOverridden();
+    bool IsStrikeThruOverridden();
+    bool IsSmallCapsOverridden();
+    bool IsSuperOverridden();
+    bool IsSubOverridden();
+    bool IsUnderlineOverridden();
+    bool IsCaseOverridden();
 
 };
 
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index a71d520e3fd9..1d95043228e5 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -232,8 +232,8 @@ public:
     sal_uInt32 GetAbove(){ return m_nAbove;}
     sal_uInt32 GetBelow(){ return m_nBelow;}
     LwpBorderStuff* GetBorderStuff(){ return &m_BorderStuff;}
-    sal_Bool HasCustomLength(){ return (m_nFlag & CUSTOM_LENGTH) != 0;}
-    sal_Bool HasSeparator(){ return (m_nFlag & HAS_SEPARATOR) != 0;}
+    bool HasCustomLength(){ return (m_nFlag & CUSTOM_LENGTH) != 0;}
+    bool HasSeparator(){ return (m_nFlag & HAS_SEPARATOR) != 0;}
     float GetTopBorderWidth(){ return m_BorderStuff.GetSideWidth(LwpBorderStuff::TOP);}
     LwpColor GetTopBorderColor(){ return m_BorderStuff.GetSideColor(LwpBorderStuff::TOP);}
 };
@@ -282,8 +282,8 @@ public:
     LwpFootnoteNumberOptions* GetEndnoteDocNumbering(){ return &m_EndnoteDocNumbering;}
     LwpFootnoteSeparatorOptions* GetFootnoteSeparator(){ return &m_FootnoteSeparator;}
     LwpFootnoteSeparatorOptions* GetFootnoteContinuedSeparator(){ return &m_FootnoteContinuedSeparator;}
-    sal_Bool GetContinuedFrom(){ return ((m_nFlag & FO_CONTINUEFROM) != 0);}
-    sal_Bool GetContinuedOn(){ return ((m_nFlag & FO_CONTINUEON) != 0);}
+    bool GetContinuedFrom(){ return ((m_nFlag & FO_CONTINUEFROM) != 0);}
+    bool GetContinuedOn(){ return ((m_nFlag & FO_CONTINUEON) != 0);}
     OUString GetContinuedOnMessage();
     OUString GetContinuedFromMessage();
     void SetMasterPage(const OUString& strMasterPage){ m_strMasterPage = strMasterPage;}
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index a97267e14b4a..2245d65fb22e 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -210,7 +210,7 @@ void  LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
             sal_Int32 nFirst = pParent->GetPageNumber(FIRST_LAYOUTPAGENO);
             sal_Int32 nLast = pParent->GetPageNumber(LAST_LAYOUTPAGENO);
             if(nLast > 0)
-                m_pLayout->XFConvertFrame(pCont, nFirst, nLast, sal_True);
+                m_pLayout->XFConvertFrame(pCont, nFirst, nLast, true);
 
         }
         else if(m_pLayout->IsUseOnAllOddPages()||m_pLayout->IsUseOnAllEvenPages())
@@ -225,7 +225,7 @@ void  LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
                     nFirst++;
                 if(nFirst <= nLast)
                 {
-                    m_pLayout->XFConvertFrame(pCont, nFirst, nLast, sal_False);
+                    m_pLayout->XFConvertFrame(pCont, nFirst, nLast, false);
                 }
             }
         }
@@ -400,7 +400,7 @@ void LwpFrame::ApplyProtect(XFFrameStyle* pFrameStyle)
 {
     if(m_pLayout->IsProtected())
     {
-        pFrameStyle->SetProtect(sal_True,sal_True,sal_True);
+        pFrameStyle->SetProtect(true,true,true);
     }
 }
 /**
@@ -713,7 +713,7 @@ void LwpFrame::ParseAnchorType(XFFrame *pXFFrame)
  * @descr Calculate the distance between the frame object and the page margins.
  *       And determine which side(left or right) is wider
  */
-sal_Bool LwpFrame::IsLeftWider()
+bool LwpFrame::IsLeftWider()
 {
     //LwpMiddleLayout* pParent = static_cast<LwpMiddleLayout*>(m_pLayout->GetContainerLayout());
     LwpVirtualLayout* pParent = static_cast<LwpVirtualLayout*>(m_pLayout->GetContainerLayout());
@@ -739,9 +739,9 @@ sal_Bool LwpFrame::IsLeftWider()
         double fLeft = fXOffset - fWrapLeft -fParentMarginLeft;
         double fRight = fParentWidth - fParentMarginRight -(fXOffset + fWidth + fWrapRight);
         if(fLeft > fRight)
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
 LwpFrameLink::LwpFrameLink()
@@ -815,7 +815,7 @@ void LwpFrameLayout::Read()
  * @param:  nPageNo - the page number that the frame anchors
  *
  */
-void LwpFrameLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart , sal_Int32 nEnd, sal_Bool bAll )
+void LwpFrameLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart , sal_Int32 nEnd, bool bAll )
 {
     if(m_pFrame)
     {
@@ -901,27 +901,27 @@ OUString LwpFrameLayout::GetNextLinkName()
  * @descr whether current frame is linked by other frame
  *
  */
-sal_Bool LwpFrameLayout::HasPreviousLinkLayout()
+bool LwpFrameLayout::HasPreviousLinkLayout()
 {
     LwpObjectID* pObjectID = m_Link.GetPreviousLayout();
     if(pObjectID->IsNull())
-        return sal_False;
-    return sal_True;
+        return false;
+    return true;
 }
 /**
  * @descr whether current frame is for water mark. Problem maybe exsits by this method, must be tracking
  *
  */
- sal_Bool LwpFrameLayout::IsForWaterMark()
+bool LwpFrameLayout::IsForWaterMark()
 {
     if(m_nBuoyancy >=LAY_BUOYLAYER)
     {
         if(!m_Content.IsNull() && (m_Content.obj()->GetTag()==VO_GRAPHIC) )
         {
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 /**
@@ -1080,7 +1080,7 @@ void LwpGroupLayout::XFConvert(XFContentContainer *pCont)
  * @param:  nPageNo - the page number that the frame anchors
  *
  */
-void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart , sal_Int32 nEnd, sal_Bool bAll)
+void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart , sal_Int32 nEnd, bool bAll)
 {
     if(m_pFrame)
     {
@@ -1178,7 +1178,7 @@ void LwpDropcapLayout::RegisterStyle(LwpFoundry* pFoundry)
     LwpStory* pStory = GetContentStory();
     if (pStory)
     {
-        pStory->SetDropcapFlag(sal_True);
+        pStory->SetDropcapFlag(true);
         pStory->SetFoundry(pFoundry);
         LwpPara* pPara = static_cast<LwpPara*>(pStory->GetFirstPara()->obj());
         while(pPara)
@@ -1235,7 +1235,7 @@ void LwpRubyLayout::ConvertContentText()
     LwpStory* pStory = GetContentStory();
     LwpRubyMarker* pMarker = GetMarker();
     if (pStory && pMarker)
-        pMarker->SetRubyText(pStory->GetContentText(sal_True));
+        pMarker->SetRubyText(pStory->GetContentText(true));
 }
 
 void LwpRubyLayout::RegisterStyle()
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index c4535180714f..ec0c39cbbf2f 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -98,7 +98,7 @@ private:
     void ApplyBackGround(XFFrameStyle* pFrameStyle);
     // end add
     void ParseAnchorType(XFFrame* pXFFrame);
-    sal_Bool IsLeftWider();
+    bool IsLeftWider();
 private:
     LwpPlacableLayout* m_pLayout;
     OUString m_StyleName;
@@ -133,10 +133,10 @@ public:
     virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FRAME_LAYOUT;}
     virtual void RegisterStyle() SAL_OVERRIDE;
     virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
-    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
+    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
     OUString GetNextLinkName();
-    sal_Bool HasPreviousLinkLayout();
-    sal_Bool IsForWaterMark() SAL_OVERRIDE;
+    bool HasPreviousLinkLayout();
+    bool IsForWaterMark() SAL_OVERRIDE;
     double GetWidth() SAL_OVERRIDE;
     void ApplyGraphicSize(XFFrame* pXFFrame);
 protected:
@@ -161,7 +161,7 @@ public:
     virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_GROUP_LAYOUT;}
     virtual void RegisterStyle() SAL_OVERRIDE;
     virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
-    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
+    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
 protected:
     void Read() SAL_OVERRIDE;
 private:
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index f9ea79dd801c..f753ece9c430 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -90,9 +90,9 @@ LwpFrib::LwpFrib(LwpPara* pPara)
     , m_pNext(NULL)
     , m_nFribType(0)
     , m_pModifiers(NULL)
-    , m_ModFlag(sal_False)
+    , m_ModFlag(false)
     , m_nRevisionType(0)
-    , m_bRevisionFlag(sal_False)
+    , m_bRevisionFlag(false)
     , m_nEditor(0)
 {
 }
@@ -112,10 +112,10 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt
         pModInfo  = new ModifierInfo();
         pModInfo->CodePage = 0;
         pModInfo->FontID = 0;
-        pModInfo->RevisionFlag = sal_False;
-        pModInfo->HasCharStyle = sal_False;
-        pModInfo->HasLangOverride = sal_False;
-        pModInfo->HasHighlight = sal_False;
+        pModInfo->RevisionFlag = false;
+        pModInfo->HasCharStyle = false;
+        pModInfo->HasLangOverride = false;
+        pModInfo->HasHighlight = false;
         ReadModifiers( pObjStrm, pModInfo );
     }
 
@@ -221,10 +221,10 @@ void LwpFrib::SetModifiers(ModifierInfo* pModifiers)
     if (pModifiers)
     {
         m_pModifiers = pModifiers;
-        m_ModFlag = sal_True;
+        m_ModFlag = true;
         if (pModifiers->RevisionFlag)
         {
-            m_bRevisionFlag = sal_True;
+            m_bRevisionFlag = true;
             m_nRevisionType = pModifiers->RevisionType;
         }
     }
@@ -236,7 +236,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
         return;
     if (!m_pModifiers->FontID && !m_pModifiers->HasCharStyle && !m_pModifiers->HasHighlight)
     {
-        m_ModFlag = sal_False;
+        m_ModFlag = false;
         return;
     }
     //we only read four modifiers, in these modifiers,CodePage and LangOverride are not styles,
@@ -339,11 +339,11 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo)
                     pModInfo->FontID = pObjStrm->QuickReaduInt32();
                 break;
             case FRIB_MTAG_CHARSTYLE:
-                pModInfo->HasCharStyle = sal_True;
+                pModInfo->HasCharStyle = true;
                 pModInfo->CharStyleID.ReadIndexed(pObjStrm);
                 break;
             case FRIB_MTAG_LANGUAGE:
-                pModInfo->HasLangOverride = sal_True;
+                pModInfo->HasLangOverride = true;
                 pModInfo->Language.Read(pObjStrm);
                 break;
             case FRIB_MTAG_CODEPAGE:
@@ -358,11 +358,11 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo)
             case FRIB_MTAG_ATTRIBUTE:
                 pModInfo->aTxtAttrOverride.Read(pObjStrm);
                 if (pModInfo->aTxtAttrOverride.IsHighlight())
-                    pModInfo->HasHighlight = sal_True;
+                    pModInfo->HasHighlight = true;
                 break;
             case FRIB_MTAG_REVISION:
                 pModInfo->RevisionType = pObjStrm->QuickReaduInt8();
-                pModInfo->RevisionFlag = sal_True;
+                pModInfo->RevisionFlag = true;
                 break;
             default:
                 pObjStrm->SeekRel(len);
@@ -376,11 +376,11 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo)
 *  @descr:   Whether there are other fribs following current frib.
 *  @return:  Ture if having following fribs, or false.
 */
-sal_Bool LwpFrib::HasNextFrib()
+bool LwpFrib::HasNextFrib()
 {
     if (!GetNext() || GetNext()->GetType()==FRIB_TAG_EOP)
-        return sal_False;
-    return sal_True;
+        return false;
+    return true;
 }
 
 void LwpFrib::ConvertChars(XFContentContainer* pXFPara,const OUString& text)
diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx
index d6d29760a772..21252aa54ed0 100644
--- a/lotuswordpro/source/filter/lwpfrib.hxx
+++ b/lotuswordpro/source/filter/lwpfrib.hxx
@@ -79,11 +79,11 @@ struct ModifierInfo
     LwpTextAttributeOverride aTxtAttrOverride;
     //end add
     sal_uInt16 CodePage;
-    sal_Bool HasCharStyle;
-    sal_Bool HasLangOverride;
-    sal_Bool HasHighlight;
+    bool HasCharStyle;
+    bool HasLangOverride;
+    bool HasHighlight;
     sal_uInt8 RevisionType;
-    sal_Bool RevisionFlag;
+    bool RevisionFlag;
 };
 
 class LwpPara;
@@ -110,20 +110,20 @@ protected:
     ModifierInfo* m_pModifiers;
     OUString m_StyleName;
 public:
-    sal_Bool m_ModFlag;
+    bool m_ModFlag;
     OUString GetStyleName(){return m_StyleName;}//add by  1-10
 //  void SetStyle(LwpFoundry* pFoundry);
-    sal_Bool IsModified(){return m_ModFlag;}
+    bool IsModified(){return m_ModFlag;}
     void SetModifiers(ModifierInfo* pModifiers);
     ModifierInfo* GetModifiers(){return m_pModifiers;}
     virtual void RegisterStyle(LwpFoundry* pFoundry);
-    sal_Bool HasNextFrib();
+    bool HasNextFrib();
     void ConvertChars(XFContentContainer* pXFPara,const OUString& text);
     void ConvertHyperLink(XFContentContainer* pXFPara,LwpHyperlinkMgr* pHyperlink,const OUString& text);
     XFFont* GetFont();
 
     sal_uInt8 GetRevisionType(){return m_nRevisionType;}
-    sal_Bool GetRevisionFlag(){return m_bRevisionFlag;}
+    bool GetRevisionFlag(){return m_bRevisionFlag;}
     enum{
         REV_INSERT =0,
         REV_DELETE = 1,
@@ -133,7 +133,7 @@ private:
     static void ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo);
 protected:
     sal_uInt8 m_nRevisionType;
-    sal_Bool m_bRevisionFlag;
+    bool m_bRevisionFlag;
     sal_uInt8 m_nEditor;
 };
 
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx
index 4d33903a0822..9890e1f56473 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.cxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx
@@ -106,7 +106,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
 }
 
 LwpFribPageBreak::LwpFribPageBreak( LwpPara* pPara )
-    : LwpFrib(pPara), m_bLastFrib(sal_False), m_pMasterPage(NULL)
+    : LwpFrib(pPara), m_bLastFrib(false), m_pMasterPage(NULL)
 {
 }
 
@@ -143,11 +143,11 @@ void LwpFribPageBreak::RegisterBreakStyle(LwpPara* pPara)
     pOverStyle->SetMasterPage(pBaseStyle->GetMasterPage());
 
     if (!GetNext() || GetNext()->GetType()==FRIB_TAG_EOP)
-        m_bLastFrib = sal_True;
+        m_bLastFrib = true;
     else
-        m_bLastFrib = sal_False;
+        m_bLastFrib = false;
 
-    if (m_bLastFrib == sal_True)
+    if (m_bLastFrib)
         pOverStyle->SetBreaks(enumXFBreakAftPage);
     else
         pOverStyle->SetBreaks(enumXFBreakBefPage);
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx
index 8181ffd1fe34..927f6b28ec16 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.hxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx
@@ -78,11 +78,11 @@ public:
     void RegisterBreakStyle(LwpPara* pPara);
     void ParseLayout();
     LwpObjectID* GetLayout(){return &m_Layout;}
-    sal_Bool IsLastFrib(){return m_bLastFrib;}
+    bool IsLastFrib(){return m_bLastFrib;}
 
 private:
     LwpObjectID m_Layout;
-    sal_Bool m_bLastFrib;
+    bool m_bLastFrib;
 
     LwpMasterPage* m_pMasterPage;
 };
diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx b/lotuswordpro/source/filter/lwpfribframe.cxx
index 3ce30700728f..6e489507f4a0 100644
--- a/lotuswordpro/source/filter/lwpfribframe.cxx
+++ b/lotuswordpro/source/filter/lwpfribframe.cxx
@@ -136,11 +136,11 @@ void LwpFribFrame::SetParaDropcap(LwpPara* pPara)
 
     if (pObject && pObject->GetTag() == VO_DROPCAPLAYOUT)
     {
-        pPara->SetParaDropcap(sal_True);
+        pPara->SetParaDropcap(true);
         pPara->SetDropcapLayout(dynamic_cast<LwpDropcapLayout*>(pObject));
     }
     else
-        pPara->SetParaDropcap(sal_False);
+        pPara->SetParaDropcap(false);
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index d767de2ceed6..05874bc8e4b8 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -114,13 +114,13 @@ void LwpFribCHBlock::XFConvert(XFContentContainer* pXFPara,LwpStory* pStory)
         {
             if (pHyperlink)
             {
-                pHyperlink->SetHyperlinkFlag(sal_True);
+                pHyperlink->SetHyperlinkFlag(true);
                 pHyperlink->SetHyperlink(pMarker->GetNamedProperty("URL"));
             }
         }
         else if (type == MARKER_END)//or none
         {
-            pHyperlink->SetHyperlinkFlag(sal_False);
+            pHyperlink->SetHyperlinkFlag(false);
         }
     }
     else//click here block
@@ -261,7 +261,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
     //end marker
     if (type == MARKER_END)
     {
-        if (pFieldMark->GetStart() == sal_False)
+        if (pFieldMark->GetStart() == false)
             return;
         if (pFieldMark->IsFormulaInsert())
         {
@@ -354,7 +354,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
         pXFPara->Add(pSpan);
     }
 
-    pFieldMark->SetStart(sal_True);
+    pFieldMark->SetStart(true);
 }
 
 void LwpFribField::RegisterStyle(LwpFoundry* pFoundry)
@@ -378,7 +378,7 @@ void LwpFribField::RegisterStyle(LwpFoundry* pFoundry)
         LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr();
         pChangeMgr->AddChangeFrib(this);
         pFieldMark->SetStartFrib(this);
-        pFieldMark->SetRevisionFlag(sal_True);
+        pFieldMark->SetRevisionFlag(true);
     }
 }
 
@@ -405,7 +405,7 @@ void LwpFribField::RegisterTimeField(LwpFieldMark* pFieldMark)
 void LwpFribField::RegisterTotalTimeStyle()
 {
     XFTimeStyle* pTimeStyle = new XFTimeStyle;//use the default format
-    pTimeStyle->SetTruncate(sal_False);
+    pTimeStyle->SetTruncate(false);
     pTimeStyle->AddMinute();
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
     m_TimeStyle = pXFStyleManager->AddStyle(pTimeStyle)->GetStyleName();
@@ -422,11 +422,11 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
     {
         if (sFormula == "%FLSystemShortDate")
         {
-            pDateStyle = LwpTools::GetSystemDateStyle(sal_False);
+            pDateStyle = LwpTools::GetSystemDateStyle(false);
         }
         else if (sFormula == "%FLSystemLongDate")
         {
-            pDateStyle = LwpTools::GetSystemDateStyle(sal_True);
+            pDateStyle = LwpTools::GetSystemDateStyle(true);
         }
         else if (sFormula == "%FLISODate1" || sFormula == "%FLYYYY/MM/DD" )
         {
@@ -450,23 +450,23 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle->AddText(":");
             pDateStyle->AddMinute();
             pDateStyle->AddText(":");
-            pDateStyle->AddSecond(sal_True,0);
+            pDateStyle->AddSecond(true,0);
         }
         else if (sFormula == "%FLM/D/YY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLMonth D, YYYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(", ");
             pDateStyle->AddYear();
         }
@@ -475,77 +475,77 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(", ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%FLMn D, YYYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(", ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%FLWday, Mn D, YYYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddWeekDay(sal_False);
+            pDateStyle->AddWeekDay(false);
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(", ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%FLMn D")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%FLWeekday, Mn D")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%FLMn D, YY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(", ");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLM/D")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%FLM/YY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLMn YY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLWeekday")
         {
@@ -555,27 +555,27 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
         else if (sFormula == "%FLWday")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddWeekDay(sal_False);
+            pDateStyle->AddWeekDay(false);
         }
         else if (sFormula == "%FLMonth")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
         }
         else if (sFormula == "%FLMn")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
         }
         else if (sFormula == "%FLD")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%FLM")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
         }
         else if (sFormula == "%FLYYYY" )
         {
@@ -585,26 +585,26 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
         else if (sFormula == "%FLYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         //chinese version begin
         else if (sFormula == "%FLYY/M/D")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
             pDateStyle->AddText("-");
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("-");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if(sFormula == "%FLYYYY Month D")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddYear();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if(sFormula == "%FLWeekday, YYYY Month D")
         {
@@ -613,53 +613,53 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle->AddText(",");
             pDateStyle->AddYear();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if(sFormula == "%FLYYYY Mn D")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddYear();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if(sFormula == "%FLWday, YYYY Mn D")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddWeekDay(sal_False);
+            pDateStyle->AddWeekDay(false);
             pDateStyle->AddText(",");
             pDateStyle->AddYear();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         //next 2 are the same with english version
         else if (sFormula == "%FLYY Mn D")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%FLYY/M")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("-");
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
         }
         else if (sFormula == "%FLYY Mn")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
         }
         else if (sFormula == "%FLeeeeoa" || sFormula == "%FLffffooaa" || sFormula == "%FLEEEEOA")
         {
@@ -668,10 +668,10 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle->AddYear();
             sText = OUString(0x5e74);
             pDateStyle->AddText(sText);
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             sText = OUString(0x6708);
             pDateStyle->AddText(sText);
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             sText = OUString(0x65e5);
             pDateStyle->AddText(sText);
         }
@@ -679,10 +679,10 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
         {
             pDateStyle = new XFDateStyle;
             OUString sText;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             sText = OUString(0x6708);
             pDateStyle->AddText(sText);
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             sText = OUString(0x65e5);
             pDateStyle->AddText(sText);
         }
@@ -691,18 +691,18 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddYear();
             pDateStyle->AddText("-");
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("-");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%FLYY.M.D" )
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
             pDateStyle->AddText(".");
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText(".");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         //chinese version end
         //other version begin
@@ -711,7 +711,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(", ");
@@ -722,7 +722,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(", ");
@@ -731,18 +731,18 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
         else if (sFormula == "%FLD/M/YY" )
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLD Month YYYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
@@ -751,7 +751,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
@@ -760,9 +760,9 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
@@ -773,63 +773,63 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle->AddText(", ");
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%FLD Mn YYYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%FLWday, D Mn YYYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddWeekDay(sal_False);
+            pDateStyle->AddWeekDay(false);
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%FLWday, DD Mn YYYY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddWeekDay(sal_False);
+            pDateStyle->AddWeekDay(false);
             pDateStyle->AddText(", ");
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%FLD Mn")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
         }
         else if (sFormula == "%FLDD Mn")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
         }
         else if (sFormula == "%FLWeekday, D Mn")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
         }
         else if (sFormula == "%FLWeekday, DD Mn")
         {
@@ -838,32 +838,32 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle->AddText(", ");
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
         }
         else if (sFormula == "%FLD Mn YY")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLDD Mn YY")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddMonthDay();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_False,sal_True);
+            pDateStyle->AddMonth(false,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLD/M")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
         }
         else if (sFormula == "%FLDD/MM")
         {
@@ -879,14 +879,14 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle->AddText("/");
             pDateStyle->AddMonth();
             pDateStyle->AddText("/");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         else if (sFormula == "%FLMM/YY")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddMonth();
             pDateStyle->AddText("/");
-            pDateStyle->AddYear(sal_False);
+            pDateStyle->AddYear(false);
         }
         //other version end
     //TIME
@@ -901,55 +901,55 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(":");
-            pTimeStyle->AddSecond(sal_True,0);
+            pTimeStyle->AddSecond(true,0);
         }
         else if (sFormula == "%FLH:mm ampm")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(" ");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         else if (sFormula == "%FLH:mm")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
         }
         else if (sFormula == "%FLH:mm:SS ampm")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(":");
-            pTimeStyle->AddSecond(sal_True,0);
+            pTimeStyle->AddSecond(true,0);
             pTimeStyle->AddText(" ");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         else if (sFormula == "%FLH:mm:SS")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(":");
-            pTimeStyle->AddSecond(sal_True,0);
+            pTimeStyle->AddSecond(true,0);
         }
         else if (sFormula == "%FLH ampm")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
             pTimeStyle->AddText(" ");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         else if (sFormula == "%FLH")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
         }
         else if (sFormula == "%FLmm")
         {
@@ -959,35 +959,35 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
         else if (sFormula == "%FLSS")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddSecond(sal_True,0);
+            pTimeStyle->AddSecond(true,0);
         }
         else if (sFormula == "%FLampm")
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         //chinese version begin
         else     if (sFormula == "%FLjF" || sFormula == "%FLJFF"
             || sFormula == "%FLjjF" || sFormula == "%FLJJFF " )
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
             OUString sText;
             sText = OUString(0x70b9);
             pTimeStyle->AddText(sText);
-            pTimeStyle->AddMinute(sal_False);
+            pTimeStyle->AddMinute(false);
             sText = OUString(0x5206);
             pTimeStyle->AddText(sText);
         }
         else if (sFormula == "%FLjjjF" || sFormula == "%FLJJJFF" )
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->SetAmPm(sal_True);
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->SetAmPm(true);
+            pTimeStyle->AddHour(false);
             OUString sText;
             sText = OUString(0x70b9);
             pTimeStyle->AddText(sText);
-            pTimeStyle->AddMinute(sal_False);
+            pTimeStyle->AddMinute(false);
             sText = OUString(0x5206);
             pTimeStyle->AddText(sText);
         }
@@ -1000,14 +1000,14 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(" ");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         else if (sFormula == "%FLHH ampm")
         {
             pTimeStyle = new XFTimeStyle;
             pTimeStyle->AddHour();
             pTimeStyle->AddText(" ");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         else if (sFormula == "%FLHH:mm:SS ampm")
         {
@@ -1016,9 +1016,9 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(":");
-            pTimeStyle->AddSecond(sal_True,0);
+            pTimeStyle->AddSecond(true,0);
             pTimeStyle->AddText(" ");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         else if (sFormula == "%FLHH:mm")
         {
@@ -1034,7 +1034,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(":");
-            pTimeStyle->AddSecond(sal_True,0);
+            pTimeStyle->AddSecond(true,0);
         }
         //other version end
     }
@@ -1042,23 +1042,23 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
     {
         if (sFormula == "%Da")
         {
-            pDateStyle = LwpTools::GetSystemDateStyle(sal_False);
+            pDateStyle = LwpTools::GetSystemDateStyle(false);
         }
         else if (sFormula == "%DB" || sFormula == "%Db")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(", ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%Dc" || sFormula == "%DC")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
@@ -1067,57 +1067,57 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(", ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(", ");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%DE" || sFormula == "%De")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%Df" || sFormula == "%DF")
         {
             pDateStyle = new XFDateStyle;
             pDateStyle->AddWeekDay();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%Dg")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%Dh")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_False);
+            pDateStyle->AddMonth(false);
             pDateStyle->AddText("/");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText("/");
             pDateStyle->AddYear();
         }
         else if (sFormula == "%Di" || sFormula == "%DI")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(".");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
         }
         else if (sFormula == "%Dj" || sFormula == "%DJ")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
             pDateStyle->AddText(".");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
             pDateStyle->AddYear();
         }
@@ -1126,14 +1126,14 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pDateStyle = new XFDateStyle;
             pDateStyle->AddYear();
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(" ");
-            pDateStyle->AddMonthDay(sal_False);
+            pDateStyle->AddMonthDay(false);
         }
         else if (sFormula == "%DL" || sFormula == "%Dl")
         {
             pDateStyle = new XFDateStyle;
-            pDateStyle->AddMonth(sal_True,sal_True);
+            pDateStyle->AddMonth(true,true);
             pDateStyle->AddText(",");
             pDateStyle->AddYear();
         }
@@ -1160,11 +1160,11 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
          || sFormula == "%T4" || sFormula == "%T8" )
         {
             pTimeStyle = new XFTimeStyle;
-            pTimeStyle->AddHour(sal_False);
+            pTimeStyle->AddHour(false);
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(":");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
         else if (sFormula == "%T3" || sFormula == "%T7"
          || sFormula == "%T5" || sFormula == "%T9")
@@ -1174,7 +1174,7 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
             pTimeStyle->AddText(":");
             pTimeStyle->AddMinute();
             pTimeStyle->AddText(":");
-            pTimeStyle->SetAmPm(sal_True);
+            pTimeStyle->SetAmPm(true);
         }
     }
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
@@ -1251,7 +1251,7 @@ void LwpFribField::ConvertDocFieldStart(XFContentContainer* pXFPara,LwpFieldMark
             pSpan->SetStyleName(GetStyleName());
             pSpan->Add(pContent);
             pXFPara->Add(pSpan);
-            pFieldMark->SetStyleFlag(sal_True);
+            pFieldMark->SetStyleFlag(true);
         }
         else
             pXFPara->Add(pContent);
@@ -1342,7 +1342,7 @@ void LwpFribField::ConvertDateTimeStart(XFContentContainer* pXFPara,LwpFieldMark
             pSpan->SetStyleName(GetStyleName());
             pSpan->Add(pContent);
             pXFPara->Add(pSpan);
-            pFieldMark->SetStyleFlag(sal_True);
+            pFieldMark->SetStyleFlag(true);
         }
         else
             pXFPara->Add(pContent);
@@ -1401,7 +1401,7 @@ void LwpFribField::ConvertCrossRefStart(XFContentContainer* pXFPara,LwpFieldMark
         pSpan->SetStyleName(GetStyleName());
         pSpan->Add(pRef);
         pXFPara->Add(pSpan);
-        pFieldMark->SetStyleFlag(sal_True);
+        pFieldMark->SetStyleFlag(true);
     }
     else
         pXFPara->Add(pRef);
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index 1b973ebe1685..7d6b0009d921 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -155,7 +155,7 @@ void LwpFribPtr::XFConvert()
     while(pFrib)
     {
         sal_uInt8 nFribType = pFrib->GetType();
-        sal_Bool bRevisionFlag = pFrib->GetRevisionFlag();
+        bool bRevisionFlag = pFrib->GetRevisionFlag();
         OUString sChangeID;
         if (bRevisionFlag)
         {
@@ -229,7 +229,7 @@ void LwpFribPtr::XFConvert()
             }
             else
             {
-                if (pPageBreak->IsLastFrib() == sal_True)
+                if (pPageBreak->IsLastFrib())
                 {
                     m_pXFPara->SetStyleName( pPageBreak->GetStyleName() );
                 }
@@ -601,7 +601,7 @@ void LwpFribPtr::ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen)
 {
     if (pStory)
     {
-        if (pStory->GetDropcapFlag() == sal_True)
+        if (pStory->GetDropcapFlag())
         {
             XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
             XFTextStyle* pFribStyle = pXFStyleManager->FindTextStyle(pFrib->GetStyleName());
@@ -617,10 +617,10 @@ void LwpFribPtr::ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen)
  * @descr:  If the position of pPreLayout is earlier than pNextLayout, return true, or return false, defalut return true
  *
 */
-sal_Bool LwpFribPtr::ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout)
+bool LwpFribPtr::ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout)
 {
     if(!pPreLayout || !pNextLayout)
-        return sal_True;
+        return true;
 
     LwpFrib* pFrib = m_pFribs;
     LwpVirtualLayout* pLayout = NULL;
@@ -652,14 +652,14 @@ sal_Bool LwpFribPtr::ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtua
         if(pLayout)
         {
             if(pPreLayout == pLayout)
-                return sal_True;
+                return true;
             if(pNextLayout == pLayout)
-                return sal_False;
+                return false;
         }
         pFrib = pFrib->GetNext();
     }
 
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpfribptr.hxx b/lotuswordpro/source/filter/lwpfribptr.hxx
index 678ccb2da024..8892b3f7484b 100644
--- a/lotuswordpro/source/filter/lwpfribptr.hxx
+++ b/lotuswordpro/source/filter/lwpfribptr.hxx
@@ -94,7 +94,7 @@ public:
     void FindLayouts();// for register pagelayout, add by , 02/20/2005
     LwpFrib* GetFribs(){return m_pFribs;}
     LwpFrib* HasFrib(sal_uInt8 nType);
-    sal_Bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
+    bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
     void GatherAllText();
 };
 
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index e414e5c04a70..edd594060f14 100644
--- a/lotuswordpro/source/filter/lwpfribsection.cxx
+++ b/lotuswordpro/source/filter/lwpfribsection.cxx
@@ -204,7 +204,7 @@ void LwpFribSection::SetDefaultAlphaIndex(XFIndex * pXFIndex)
     XFIndexTemplate * pTemplateSep = new XFIndexTemplate();
     if (pIndexSection->IsFormatSeparator())
     {
-        pXFIndex->SetSeparator(sal_True);
+        pXFIndex->SetSeparator(true);
         pTemplateSep->AddEntry(enumXFIndexTemplateText,"");
     }
     //pXFIndex->AddTemplate("separator","Separator",pTemplateSep);
@@ -246,7 +246,7 @@ void LwpFribSection::SetDefaultAlphaIndex(XFIndex * pXFIndex)
 }
 
 LwpMasterPage::LwpMasterPage(LwpPara* pPara, LwpPageLayout* pLayout)
-    :m_bNewSection(sal_False),m_pPara(pPara),m_pLayout(pLayout)
+    :m_bNewSection(false),m_pPara(pPara),m_pLayout(pLayout)
 {
 }
 
@@ -254,7 +254,7 @@ LwpMasterPage::LwpMasterPage(LwpPara* pPara, LwpPageLayout* pLayout)
  * @descr:  Register master page style for para style and register section style if necessary
  *
  */
-sal_Bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
+bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
 {
     //if there is no other frib after current firb, register master page in starting para of next page
     if(IsNextPageType()&&(!pFrib->HasNextFrib()))
@@ -262,10 +262,10 @@ sal_Bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
         LwpStory* pStory = static_cast<LwpStory*>(m_pPara->GetStoryID()->obj());
         pStory->SetCurrentLayout(m_pLayout);
         RegisterFillerPageStyle();
-        return sal_False;
+        return false;
     }
 
-    m_bNewSection = sal_False;
+    m_bNewSection = false;
     //sal_Bool bSectionColumns = sal_False;
 
     XFParaStyle* pOverStyle = new XFParaStyle;
@@ -277,12 +277,12 @@ sal_Bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
     {
         case LwpLayout::StartWithinColume://not support now
         {
-            m_bNewSection = sal_False;
+            m_bNewSection = false;
             break;
         }
         case LwpLayout::StartWithinPage:
         {
-            m_bNewSection = sal_True;
+            m_bNewSection = true;
             //bSectionColumns = sal_True;
             break;
         }
@@ -337,16 +337,16 @@ sal_Bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
         //}
         m_SectionStyleName = pXFStyleManager->AddStyle(pSectStyle)->GetStyleName();
     }
-    return sal_False;
+    return false;
 }
 
 /**
  * @descr:  Whether it need create a new section
  *
  */
-sal_Bool LwpMasterPage::IsNeedSection()
+bool LwpMasterPage::IsNeedSection()
 {
-    sal_Bool bNewSection = sal_False;
+    bool bNewSection = false;
     //get story
     LwpStory* pStory = static_cast<LwpStory*>(m_pPara->GetStoryID()->obj());
     //if pagelayout is modified, register the pagelayout
@@ -456,16 +456,16 @@ void LwpMasterPage::RegisterFillerPageStyle()
  * @descr:  Whether the layout is next page type
  *
  */
-sal_Bool LwpMasterPage::IsNextPageType()
+bool LwpMasterPage::IsNextPageType()
 {
     LwpLayout::UseWhenType eUserType = m_pLayout->GetUseWhenType();
     if(eUserType == LwpLayout::StartOnNextPage
         || eUserType == LwpLayout::StartOnOddPage
         || eUserType == LwpLayout::StartOnEvenPage )
     {
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx
index b0f87dcb7e8e..75c2cfc6517d 100644
--- a/lotuswordpro/source/filter/lwpfribsection.hxx
+++ b/lotuswordpro/source/filter/lwpfribsection.hxx
@@ -78,22 +78,22 @@ public:
 
 public:
     //for page layout register and parse
-    sal_Bool RegisterMasterPage(LwpFrib* pFrib);
+    bool RegisterMasterPage(LwpFrib* pFrib);
     void RegisterFillerPageStyle();
     void ParseSection(LwpFrib* pFrib);
     XFSection* CreateXFSection();
 
-    sal_Bool IsNewSection(){return m_bNewSection;}
+    bool IsNewSection(){return m_bNewSection;}
     OUString GetSectionStyleName(){return m_SectionStyleName;}
     OUString GetStyleName(){ return m_StyleName;}
     OUString GetFillerPageStyleName(){ return m_FillerPageStyleName;}
-    sal_Bool IsNextPageType();
+    bool IsNextPageType();
 
 private:
-    sal_Bool IsNeedSection();
+    bool IsNeedSection();
 
 private:
-    sal_Bool m_bNewSection;
+    bool m_bNewSection;
     OUString m_FillerPageStyleName;
     OUString m_SectionStyleName;
     OUString m_StyleName; //master page style name
diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx
index db236b6ac917..31579ac916b4 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -79,7 +79,7 @@
 #include "xfilter/xfdate.hxx"
 #include "xfilter/xfannotation.hxx"
 
-LwpFribText::LwpFribText( LwpPara *pPara, sal_Bool bNoUnicode )
+LwpFribText::LwpFribText( LwpPara *pPara, bool bNoUnicode )
     : LwpFrib(pPara), m_bNoUnicode(bNoUnicode)
 {}
 
@@ -202,7 +202,7 @@ void LwpFribDocVar::RegisterDefaultTimeStyle()
     pDateStyle->AddText(":");
     pDateStyle->AddMinute();
     pDateStyle->AddText(":");
-    pDateStyle->AddSecond(sal_True,0);
+    pDateStyle->AddSecond(true,0);
 
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
     m_TimeStyle = pXFStyleManager->AddStyle(pDateStyle)->GetStyleName();
@@ -210,7 +210,7 @@ void LwpFribDocVar::RegisterDefaultTimeStyle()
 void LwpFribDocVar::RegisterTotalTimeStyle()
 {
     XFTimeStyle* pTimeStyle = new XFTimeStyle;//use the default format
-    pTimeStyle->SetTruncate(sal_False);
+    pTimeStyle->SetTruncate(false);
     pTimeStyle->AddMinute();
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
     m_TimeStyle = pXFStyleManager->AddStyle(pTimeStyle)->GetStyleName();
diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx
index 1fe16aa4749f..5be98237111f 100644
--- a/lotuswordpro/source/filter/lwpfribtext.hxx
+++ b/lotuswordpro/source/filter/lwpfribtext.hxx
@@ -69,13 +69,13 @@
 class LwpFribText : public LwpFrib
 {
 public:
-    LwpFribText( LwpPara* pPara, sal_Bool bNoUnicode=false);
+    LwpFribText( LwpPara* pPara, bool bNoUnicode=false);
     virtual ~LwpFribText(){}
     void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
     void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
 private:
     OUString m_Content;
-    sal_Bool m_bNoUnicode;
+    bool m_bNoUnicode;
 public:
     OUString GetText(){return m_Content;}
 };
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index d24c9cb87bf1..353a20e7aa32 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -123,8 +123,8 @@ void LwpGraphicObject::Read()
             m_aIPData.nContrast = pServerContext[19];
             m_aIPData.nEdgeEnchancement = pServerContext[24];
             m_aIPData.nSmoothing = pServerContext[29];
-            m_aIPData.bInvertImage = (sal_Bool)(pServerContext[34] == 0x01);
-            m_aIPData.bAutoContrast = (sal_Bool)(pServerContext[44] == 0x00);
+            m_aIPData.bInvertImage = (pServerContext[34] == 0x01);
+            m_aIPData.bAutoContrast = (pServerContext[44] == 0x00);
         }
     }
     m_pObjStrm->QuickReaduInt16(); //disksize
@@ -242,7 +242,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
  *  these formats by Word Pro.
  * @return  sal_True if yes sal_False if not.
  */
-sal_Bool LwpGraphicObject::IsGrafFormatValid()
+bool LwpGraphicObject::IsGrafFormatValid()
 {
     if ((m_sServerContextFormat[1]=='b'&& m_sServerContextFormat[2]=='m' && m_sServerContextFormat[3]=='p')
     || (m_sServerContextFormat[1]=='j' && m_sServerContextFormat[2]=='p' && m_sServerContextFormat[3]=='g')
@@ -252,11 +252,11 @@ sal_Bool LwpGraphicObject::IsGrafFormatValid()
     || (m_sServerContextFormat[1]=='p' && m_sServerContextFormat[2]=='n' && m_sServerContextFormat[3]=='g')
     || (m_sServerContextFormat[1]=='e' && m_sServerContextFormat[2]=='p' && m_sServerContextFormat[3]=='s'))
     {
-        return sal_True;
+        return true;
     }
     else
     {
-        return sal_False;
+        return false;
     }
 }
 
@@ -547,18 +547,18 @@ void LwpGraphicObject::CreateGrafObject()
                 // need horizontal crop?
                 double fClipWidth = 0;
                 double fClipHeight = 0;
-                sal_Bool sal_bCropped = sal_False;
+                bool sal_bCropped = false;
                 if (fSclGrafWidth > fDisFrameWidth)
                 {
                     fClipWidth = (fSclGrafWidth-fDisFrameWidth ) / 2 / fXRatio;
-                    sal_bCropped = sal_True;
+                    sal_bCropped = true;
                 }
 
                 // need vertical crop?
                 if (fSclGrafHeight > fDisFrameHeight)
                 {
                     fClipHeight = (fSclGrafHeight-fDisFrameHeight ) / 2 / fYRatio;
-                    sal_bCropped = sal_True;
+                    sal_bCropped = true;
                 }
 
                 if (sal_bCropped)
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index 22e074d9ea0f..a2043c10c381 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -73,8 +73,8 @@ struct ImageProcessingData
     sal_uInt8 nContrast;
     sal_uInt8 nEdgeEnchancement;
     sal_uInt8 nSmoothing;
-    sal_Bool bAutoContrast;
-    sal_Bool bInvertImage;
+    bool bAutoContrast;
+    bool bInvertImage;
 
     ImageProcessingData()
     {
@@ -82,8 +82,8 @@ struct ImageProcessingData
         nContrast = 50;
         nEdgeEnchancement = 0;
         nSmoothing = 0;
-        bAutoContrast = sal_False;
-        bInvertImage= sal_False;
+        bAutoContrast = false;
+        bInvertImage= false;
     }
 };
 
@@ -108,7 +108,7 @@ private:
     void XFConvertEquation(XFContentContainer* pCont);
 
     void ParseChart(IXFStream* pOutputStream);
-    sal_Bool IsGrafFormatValid();
+    bool IsGrafFormatValid();
     // add by , 03/25/2005
     std::vector <XFFrame*> m_vXFDrawObjects;
     // end add
diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.cxx b/lotuswordpro/source/filter/lwphyperlinkmgr.cxx
index 5187b3f0c6f3..07b70d494b40 100644
--- a/lotuswordpro/source/filter/lwphyperlinkmgr.cxx
+++ b/lotuswordpro/source/filter/lwphyperlinkmgr.cxx
@@ -65,7 +65,7 @@
 
 LwpHyperlinkMgr::LwpHyperlinkMgr()
 {
-    m_bIsHyperlink = sal_False;
+    m_bIsHyperlink = false;
 }
 
 LwpHyperlinkMgr::~LwpHyperlinkMgr()
diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
index 15d8529dba18..a0621c3902ee 100644
--- a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
+++ b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
@@ -71,13 +71,13 @@ class LwpHyperlinkMgr
 public:
     LwpHyperlinkMgr();
     ~LwpHyperlinkMgr();
-    void SetHyperlinkFlag(sal_Bool bFlag){m_bIsHyperlink = bFlag;}
-    sal_Bool GetHyperlinkFlag(){return m_bIsHyperlink;}
+    void SetHyperlinkFlag(bool bFlag){m_bIsHyperlink = bFlag;}
+    bool GetHyperlinkFlag(){return m_bIsHyperlink;}
     void SetHyperlink(const OUString& hyperlink);
     OUString GetHyperlink();
 private:
     OUString m_Hyperlink;
-    sal_Bool m_bIsHyperlink;
+    bool m_bIsHyperlink;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index c0fd96d119b0..ac118a38f8d1 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -107,7 +107,7 @@ void LwpVirtualLayout::Read()
     pStrm->SkipExtra();
 }
 
-sal_Bool LwpVirtualLayout::MarginsSameAsParent()
+bool LwpVirtualLayout::MarginsSameAsParent()
 {
     return m_nAttributes2 & STYLE2_MARGINSSAMEASPARENT ? sal_True : sal_False;
 }
@@ -138,10 +138,10 @@ double LwpVirtualLayout::GetColGap(sal_uInt16 /*nIndex*/)
 * @descr:   Whether it is honoring protection
 *
 */
-sal_Bool LwpVirtualLayout::HonorProtection()
+bool LwpVirtualLayout::HonorProtection()
 {
     if(!(m_nAttributes2 & STYLE2_HONORPROTECTION))
-        return sal_False;
+        return false;
 
     LwpVirtualLayout* pParent = dynamic_cast<LwpVirtualLayout*> (GetParent()->obj());
     if(pParent && !pParent->IsHeader())
@@ -160,23 +160,23 @@ sal_Bool LwpVirtualLayout::HonorProtection()
             return pDoc->GetRootDocument()->HonorProtection();
     }
 
-    return sal_True;
+    return true;
 }
 
 /**
 * @descr:   Whether it is protected
 *
 */
-sal_Bool LwpVirtualLayout::IsProtected()
+bool LwpVirtualLayout::IsProtected()
 {
-    sal_Bool bProtected = (m_nAttributes & STYLE_PROTECTED)!=0;
+    bool bProtected = (m_nAttributes & STYLE_PROTECTED)!=0;
 
     LwpVirtualLayout* pParent = dynamic_cast<LwpVirtualLayout*> (GetParent()->obj());
     if(pParent && !pParent->IsHeader())
     {
         if(pParent->HonorProtection()&&(pParent->HasProtection()||bProtected))
         {
-            return sal_True;
+            return true;
         }
     }
     else if(m_pFoundry)//is null now
@@ -186,22 +186,22 @@ sal_Bool LwpVirtualLayout::IsProtected()
         {
             if (pDoc->HonorProtection() && bProtected)
             {
-                return sal_True;
+                return true;
             }
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 /**
 * @descr:   Whether it has protection
 *
 */
-sal_Bool LwpVirtualLayout::HasProtection()
+bool LwpVirtualLayout::HasProtection()
 {
     if(m_nAttributes & STYLE_PROTECTED)
-        return sal_True;
+        return true;
 
     LwpVirtualLayout* pParent = dynamic_cast<LwpVirtualLayout*> (GetParent()->obj());
     if(pParent && !pParent->IsHeader())
@@ -209,14 +209,14 @@ sal_Bool LwpVirtualLayout::HasProtection()
         return pParent->HasProtection();
     }
 
-    return sal_False;
+    return false;
 }
 
 /**
 * @descr:   Whether it is a mirror layout
 *
 */
-sal_Bool LwpVirtualLayout::IsComplex()
+bool LwpVirtualLayout::IsComplex()
 {
     return m_nAttributes & STYLE_COMPLEX ? sal_True : sal_False;
 }
@@ -247,7 +247,7 @@ LwpUseWhen* LwpVirtualLayout::GetUseWhen()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsPage()
+bool LwpVirtualLayout::IsPage()
 {
     return (GetLayoutType() == LWP_PAGE_LAYOUT);
 }
@@ -256,7 +256,7 @@ sal_Bool LwpVirtualLayout::IsPage()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsHeader()
+bool LwpVirtualLayout::IsHeader()
 {
     return (GetLayoutType() == LWP_HEADER_LAYOUT);
 }
@@ -265,7 +265,7 @@ sal_Bool LwpVirtualLayout::IsHeader()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsFooter()
+bool LwpVirtualLayout::IsFooter()
 {
     return (GetLayoutType() == LWP_FOOTER_LAYOUT);
 }
@@ -274,7 +274,7 @@ sal_Bool LwpVirtualLayout::IsFooter()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsFrame()
+bool LwpVirtualLayout::IsFrame()
 {
     return (GetLayoutType() == LWP_FRAME_LAYOUT);
 }
@@ -284,7 +284,7 @@ sal_Bool LwpVirtualLayout::IsFrame()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsCell()
+bool LwpVirtualLayout::IsCell()
 {
     return (GetLayoutType() == LWP_CELL_LAYOUT
         || GetLayoutType() == LWP_CONNECTED_CELL_LAYOUT
@@ -295,7 +295,7 @@ sal_Bool LwpVirtualLayout::IsCell()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsSuperTable()
+bool LwpVirtualLayout::IsSuperTable()
 {
     return (GetLayoutType() == LWP_SUPERTABLE_LAYOUT);
 }
@@ -304,7 +304,7 @@ sal_Bool LwpVirtualLayout::IsSuperTable()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsGroupHead()
+bool LwpVirtualLayout::IsGroupHead()
 {
     return (GetLayoutType() == LWP_GROUP_LAYOUT);
 }
@@ -322,7 +322,7 @@ sal_uInt8 LwpVirtualLayout::GetRelativeType()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsRelativeAnchored()
+bool LwpVirtualLayout::IsRelativeAnchored()
 {
     sal_uInt8 nType;
 
@@ -335,7 +335,7 @@ sal_Bool LwpVirtualLayout::IsRelativeAnchored()
  * @param:
  * @return:
 */
-sal_Bool LwpVirtualLayout::IsMinimumHeight()
+bool LwpVirtualLayout::IsMinimumHeight()
 {
     return ((m_nAttributes3& STYLE3_MINHEIGHTVALID) != 0);
 }
@@ -365,20 +365,20 @@ void LwpVirtualLayout::RegisterChildStyle()
     }
 }
 
-sal_Bool LwpVirtualLayout::NoContentReference()
+bool LwpVirtualLayout::NoContentReference()
 {
     return (m_nAttributes2 & STYLE2_NOCONTENTREFERENCE) != 0;
 }
 
-sal_Bool LwpVirtualLayout::IsStyleLayout()
+bool LwpVirtualLayout::IsStyleLayout()
 {
     if (m_nAttributes3 & STYLE3_STYLELAYOUT)
-        return sal_True;
+        return true;
 
     LwpVirtualLayout* pParent = dynamic_cast<LwpVirtualLayout*>(GetParent()->obj());
     if (pParent)
         return pParent->IsStyleLayout();
-    return sal_False;
+    return false;
 }
 
 /**
@@ -411,7 +411,7 @@ LwpVirtualLayout* LwpVirtualLayout::FindChildByType(LWP_LAYOUT_TYPE eType)
 * @descr:   Whether the size of layout is fit the graphic
 *
 */
-sal_Bool LwpVirtualLayout::IsFitGraphic()
+bool LwpVirtualLayout::IsFitGraphic()
 {
     return IsAutoGrowRight() && !IsAutoGrowLeft() && IsAutoGrowDown();
 }
@@ -420,7 +420,7 @@ sal_Bool LwpVirtualLayout::IsFitGraphic()
 * @descr:   Whether the width of layout is auto grow
 *
 */
-sal_Bool LwpVirtualLayout::IsAutoGrowWidth()
+bool LwpVirtualLayout::IsAutoGrowWidth()
 {
     return IsAutoGrowLeft() || IsAutoGrowRight();
 }
@@ -429,7 +429,7 @@ sal_Bool LwpVirtualLayout::IsAutoGrowWidth()
 * @descr:   Determine whether the layout width is to margin
 *
 */
-sal_Bool LwpVirtualLayout::IsInlineToMargin()
+bool LwpVirtualLayout::IsInlineToMargin()
 {
     return (m_nAttributes3 & STYLE3_INLINETOMARGIN) != 0;
 }
@@ -704,7 +704,7 @@ double LwpMiddleLayout::GetGeometryWidth()
 * @descr:   Whether the margins is same as parent layout
 *
 */
-sal_Bool LwpMiddleLayout::MarginsSameAsParent()
+bool LwpMiddleLayout::MarginsSameAsParent()
 {
     if(m_nOverrideFlag & OVER_MARGINS)
     {
@@ -1002,16 +1002,16 @@ double LwpMiddleLayout::GetScaleHeight(void)
     else
         return 0;
 }
-sal_Bool LwpMiddleLayout::CanSizeRight(void)
+bool LwpMiddleLayout::CanSizeRight(void)
 {
     sal_uInt8 RelType = GetRelativeType();
 
     if (RelType == LwpLayoutRelativityGuts::LAY_INLINE || RelType == LwpLayoutRelativityGuts::LAY_PARA_RELATIVE
     || RelType == LwpLayoutRelativityGuts::LAY_INLINE_VERTICAL)
     {
-        return sal_False;
+        return false;
     }
-    return sal_True;
+    return true;
 }
 sal_Int32 LwpMiddleLayout::GetMinimumWidth()
 {
@@ -1042,10 +1042,10 @@ sal_Int32 LwpMiddleLayout::DetermineWidth()
     }
     return 0;
 }
-sal_Bool LwpMiddleLayout::IsSizeRightToContainer(void)
+bool LwpMiddleLayout::IsSizeRightToContainer(void)
 {
     if (!CanSizeRight())
-        return sal_False;
+        return false;
 
     if (m_nOverrideFlag & OVER_SIZE)
     {
@@ -1059,12 +1059,12 @@ sal_Bool LwpMiddleLayout::IsSizeRightToContainer(void)
         return pLayout ? pLayout->IsSizeRightToContainer() : sal_False;
     }
     else
-        return sal_False;
+        return false;
 }
-sal_Bool LwpMiddleLayout::IsSizeRightToContent(void)
+bool LwpMiddleLayout::IsSizeRightToContent(void)
 {
     if (!CanSizeRight())
-        return sal_False;
+        return false;
 
     if (m_nOverrideFlag & OVER_SIZE)
     {
@@ -1078,7 +1078,7 @@ sal_Bool LwpMiddleLayout::IsSizeRightToContent(void)
         return pLayout ? pLayout->IsSizeRightToContent() : sal_False;
     }
     else
-        return sal_False;
+        return false;
 }
 
 /**
@@ -1125,7 +1125,7 @@ LwpPoint LwpMiddleLayout::GetOrigin()
 * @descr:   Whether the fill is pattern fill or not
 * @return:  True if yes, false if not.
 */
-sal_Bool LwpMiddleLayout::IsPatternFill()
+bool LwpMiddleLayout::IsPatternFill()
 {
     LwpBackgroundStuff* pBackgroundStuff = GetBackgroundStuff();
     if (pBackgroundStuff)
@@ -1133,7 +1133,7 @@ sal_Bool LwpMiddleLayout::IsPatternFill()
         return pBackgroundStuff->IsPatternFill();
     }
 
-    return sal_False;
+    return false;
 }
 
 /**
@@ -1156,7 +1156,7 @@ XFBGImage* LwpMiddleLayout::GetFillPattern()
 * @descr:   Whether the height and width of layout is auto grow
 *
 */
-sal_Bool LwpMiddleLayout::IsAutoGrow()
+bool LwpMiddleLayout::IsAutoGrow()
 {
     if(m_nOverrideFlag & OVER_SIZE)
     {
@@ -1177,7 +1177,7 @@ sal_Bool LwpMiddleLayout::IsAutoGrow()
 * @descr:   Whether the height of layout is auto grow down
 *
 */
-sal_Bool LwpMiddleLayout::IsAutoGrowDown()
+bool LwpMiddleLayout::IsAutoGrowDown()
 {
     if(m_nOverrideFlag & OVER_SIZE)
     {
@@ -1195,7 +1195,7 @@ sal_Bool LwpMiddleLayout::IsAutoGrowDown()
 * @descr:   Whether the height of layout is auto grow up
 *
 */
-sal_Bool LwpMiddleLayout::IsAutoGrowUp()
+bool LwpMiddleLayout::IsAutoGrowUp()
 {
     if(m_nOverrideFlag & OVER_SIZE)
     {
@@ -1213,7 +1213,7 @@ sal_Bool LwpMiddleLayout::IsAutoGrowUp()
 * @descr:   Whether the height of layout is auto grow down
 *
 */
-sal_Bool LwpMiddleLayout::IsAutoGrowLeft()
+bool LwpMiddleLayout::IsAutoGrowLeft()
 {
     if(m_nOverrideFlag & OVER_SIZE)
     {
@@ -1232,7 +1232,7 @@ sal_Bool LwpMiddleLayout::IsAutoGrowLeft()
 * @descr:   Whether the height of layout is auto grow down
 *
 */
-sal_Bool LwpMiddleLayout::IsAutoGrowRight()
+bool LwpMiddleLayout::IsAutoGrowRight()
 {
     if(m_nOverrideFlag & OVER_SIZE)
     {
@@ -1272,12 +1272,12 @@ sal_uInt8 LwpMiddleLayout::GetContentOrientation()
 * @descr:   Whether it is honoring protection
 *
 */
-sal_Bool LwpMiddleLayout::HonorProtection()
+bool LwpMiddleLayout::HonorProtection()
 {
     if(m_nOverrideFlag & OVER_MISC)
     {
         if(!(m_nAttributes2 & STYLE2_HONORPROTECTION))
-            return sal_False;
+            return false;
 
         LwpVirtualLayout* pParent = dynamic_cast<LwpVirtualLayout*> (GetParent()->obj());
         if(pParent && !pParent->IsHeader())
@@ -1308,9 +1308,9 @@ sal_Bool LwpMiddleLayout::HonorProtection()
 * @descr:   Whether it is pretected
 *
 */
-sal_Bool LwpMiddleLayout::IsProtected()
+bool LwpMiddleLayout::IsProtected()
 {
-    sal_Bool bProtected = sal_False;
+    bool bProtected = false;
     if(m_nOverrideFlag & OVER_MISC)
     {
         bProtected = (m_nAttributes & STYLE_PROTECTED)!=0;
@@ -1328,13 +1328,13 @@ sal_Bool LwpMiddleLayout::IsProtected()
     {
         /* If a parent's protected then none of its children can be accessed. */
         if(pParent->IsProtected())
-            return sal_True;
+            return true;
 
         if(pParent->HonorProtection())
             return bProtected;
 
         /* If our parent isn't honoring protection then we aren't protected. */
-        return sal_False;
+        return false;
 
     }
     if(m_pFoundry)//is null now
@@ -1346,7 +1346,7 @@ sal_Bool LwpMiddleLayout::IsProtected()
                 return bProtected;
 
             /* If the document isn't honoring protection then we aren't protected.*/
-            return sal_False;
+            return false;
         }
     }
 
@@ -1435,7 +1435,7 @@ XFBGImage* LwpMiddleLayout::GetXFBGImage()
 * @descr:   Whether the page uses the printer setting
 *
 */
-sal_Bool LwpMiddleLayout::GetUsePrinterSettings()
+bool LwpMiddleLayout::GetUsePrinterSettings()
 {
     if(m_nOverrideFlag & OVER_SIZE)
     {
@@ -1446,16 +1446,16 @@ sal_Bool LwpMiddleLayout::GetUsePrinterSettings()
         LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj() );
         return pLay ? pLay->GetUsePrinterSettings() : sal_False;
     }
-    return sal_False;
+    return false;
 }
 
 //Check whether there are contents in the layout
-sal_Bool LwpMiddleLayout::HasContent()
+bool LwpMiddleLayout::HasContent()
 {
     LwpObject* content = m_Content.obj();
     if(content)
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 //End by
 
@@ -1751,7 +1751,7 @@ LwpUseWhen* LwpLayout::VirtualGetUseWhen()
 * @descr:   Whether it is use on all pages
 *
 */
-sal_Bool LwpLayout::IsUseOnAllPages()
+bool LwpLayout::IsUseOnAllPages()
 {
     if(m_nOverrideFlag & OVER_PLACEMENT)
     {
@@ -1759,7 +1759,7 @@ sal_Bool LwpLayout::IsUseOnAllPages()
         if(pUseWhen)
             return pUseWhen->IsUseOnAllPages();
         else
-            return sal_False;
+            return false;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
@@ -1774,7 +1774,7 @@ sal_Bool LwpLayout::IsUseOnAllPages()
 * @descr:   Whether it is use on all even pages
 *
 */
-sal_Bool LwpLayout::IsUseOnAllEvenPages()
+bool LwpLayout::IsUseOnAllEvenPages()
 {
     if(m_nOverrideFlag & OVER_PLACEMENT)
     {
@@ -1782,7 +1782,7 @@ sal_Bool LwpLayout::IsUseOnAllEvenPages()
         if(pUseWhen)
             return pUseWhen->IsUseOnAllEvenPages();
         else
-            return sal_False;
+            return false;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
@@ -1797,7 +1797,7 @@ sal_Bool LwpLayout::IsUseOnAllEvenPages()
 * @descr:   Whether it is use on all odd pages
 *
 */
-sal_Bool LwpLayout::IsUseOnAllOddPages()
+bool LwpLayout::IsUseOnAllOddPages()
 {
     if(m_nOverrideFlag & OVER_PLACEMENT)
     {
@@ -1805,7 +1805,7 @@ sal_Bool LwpLayout::IsUseOnAllOddPages()
         if(pUseWhen)
             return pUseWhen->IsUseOnAllOddPages();
         else
-            return sal_False;
+            return false;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
@@ -1820,7 +1820,7 @@ sal_Bool LwpLayout::IsUseOnAllOddPages()
 * @descr:   Whether it is use on current page
 *
 */
-sal_Bool LwpLayout::IsUseOnPage()
+bool LwpLayout::IsUseOnPage()
 {
     if(m_nOverrideFlag & OVER_PLACEMENT)
     {
@@ -1828,7 +1828,7 @@ sal_Bool LwpLayout::IsUseOnPage()
         if(pUseWhen)
             return pUseWhen->IsUseOnPage();
         else
-            return sal_False;
+            return false;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
@@ -1881,12 +1881,12 @@ XFShadow* LwpLayout::GetXFShadow()
             enumXFShadowPos eXFShadowPos = enumXFShadowLeftTop;
             double fOffset = 0;
 
-            sal_Bool left = sal_False;
-            sal_Bool top = sal_False;
+            bool left = false;
+            bool top = false;
             if( offsetX < 0 )
-                left = sal_True;
+                left = true;
             if( offsetY < 0 )
-                top = sal_True;
+                top = true;
             if( left )
             {
                 fOffset = -offsetX;
@@ -2077,50 +2077,50 @@ sal_Int32 LwpPlacableLayout::GetBaseLineOffset()
 * @descr:   whether the parent layout is page layout
 *
 */
-sal_Bool LwpPlacableLayout::IsAnchorPage()
+bool LwpPlacableLayout::IsAnchorPage()
 {
     if(IsRelativeAnchored())
-        return sal_False;
+        return false;
 
     LwpVirtualLayout* pLayout = GetParentLayout();
     if(pLayout && (pLayout->IsPage() || pLayout->IsHeader() || pLayout->IsFooter()))
     //if(pLayout && pLayout->IsPage())
     {
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 /**
 * @descr:   whether the parent layout is frame layout
 *
 */
-sal_Bool LwpPlacableLayout::IsAnchorFrame()
+bool LwpPlacableLayout::IsAnchorFrame()
 {
     if(IsRelativeAnchored())
-        return sal_False;
+        return false;
 
     LwpVirtualLayout* pLayout = GetParentLayout();
     if(pLayout && (pLayout->IsFrame()||pLayout->IsGroupHead()))
     {
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 /**
 * @descr:   whether the parent layout is cell layout
 *
 */
-sal_Bool LwpPlacableLayout::IsAnchorCell()
+bool LwpPlacableLayout::IsAnchorCell()
 {
     if(IsRelativeAnchored())
-        return sal_False;
+        return false;
 
     LwpVirtualLayout* pLayout = GetParentLayout();
     if(pLayout && pLayout->IsCell())
     {
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 497c19d9a431..ba5d40cd8b9e 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -95,53 +95,53 @@ class LwpVirtualLayout : public LwpDLNFPVList
 public:
     LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpVirtualLayout(){}
-    virtual sal_Bool MarginsSameAsParent();
+    virtual bool MarginsSameAsParent();
     inline virtual sal_uInt16 GetNumCols(){return 1;}
     virtual double GetColWidth(sal_uInt16 nIndex);
     virtual double GetColGap(sal_uInt16 nIndex);
     virtual double GetMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;}
     virtual double GetExtMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;}
-    virtual sal_Bool IsAutoGrow(){ return sal_False;}
-    virtual sal_Bool IsAutoGrowUp(){ return sal_False;}
-    virtual sal_Bool IsAutoGrowDown(){ return sal_False;}
-    virtual sal_Bool IsAutoGrowLeft(){ return sal_False;}
-    virtual sal_Bool IsAutoGrowRight(){ return sal_False;}
-    virtual sal_Bool IsFitGraphic();
-    virtual sal_Bool IsAutoGrowWidth();
-    virtual sal_Bool IsInlineToMargin();
+    virtual bool IsAutoGrow(){ return false;}
+    virtual bool IsAutoGrowUp(){ return false;}
+    virtual bool IsAutoGrowDown(){ return false;}
+    virtual bool IsAutoGrowLeft(){ return false;}
+    virtual bool IsAutoGrowRight(){ return false;}
+    virtual bool IsFitGraphic();
+    virtual bool IsAutoGrowWidth();
+    virtual bool IsInlineToMargin();
     virtual sal_uInt8 GetContentOrientation(){ return TEXT_ORIENT_LRTB;}
-    virtual sal_Bool HonorProtection();
-    virtual sal_Bool IsProtected();
-    virtual sal_Bool HasProtection();
+    virtual bool HonorProtection();
+    virtual bool IsProtected();
+    virtual bool HasProtection();
     virtual OUString GetStyleName(){ return m_StyleName;}
-    virtual sal_Bool IsComplex();
-    virtual sal_Bool IsAnchorPage(){ return sal_False;}
-    virtual sal_Bool IsAnchorFrame(){ return sal_False;}
-    virtual sal_Bool IsAnchorCell(){ return sal_False;}
-    virtual sal_Bool IsPage();
-    virtual sal_Bool IsHeader();
-    virtual sal_Bool IsFooter();
-    virtual sal_Bool IsFrame();
-    virtual sal_Bool IsCell();
-    virtual sal_Bool IsSuperTable();
-    virtual sal_Bool IsGroupHead();
+    virtual bool IsComplex();
+    virtual bool IsAnchorPage(){ return false;}
+    virtual bool IsAnchorFrame(){ return false;}
+    virtual bool IsAnchorCell(){ return false;}
+    virtual bool IsPage();
+    virtual bool IsHeader();
+    virtual bool IsFooter();
+    virtual bool IsFrame();
+    virtual bool IsCell();
+    virtual bool IsSuperTable();
+    virtual bool IsGroupHead();
     virtual sal_uInt8 GetRelativeType();
-    virtual sal_Bool IsRelativeAnchored();
+    virtual bool IsRelativeAnchored();
     virtual LwpUseWhen* GetUseWhen();
     virtual LwpUseWhen* VirtualGetUseWhen(){ return NULL;}
-    virtual sal_Bool IsUseOnAllPages(){ return sal_False;}
-    virtual sal_Bool IsUseOnAllEvenPages(){ return sal_False;}
-    virtual sal_Bool IsUseOnAllOddPages(){ return sal_False;}
-    virtual sal_Bool IsUseOnPage(){ return sal_False;}
+    virtual bool IsUseOnAllPages(){ return false;}
+    virtual bool IsUseOnAllEvenPages(){ return false;}
+    virtual bool IsUseOnAllOddPages(){ return false;}
+    virtual bool IsUseOnPage(){ return false;}
     virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/ = 0){ return -1;}
-    virtual sal_Bool IsMinimumHeight();
-    virtual sal_Bool IsForWaterMark(){ return sal_False;}
+    virtual bool IsMinimumHeight();
+    virtual bool IsForWaterMark(){ return false;}
     virtual LwpPara* GetLastParaOfPreviousStory() { return NULL; }
     virtual LwpVirtualLayout* GetParentLayout();
     virtual LwpVirtualLayout* GetContainerLayout(){ return NULL;}
     virtual void RegisterChildStyle();
-    virtual sal_Bool NoContentReference();
-    virtual sal_Bool IsStyleLayout();
+    virtual bool NoContentReference();
+    virtual bool IsStyleLayout();
     virtual enumXFAlignType GetVerticalAlignmentType()
     {
         if (m_nAttributes & STYLE_CENTEREDVERTICALLY)
@@ -158,7 +158,7 @@ public:
     virtual double GetWidth(){return -1;}
 
     //Check whether there are contents in the layout
-    virtual sal_Bool HasContent(){return sal_False;}
+    virtual bool HasContent(){return false;}
     //End by
 protected:
     void Read() SAL_OVERRIDE;
@@ -274,7 +274,7 @@ class LwpMiddleLayout : public LwpVirtualLayout
 public:
     LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
     virtual ~LwpMiddleLayout();
-    virtual sal_Bool MarginsSameAsParent() SAL_OVERRIDE;
+    virtual bool MarginsSameAsParent() SAL_OVERRIDE;
     virtual double GetMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE;
     virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE;
     LwpLayoutGeometry* GetGeometry();
@@ -285,17 +285,17 @@ public:
     enumXFTextDir GetTextDirection();
     XFBorders* GetXFBorders();
     LwpColor* GetBackColor();
-    virtual sal_Bool IsAutoGrow() SAL_OVERRIDE;
-    virtual sal_Bool IsAutoGrowUp() SAL_OVERRIDE;
-    virtual sal_Bool IsAutoGrowDown() SAL_OVERRIDE;
-    virtual sal_Bool IsAutoGrowLeft() SAL_OVERRIDE;
-    virtual sal_Bool IsAutoGrowRight() SAL_OVERRIDE;
+    virtual bool IsAutoGrow() SAL_OVERRIDE;
+    virtual bool IsAutoGrowUp() SAL_OVERRIDE;
+    virtual bool IsAutoGrowDown() SAL_OVERRIDE;
+    virtual bool IsAutoGrowLeft() SAL_OVERRIDE;
+    virtual bool IsAutoGrowRight() SAL_OVERRIDE;
     virtual sal_uInt8 GetContentOrientation() SAL_OVERRIDE;
-    virtual sal_Bool HonorProtection() SAL_OVERRIDE;
-    virtual sal_Bool IsProtected() SAL_OVERRIDE;
+    virtual bool HonorProtection() SAL_OVERRIDE;
+    virtual bool IsProtected() SAL_OVERRIDE;
     virtual LwpVirtualLayout* GetWaterMarkLayout();
     XFBGImage* GetXFBGImage();
-    virtual sal_Bool GetUsePrinterSettings();
+    virtual bool GetUsePrinterSettings();
 
     LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj());}
         sal_uInt16 GetScaleMode(void);
@@ -305,20 +305,20 @@ public:
     double GetScaleWidth(void);
     double GetScaleHeight(void);
 
-    sal_Bool CanSizeRight(void);
+    bool CanSizeRight(void);
     virtual double GetWidth() SAL_OVERRIDE;
     virtual sal_Int32 GetMinimumWidth();
-    sal_Bool IsSizeRightToContent(void);
-    sal_Bool IsSizeRightToContainer(void);
+    bool IsSizeRightToContent(void);
+    bool IsSizeRightToContainer(void);
     sal_Int32 DetermineWidth();
     virtual double GetHeight();
     virtual LwpPoint GetOrigin();
 
-    sal_Bool IsPatternFill();
+    bool IsPatternFill();
     XFBGImage* GetFillPattern();
 
     //Check whether there are contents in the layout
-    virtual sal_Bool HasContent() SAL_OVERRIDE;
+    virtual bool HasContent() SAL_OVERRIDE;
     //End by
 
 protected:
@@ -384,10 +384,10 @@ public:
     };
 public:
     virtual UseWhenType GetUseWhenType();
-    virtual sal_Bool IsUseOnAllPages() SAL_OVERRIDE;
-    virtual sal_Bool IsUseOnAllEvenPages() SAL_OVERRIDE;
-    virtual sal_Bool IsUseOnAllOddPages() SAL_OVERRIDE;
-    virtual sal_Bool IsUseOnPage() SAL_OVERRIDE;
+    virtual bool IsUseOnAllPages() SAL_OVERRIDE;
+    virtual bool IsUseOnAllEvenPages() SAL_OVERRIDE;
+    virtual bool IsUseOnAllOddPages() SAL_OVERRIDE;
+    virtual bool IsUseOnPage() SAL_OVERRIDE;
     LwpObjectID* GetPosition(){ return &m_Positon;}
     virtual LwpVirtualLayout* GetContainerLayout() SAL_OVERRIDE;
 };
@@ -402,10 +402,10 @@ public:
     virtual LwpLayoutRelativity* GetRelativityPiece();
     virtual sal_uInt8 GetRelativeType() SAL_OVERRIDE;
     virtual sal_Int32 GetBaseLineOffset();
-    virtual sal_Bool IsAnchorPage() SAL_OVERRIDE;
-    virtual sal_Bool IsAnchorFrame() SAL_OVERRIDE;
-    virtual sal_Bool IsAnchorCell() SAL_OVERRIDE;
-    virtual void XFConvertFrame(XFContentContainer* /*pCont*/, sal_Int32 /*nStart*/ = 0, sal_Int32 /*nEnd*/ = 0, sal_Bool /*bAll*/ = sal_False) {}
+    virtual bool IsAnchorPage() SAL_OVERRIDE;
+    virtual bool IsAnchorFrame() SAL_OVERRIDE;
+    virtual bool IsAnchorCell() SAL_OVERRIDE;
+    virtual void XFConvertFrame(XFContentContainer* /*pCont*/, sal_Int32 /*nStart*/ = 0, sal_Int32 /*nEnd*/ = 0, bool /*bAll*/ = false) {}
     XFFont* GetFont();
     void SetFont(XFFont* pFont);
     enum WrapType
diff --git a/lotuswordpro/source/filter/lwplnopts.cxx b/lotuswordpro/source/filter/lwplnopts.cxx
index 48ddbcc67004..b8f5a75a528c 100644
--- a/lotuswordpro/source/filter/lwplnopts.cxx
+++ b/lotuswordpro/source/filter/lwplnopts.cxx
@@ -84,13 +84,13 @@ void LwpLineNumberOptions::RegisterStyle()
     pLineNumber->SetNumberOffset(LwpTools::ConvertFromUnitsToMetric(m_nDistance));
     pLineNumber->SetNumberIncrement(m_nSeparator);
     if (m_nFlags & LN_RESETEACHPAGE)
-        pLineNumber->SetRestartOnPage(sal_True);
+        pLineNumber->SetRestartOnPage(true);
     else
-        pLineNumber->SetRestartOnPage(sal_False);
+        pLineNumber->SetRestartOnPage(false);
     if (m_nFlags & LN_COUNTBLANKLINES)
-        pLineNumber->SetCountEmptyLines(sal_True);
+        pLineNumber->SetCountEmptyLines(true);
     else
-        pLineNumber->SetCountEmptyLines(sal_False);
+        pLineNumber->SetCountEmptyLines(false);
 
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
     pXFStyleManager->SetLineNumberConfig(pLineNumber);
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 5b8f5357693b..af334fd89d32 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -186,8 +186,8 @@ void LwpCHBlkMarker::ConvertCHBlock(XFContentContainer* pXFPara, sal_uInt8 nType
 void LwpCHBlkMarker::ProcessPlaceHolder(XFContentContainer* pXFPara,sal_uInt16 nAction,
                 sal_uInt8 nType)
 {
-    sal_Bool bFillFlag = IsHasFilled();
-    sal_Bool bHelpFlag = IsBubbleHelp();
+    bool bFillFlag = IsHasFilled();
+    bool bHelpFlag = IsBubbleHelp();
 
     if ( bFillFlag )
         return;
@@ -226,8 +226,8 @@ void LwpCHBlkMarker::ProcessPlaceHolder(XFContentContainer* pXFPara,sal_uInt16 n
 
 void LwpCHBlkMarker::ProcessOtherCHB(XFContentContainer* pXFPara,sal_uInt8 nType)
 {
-    sal_Bool bFillFlag = IsHasFilled();
-    sal_Bool bHelpFlag = IsBubbleHelp();
+    bool bFillFlag = IsHasFilled();
+    bool bHelpFlag = IsBubbleHelp();
 
     if ( bFillFlag )
         return;
@@ -252,7 +252,7 @@ void LwpCHBlkMarker::ProcessOtherCHB(XFContentContainer* pXFPara,sal_uInt8 nType
 //all input content of key list processed as normal text
 void LwpCHBlkMarker::ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType)
 {
-    sal_Bool bFillFlag = IsHasFilled();
+    bool bFillFlag = IsHasFilled();
 
     if ( bFillFlag )
     {
@@ -291,14 +291,14 @@ void LwpCHBlkMarker::ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType)
     }
 }
 
-sal_Bool LwpCHBlkMarker::IsHasFilled()
+bool LwpCHBlkMarker::IsHasFilled()
 {
     if (CHB_PROMPT & m_nFlag)
-        return sal_False;
-    return sal_True;
+        return false;
+    return true;
 }
 
-sal_Bool LwpCHBlkMarker::IsBubbleHelp()
+bool LwpCHBlkMarker::IsBubbleHelp()
 {
     return (CHB_HELP & m_nFlag);
 }
@@ -342,11 +342,11 @@ void LwpBookMark::Read()
     m_pObjStrm->SkipExtra();
 }
 
-sal_Bool LwpBookMark::IsRightMarker(LwpObjectID objMarker)
+bool LwpBookMark::IsRightMarker(LwpObjectID objMarker)
 {
     if (objMarker == m_objMarker)
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
 OUString LwpBookMark::GetName()
@@ -361,10 +361,10 @@ LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
     : LwpStoryMarker(objHdr,pStrm)
     , m_nFlag(0)
     , m_nFieldType(0)
-    , m_bHasStyle(sal_False)
-    , m_bHasStart(sal_False)
+    , m_bHasStyle(false)
+    , m_bHasStart(false)
     , m_pFrib(NULL)
-    , m_bRevisionFlag(sal_False)
+    , m_bRevisionFlag(false)
 {
 }
 
@@ -423,14 +423,14 @@ void LwpFieldMark::ParseTOC(OUString& sLevel,OUString& sText)
         sText = "";
 }
 
-sal_Bool LwpFieldMark::IsFormulaInsert()
+bool LwpFieldMark::IsFormulaInsert()
 {
     if (m_nFlag & FF_FORMULAINSERTED)
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
-sal_Bool LwpFieldMark::IsDateTimeField(sal_uInt8& type,OUString& formula)
+bool LwpFieldMark::IsDateTimeField(sal_uInt8& type,OUString& formula)
 {
     OUString sFormula = m_Formula.str();
     sal_Int32 index;
@@ -443,9 +443,9 @@ sal_Bool LwpFieldMark::IsDateTimeField(sal_uInt8& type,OUString& formula)
         if (sFormula == "TotalEditingTime")
         {
             type = DATETIME_TOTALTIME;
-            return sal_True;
+            return true;
         }
-        return sal_False;
+        return false;
     }
 
     tag = sFormula.copy(0,index);
@@ -453,31 +453,31 @@ sal_Bool LwpFieldMark::IsDateTimeField(sal_uInt8& type,OUString& formula)
     {
         type = DATETIME_NOW;
         formula = sFormula.copy(index+1,sFormula.getLength()-index-1);
-        return sal_True;
+        return true;
     }
     else if (tag == "CreateDate")
     {
         type = DATETIME_CREATE;
         formula = sFormula.copy(index+1,sFormula.getLength()-index-1);
-        return sal_True;
+        return true;
     }
     else if (tag == "EditDate")
     {
         type = DATETIME_LASTEDIT;
         formula = sFormula.copy(index+1,sFormula.getLength()-index-1);
-        return sal_True;
+        return true;
     }
     else if (tag == "YesterdaysDate" || tag == "TomorrowsDate"
             || tag == "TodaysDate")
     {
         type = DATETIME_SKIP;
-        return sal_True;
+        return true;
     }
     else
-        return sal_False;
+        return false;
 }
 
-sal_Bool LwpFieldMark::IsCrossRefField(sal_uInt8& nType, OUString& sMarkName)
+bool LwpFieldMark::IsCrossRefField(sal_uInt8& nType, OUString& sMarkName)
 {
     OUString sFormula = m_Formula.str();
     sal_Int32 index;
@@ -493,10 +493,10 @@ sal_Bool LwpFieldMark::IsCrossRefField(sal_uInt8& nType, OUString& sMarkName)
         {
             sMarkName = sFormula;
             nType = CROSSREF_TEXT;
-            return sal_True;
+            return true;
         }
         else
-            return sal_False;
+            return false;
     }
 
     tag = sFormula.copy(0,index);
@@ -504,45 +504,45 @@ sal_Bool LwpFieldMark::IsCrossRefField(sal_uInt8& nType, OUString& sMarkName)
     {
         sMarkName = sFormula.copy(index+1,sFormula.getLength()-index-1);
         nType = CROSSREF_PAGE;
-        return sal_True;
+        return true;
     }
     else if (tag == "ParaRef")
     {
         sMarkName = sFormula.copy(index+1,sFormula.getLength()-index-1);
         nType = CROSSREF_PARANUMBER;
-        return sal_True;
+        return true;
     }
     else
-        return sal_False;
+        return false;
 }
 
-sal_Bool LwpFieldMark::IsDocPowerField(sal_uInt8& nType,OUString& sFormula)
+bool LwpFieldMark::IsDocPowerField(sal_uInt8& nType,OUString& sFormula)
 {
     sFormula = m_Formula.str();
 
     if (sFormula == "Description")
     {
         nType = DOC_DESCRIPTION;
-        return sal_True;
+        return true;
     }
     else if (sFormula == "NumPages")
     {
         nType = DOC_NUMPAGES;
-        return sal_True;
+        return true;
     }
     else if (sFormula == "NumChars")
     {
         nType = DOC_NUMCHARS;
-        return sal_True;
+        return true;
     }
     else if (sFormula == "NumWords")
     {
         nType = DOC_NUMWORDS;
-        return sal_True;
+        return true;
     }
     else
     {
-        return sal_False;
+        return false;
     }
 }
 
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index 4679a3a6085f..b9a75b44d80f 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -144,8 +144,8 @@ private:
     void ProcessPlaceHolder(XFContentContainer* pXFPara,sal_uInt16 nAction,sal_uInt8 nType);
     void ProcessOtherCHB(XFContentContainer* pXFPara,sal_uInt8 nType);
     void ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType);
-    sal_Bool IsHasFilled();
-    sal_Bool IsBubbleHelp();
+    bool IsHasFilled();
+    bool IsBubbleHelp();
     OUString GetPromptText();
     void EnumAllKeywords();
 private:
@@ -181,7 +181,7 @@ public:
 protected:
     void Read() SAL_OVERRIDE;
 public:
-    sal_Bool IsRightMarker(LwpObjectID objMarker);
+    bool IsRightMarker(LwpObjectID objMarker);
     OUString GetName();
 private:
     enum {  BKMK_NOTESFX = 0x0001,
@@ -200,19 +200,19 @@ public:
     void ParseIndex(OUString& sKey1,OUString& sKey2);
     void ParseTOC(OUString& sLevel,OUString& sText);
     sal_uInt16 GetFieldType(){return m_nFieldType;}
-    sal_Bool IsFormulaInsert();
-    sal_Bool IsDateTimeField(sal_uInt8& type,OUString& formula);
-    sal_Bool IsCrossRefField(sal_uInt8& nType, OUString& sMarkName);
-    sal_Bool IsDocPowerField(sal_uInt8& nType,OUString& sFormula);
+    bool IsFormulaInsert();
+    bool IsDateTimeField(sal_uInt8& type,OUString& formula);
+    bool IsCrossRefField(sal_uInt8& nType, OUString& sMarkName);
+    bool IsDocPowerField(sal_uInt8& nType,OUString& sFormula);
     OUString GetFormula(){return m_Formula.str();}
-    void SetStyleFlag(sal_Bool bFalg){m_bHasStyle = bFalg;}
-    sal_Bool GetStyleFlag(){return m_bHasStyle;}
-    sal_Bool GetStart(){return m_bHasStart;}
-    void SetStart(sal_Bool bFlag){m_bHasStart = bFlag;}
+    void SetStyleFlag(bool bFalg){m_bHasStyle = bFalg;}
+    bool GetStyleFlag(){return m_bHasStyle;}
+    bool GetStart(){return m_bHasStart;}
+    void SetStart(bool bFlag){m_bHasStart = bFlag;}
     LwpFrib* GetStartFrib(){return m_pFrib;}
     void SetStartFrib(LwpFrib* pFrib){m_pFrib = pFrib;}
-    sal_Bool GetRevisionFlag(){return m_bRevisionFlag;}
-    void SetRevisionFlag(sal_Bool bFlag){m_bRevisionFlag = bFlag;}
+    bool GetRevisionFlag(){return m_bRevisionFlag;}
+    void SetRevisionFlag(bool bFlag){m_bRevisionFlag = bFlag;}
 
     enum{
         FLD_FIELD = 0x0003,
@@ -248,11 +248,11 @@ private:
     sal_uInt16 m_nFieldType;
     LwpAtomHolder m_Formula;
 
-    sal_Bool m_bHasStyle;
-    sal_Bool m_bHasStart;
+    bool m_bHasStyle;
+    bool m_bHasStart;
 
     LwpFrib* m_pFrib;
-    sal_Bool m_bRevisionFlag;
+    bool m_bRevisionFlag;
 };
 
 class LwpRubyMarker : public LwpStoryMarker
diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx
index cc72a46a841f..ccf959f19836 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -222,7 +222,7 @@ OUString LwpNoteLayout::GetAuthor()
         {
             LwpPara* pFirst = static_cast<LwpPara*>(pStory->GetFirstPara()->obj());
             if(pFirst)
-                return pFirst->GetContentText(sal_True);
+                return pFirst->GetContentText(true);
         }
     }
 
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index 2326415ae407..3198c84aebea 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -84,12 +84,12 @@ public:
     inline sal_uInt16 GetLevel() const;
     inline sal_uInt16 GetPosition() const;
 
-    inline sal_Bool IsLevelOverridden();
-    inline sal_Bool IsPositionOverridden();
-    inline sal_Bool IsHeadingOverridden();
-    inline sal_Bool IsSmartLevelOverridden();
-    inline sal_Bool IsHeading();
-    inline sal_Bool IsSmartLevel();
+    inline bool IsLevelOverridden();
+    inline bool IsPositionOverridden();
+    inline bool IsHeadingOverridden();
+    inline bool IsSmartLevelOverridden();
+    inline bool IsHeading();
+    inline bool IsSmartLevel();
 
     void OverrideLevel(sal_uInt16 nNewLv);
 
@@ -120,27 +120,27 @@ inline sal_uInt16 LwpNumberingOverride::GetPosition() const
     return m_nPosition;
 }
 
-inline sal_Bool LwpNumberingOverride::IsLevelOverridden()
+inline bool LwpNumberingOverride::IsLevelOverridden()
 {
-    return (sal_Bool)((m_nOverride & NO_LEVEL) != 0);
+    return ((m_nOverride & NO_LEVEL) != 0);
 }
-inline sal_Bool LwpNumberingOverride::IsPositionOverridden()
+inline bool LwpNumberingOverride::IsPositionOverridden()
 {
-    return (sal_Bool)((m_nOverride & NO_POSITION) != 0);
+    return ((m_nOverride & NO_POSITION) != 0);
 }
-inline sal_Bool LwpNumberingOverride::IsHeadingOverridden()
+inline bool LwpNumberingOverride::IsHeadingOverridden()
 {
-    return (sal_Bool)((m_nOverride & HEADING) != 0);
+    return ((m_nOverride & HEADING) != 0);
 }
-inline sal_Bool LwpNumberingOverride::IsSmartLevelOverridden()
+inline bool LwpNumberingOverride::IsSmartLevelOverridden()
 {
-    return (sal_Bool)((m_nOverride & SMARTLEVEL) != 0);
+    return ((m_nOverride & SMARTLEVEL) != 0);
 }
-inline sal_Bool LwpNumberingOverride::IsHeading()
+inline bool LwpNumberingOverride::IsHeading()
 {
     return (m_nValues & HEADING) != 0;
 }
-inline sal_Bool LwpNumberingOverride::IsSmartLevel()
+inline bool LwpNumberingOverride::IsSmartLevel()
 {
     return (m_nValues & SMARTLEVEL) != 0;
 }
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx
index 1eacc7c31c99..9d54213d8724 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.cxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx
@@ -85,7 +85,7 @@ OUString LwpCurrencyPool::GetCurrencySymbol(sal_uInt16 nFormat)
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool LwpCurrencyPool::IsSymbolPost(sal_uInt16 nFormat)
+bool LwpCurrencyPool::IsSymbolPost(sal_uInt16 nFormat)
 {
     return m_aCurrencyInfo[nFormat].bPost;
 }
@@ -97,7 +97,7 @@ sal_Bool LwpCurrencyPool::IsSymbolPost(sal_uInt16 nFormat)
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool LwpCurrencyPool::IsShowSpace(sal_uInt16 nFormat)
+bool LwpCurrencyPool::IsShowSpace(sal_uInt16 nFormat)
 {
     return m_aCurrencyInfo[nFormat].bShowSpace;
 }
@@ -212,8 +212,7 @@ void LwpNumericFormat::Read()
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool
-LwpNumericFormat::IsCurrencyFormat(sal_uInt16 Format)
+bool LwpNumericFormat::IsCurrencyFormat(sal_uInt16 Format)
 {
     switch (Format)
     {
@@ -262,10 +261,10 @@ LwpNumericFormat::IsCurrencyFormat(sal_uInt16 Format)
     case FMT_JAPANESEYEN:
     case FMT_SPANISHPESETA:
     case FMT_EURO:
-        return sal_True;
+        return true;
 
     default:
-        return sal_False;
+        return false;
     }
 }
 /**
@@ -289,15 +288,15 @@ LwpNumericFormat::GetDecimalPlaces(void)
 *   @param
 *   @return
 */
-void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString& aPrefix, OUString& aSuffix, sal_Bool bNegtive)
+void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString& aPrefix, OUString& aSuffix, bool bNegtive)
 {
     aPrefix = aNumber.GetPrefix();
     aSuffix = aNumber.GetSuffix();
 
     //Make the default prefix and suffix
     OUString aSymbol = m_aCurrencyInfo.GetCurrencySymbol(cFormat);
-    sal_Bool bPost = m_aCurrencyInfo.IsSymbolPost(cFormat);
-    sal_Bool bShowSpace = m_aCurrencyInfo.IsShowSpace(cFormat);
+    bool bPost = m_aCurrencyInfo.IsSymbolPost(cFormat);
+    bool bShowSpace = m_aCurrencyInfo.IsShowSpace(cFormat);
     if ( aNumber.IsDefaultPrefix())
     {
         if (bNegtive)
@@ -390,7 +389,7 @@ XFStyle* LwpNumericFormat::Convert()
         pStyle->SetNumberType(enuMXFNumberCurrency);
         pStyle->SetGroup();
         GetCurrencyStr(cAnyNumber, aPrefix, aSuffix);
-        GetCurrencyStr(cNegative, aNegPrefix, aNegSuffix,sal_True);
+        GetCurrencyStr(cNegative, aNegPrefix, aNegSuffix,true);
     }
     else
     {
@@ -465,7 +464,7 @@ OUString    LwpNumericFormat::reencode(const OUString& sCode)
 {
     const sal_Unicode * pString = sCode.getStr();
     sal_uInt16 nLen = sCode.getLength();
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
     sal_uInt16 i;
     sal_Unicode *pBuff = new sal_Unicode[sCode.getLength()];
 
@@ -473,7 +472,7 @@ OUString    LwpNumericFormat::reencode(const OUString& sCode)
     {
         if ( (pString[i] == 0x00a1) && (pString[i+1] == 0x00ea))
         {
-            bFound = sal_True;
+            bFound = true;
             break;
         }
         pBuff[i] = pString[i];
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 894680df8a90..dd8de77cf6b3 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -78,9 +78,9 @@ public:
     void QuickRead(LwpObjectStream* pStrm);
     OUString GetPrefix(){ return cPrefix.str();}
     OUString GetSuffix(){ return cSuffix.str();}
-    sal_Bool IsBlack(){ return (cColor.GetBlue()==0 && cColor.GetGreen()==0 && cColor.GetRed()==0);}
-    sal_Bool IsDefaultPrefix(){ return !(cSubFlags&SF_OVER_PREFIX); }
-    sal_Bool IsDefaultSuffix(){ return !(cSubFlags&SF_OVER_SUFFIX); }
+    bool IsBlack(){ return (cColor.GetBlue()==0 && cColor.GetGreen()==0 && cColor.GetRed()==0);}
+    bool IsDefaultPrefix(){ return !(cSubFlags&SF_OVER_PREFIX); }
+    bool IsDefaultSuffix(){ return !(cSubFlags&SF_OVER_SUFFIX); }
     LwpColor GetColor();
 
 protected:
@@ -100,20 +100,20 @@ protected:
 struct LwpCurrencyInfo
 {
     OUString sSymbol;
-    sal_Bool bPost;
-    sal_Bool bShowSpace;
+    bool bPost;
+    bool bShowSpace;
     LwpCurrencyInfo(const OUString& sSym)
     {
         sSymbol = sSym;
-        bPost = sal_False;
-        bShowSpace = sal_False;
+        bPost = false;
+        bShowSpace = false;
     }
     LwpCurrencyInfo()
     {
-        bPost = sal_False;
-        bShowSpace = sal_False;
+        bPost = false;
+        bShowSpace = false;
     }
-    LwpCurrencyInfo(const OUString& sSym, sal_Bool bPost_, sal_Bool bShowSpace_)
+    LwpCurrencyInfo(const OUString& sSym, bool bPost_, bool bShowSpace_)
     {
         sSymbol = sSym;
         bPost = bPost_;
@@ -188,8 +188,8 @@ class LwpCurrencyPool
 public:
     LwpCurrencyPool(){InitCurrencySymbol();}
     OUString GetCurrencySymbol(sal_uInt16 nFormat);
-    sal_Bool IsShowSpace(sal_uInt16 nFormat);
-    sal_Bool IsSymbolPost(sal_uInt16 nFormat);
+    bool IsShowSpace(sal_uInt16 nFormat);
+    bool IsSymbolPost(sal_uInt16 nFormat);
 
 private:
     std::map<sal_uInt16,LwpCurrencyInfo> m_aCurrencyInfo;
@@ -198,48 +198,48 @@ private:
         sal_uInt16 nC=FMT_ARGENTINEANPESO;
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("A");                    //FMT_ARGENTINEANPESO       = 1,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("A$");                   //FMT_AUSTRALIANDOLLAR  = 2,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("oS",sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("BF",sal_True, sal_True);//FMT_BELGIANFRANC      = 4,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R$",sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO    = 5,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("oS",true, true);//FMT_AUSTRIANSCHILLING = 3,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("BF",true, true);//FMT_BELGIANFRANC      = 4,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R$",false, true);//FMT_BRAZILIANCRUZEIRO    = 5,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("\357\277\241")));                 //FMT_BRITISHPOUND      = 6,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("C$");                   //FMT_CANADIANDOLLAR        = 7,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("PRC\357\277\245")),sal_False,sal_True);   //FMT_CHINESEYUAN           = 8,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Kc",sal_True, sal_True);//FMT_CZECHKORUNA           = 9,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dkr",sal_False, sal_True);//FMT_DANISHKRONE         = 10,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("ECU",sal_True, sal_True);//FMT_ECU                  = 11,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("mk",sal_True, sal_True);//FMT_FINNISHMARKKA     = 12,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",sal_True, sal_True);//FMT_FRENCHFRANC            = 13,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("DM",sal_True, sal_True);//FMT_GERMANMARK            = 14,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dr",sal_True, sal_True);//FMT_GREEKDRACHMA      = 15,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("PRC\357\277\245")),false,true);   //FMT_CHINESEYUAN           = 8,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Kc",true, true);//FMT_CZECHKORUNA           = 9,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dkr",false, true);//FMT_DANISHKRONE         = 10,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("ECU",true, true);//FMT_ECU                  = 11,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("mk",true, true);//FMT_FINNISHMARKKA     = 12,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",true, true);//FMT_FRENCHFRANC            = 13,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("DM",true, true);//FMT_GERMANMARK            = 14,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dr",true, true);//FMT_GREEKDRACHMA      = 15,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("HK$");                  //FMT_HONGKONGDOLLAR        = 16,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Ft",sal_True, sal_True);//FMT_HUNGARIANFORINT       = 17,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rs",sal_False, sal_True);//FMT_INDIANRUPEE          = 18,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rp",sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Ft",true, true);//FMT_HUNGARIANFORINT       = 17,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rs",false, true);//FMT_INDIANRUPEE          = 18,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rp",false, true);//FMT_INDONESIANRUPIAH = 19,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("IR\357\277\241")));                   //FMT_IRISHPUNT         = 20,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("L.",sal_False, sal_True);//FMT_ITALIANLIRA          = 21,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("L.",false, true);//FMT_ITALIANLIRA          = 21,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("\357\277\245")));             //FMT_JAPANESEYEN           = 22,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("LF",sal_True, sal_True);//FMT_LUXEMBOURGFRANC       = 23,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rm",sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("LF",true, true);//FMT_LUXEMBOURGFRANC       = 23,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rm",false, true);//FMT_MALAYSIANRINGGIT = 24,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Mex$");                 //FMT_MEXICANPESO           = 25,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",sal_False, sal_True);//FMT_NETHERLANDSGUILDER    = 26,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",false, true);//FMT_NETHERLANDSGUILDER    = 26,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("NZ$");                  //FMT_NEWZEALANDDOLLAR  = 27,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Nkr",sal_False, sal_True);//FMT_NORWEGIANKRONE      = 28,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Zl",sal_True, sal_True);//FMT_POLISHZLOTY           = 29,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Esc.",sal_True, sal_True);//FMT_PORTUGUESEESCUDO    = 30,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Leu",sal_True, sal_True);//FMT_ROMANIANLEI          = 31,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R",sal_True, sal_True);//FMT_RUSSIANRUBLE       = 32,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Nkr",false, true);//FMT_NORWEGIANKRONE      = 28,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Zl",true, true);//FMT_POLISHZLOTY           = 29,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Esc.",true, true);//FMT_PORTUGUESEESCUDO    = 30,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Leu",true, true);//FMT_ROMANIANLEI          = 31,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R",true, true);//FMT_RUSSIANRUBLE       = 32,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("S$");                   //FMT_SINGAPOREDOLLAR       = 33,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Sk",sal_True, sal_True);//FMT_SLOVAKIANKORUNA       = 34,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("SIT",sal_False, sal_True);//FMT_SLOVENIANTHOLAR     = 35,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Sk",true, true);//FMT_SLOVAKIANKORUNA       = 34,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("SIT",false, true);//FMT_SLOVENIANTHOLAR     = 35,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R");                    //FMT_SOUTHAFRICANRAND  = 36,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("W");                    //FMT_SOUTHKOREANWON        = 37,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Pts",sal_True, sal_True);//FMT_SPANISHPESETA        = 38,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Skr",sal_True, sal_True);//FMT_SWEDISHKRONA     = 39,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("SFr",sal_False, sal_True);//FMT_SWISSFRANC          = 40,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Pts",true, true);//FMT_SPANISHPESETA        = 38,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Skr",true, true);//FMT_SWEDISHKRONA     = 39,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("SFr",false, true);//FMT_SWISSFRANC          = 40,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("NT$");                  //FMT_TAIWANDOLLAR      = 41,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Bt",sal_True, sal_True);//FMT_THAIBAHT          = 42,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Bt",true, true);//FMT_THAIBAHT          = 42,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo("$");                    //FMT_USDOLLAR          = 43,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("OTH",sal_False, sal_True);//FMT_OTHERCURRENCY       = 44,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo("OTH",false, true);//FMT_OTHERCURRENCY       = 44,
 
         m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("\342\202\254")));             //FMT_EURO              = 52
     }
@@ -251,11 +251,11 @@ public:
     LwpNumericFormat(LwpObjectStream * pStrm);
     ~LwpNumericFormat(){}
     void Read();
-    static sal_Bool IsCurrencyFormat(sal_uInt16 Format);
+    static bool IsCurrencyFormat(sal_uInt16 Format);
     sal_uInt16 GetDecimalPlaces(void);
-    sal_Bool IsDecimalPlacesOverridden(void);
-    sal_Bool IsNegativeOverridden(void);
-    sal_Bool IsZeroOverridden(void);
+    bool IsDecimalPlacesOverridden(void);
+    bool IsNegativeOverridden(void);
+    bool IsZeroOverridden(void);
     XFStyle* Convert();
 
 private:
@@ -280,24 +280,24 @@ private:
     static sal_uInt16 GetDefaultDecimalPlaces(sal_uInt16 Format);
     static LwpCurrencyPool m_aCurrencyInfo;
 
-    void GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString& aPrefix, OUString& aSuffix, sal_Bool bNegtive=sal_False);
+    void GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString& aPrefix, OUString& aSuffix, bool bNegtive=false);
     void SetNumberType(XFNumberStyle* pStyle);
     OUString    reencode(const OUString& sCode);
 };
 
-inline sal_Bool
+inline bool
 LwpNumericFormat::IsDecimalPlacesOverridden(void)
 {
     return (cFlags & NF_OVER_DECIMAL_PLACES) != 0;
 }
 
-inline sal_Bool
+inline bool
 LwpNumericFormat::IsNegativeOverridden(void)
 {
     return (cFlags & NF_OVER_NEGATIVE) != 0;
 }
 
-inline sal_Bool
+inline bool
 LwpNumericFormat::IsZeroOverridden(void)
 {
     return (cFlags & NF_OVER_ZERO) != 0;
diff --git a/lotuswordpro/source/filter/lwpobjhdr.cxx b/lotuswordpro/source/filter/lwpobjhdr.cxx
index 4e9dd2a5cefa..d15aa5234d76 100644
--- a/lotuswordpro/source/filter/lwpobjhdr.cxx
+++ b/lotuswordpro/source/filter/lwpobjhdr.cxx
@@ -67,7 +67,7 @@
 #include "lwpfilehdr.hxx"
 
 LwpObjectHeader::LwpObjectHeader()
-    : m_nTag(0), m_ID(), m_nSize(0), m_bCompressed(sal_False)
+    : m_nTag(0), m_ID(), m_nSize(0), m_bCompressed(false)
     // m_nHeaderSize(0), m_nVersionID(0), m_nRefCount(0), m_nFlagBits(0),
     //m_nNextVersionOffset(0), m_nNextVersionID(0),
 {}
@@ -194,7 +194,7 @@ bool LwpObjectHeader::Read(LwpSvStream &rStrm)
 
         if (nFlagBits & DATA_COMPRESSED)
         {
-            m_bCompressed = sal_True;
+            m_bCompressed = true;
         }
     }
     sal_Int64 nEndPos = rStrm.Tell();
diff --git a/lotuswordpro/source/filter/lwpobjhdr.hxx b/lotuswordpro/source/filter/lwpobjhdr.hxx
index 659a05c0ab74..b416cd1fe36b 100644
--- a/lotuswordpro/source/filter/lwpobjhdr.hxx
+++ b/lotuswordpro/source/filter/lwpobjhdr.hxx
@@ -78,7 +78,7 @@ private:
     sal_uInt32 m_nTag;
     LwpObjectID m_ID;
     sal_uInt32 m_nSize;     //Data size
-    sal_Bool m_bCompressed;
+    bool m_bCompressed;
 
     //localize the following memebers to save memory
     //sal_uInt8 m_nFlagBits;
@@ -115,7 +115,7 @@ public:
     inline sal_uInt32 GetTag();
     inline sal_uInt32 GetSize();
     inline LwpObjectID* GetID();
-    inline sal_Bool IsCompressed();
+    inline bool IsCompressed();
 };
 
 inline sal_uInt32 LwpObjectHeader::GetTag()
@@ -130,7 +130,7 @@ inline LwpObjectID* LwpObjectHeader::GetID()
 {
     return &m_ID;
 }
-inline sal_Bool LwpObjectHeader::IsCompressed()
+inline bool LwpObjectHeader::IsCompressed()
 {
     return m_bCompressed;
 }
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index 5eb7f6d3e2ce..5fef7fbeaf14 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -68,7 +68,7 @@
 #include "lwpglobalmgr.hxx"
 
 LwpObjectID::LwpObjectID(sal_uInt32 low, sal_uInt16 high)
-    :m_nLow(low), m_nHigh(high), m_nIndex(0), m_bIsCompressed(sal_False)
+    :m_nLow(low), m_nHigh(high), m_nIndex(0), m_bIsCompressed(false)
 {
 }
 /**
@@ -98,7 +98,7 @@ sal_uInt32 LwpObjectID::Read(LwpObjectStream *pObj)
 sal_uInt32 LwpObjectID::ReadIndexed(LwpSvStream *pStrm)
 {
 //note the m_nLow store the index instead of time from the timetable as in LWP
-    m_bIsCompressed = sal_False;
+    m_bIsCompressed = false;
     if( LwpFileHeader::m_nFileRevision < 0x000B)
     {
         return Read(pStrm);
@@ -108,7 +108,7 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpSvStream *pStrm)
 
     if (m_nIndex)
     {
-        m_bIsCompressed = sal_True;
+        m_bIsCompressed = true;
         //m_nLow = index;       //note the m_nLow stores the index instead of the actual time id
         LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
         LwpObjectFactory* pFactory = pGlobal->GetLwpObjFactory();
@@ -130,7 +130,7 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpSvStream *pStrm)
 */
 sal_uInt32 LwpObjectID::ReadIndexed(LwpObjectStream *pStrm)
 {
-    m_bIsCompressed = sal_False;
+    m_bIsCompressed = false;
     if(LwpFileHeader::m_nFileRevision < 0x000B)
     {
         return Read(pStrm);
@@ -139,7 +139,7 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpObjectStream *pStrm)
     m_nIndex = pStrm->QuickReaduInt8();
     if (m_nIndex)
     {
-        m_bIsCompressed = sal_True;
+        m_bIsCompressed = true;
         //m_nLow = index;       //note the m_nLow stores the index instead of the actual time id
         LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
         LwpObjectFactory* pFactory = pGlobal->GetLwpObjFactory();
diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx
index 7059ac9db096..35499b445333 100644
--- a/lotuswordpro/source/filter/lwpobjid.hxx
+++ b/lotuswordpro/source/filter/lwpobjid.hxx
@@ -82,7 +82,7 @@ private:
     sal_uInt32 m_nLow;
     sal_uInt16 m_nHigh;
     sal_uInt8 m_nIndex;
-    sal_Bool m_bIsCompressed;
+    bool m_bIsCompressed;
 public:
     sal_uInt32  Read( LwpSvStream *pStrm );
     sal_uInt32 Read( LwpObjectStream *pStrm );
@@ -92,36 +92,36 @@ public:
 
     sal_uInt32 DiskSize() const;
     sal_uInt32 DiskSizeIndexed() const;
-    sal_Bool IsNull() const;
-    sal_Bool IsCompressed();
+    bool IsNull() const;
+    bool IsCompressed();
 
     sal_uInt32 GetLow() const ;
     sal_uInt16 GetHigh() const ;
     void SetLow(sal_uInt32 nl);
     void SetHigh(sal_uInt16 nh);
 
-    sal_Bool operator == (const LwpObjectID &Other) const;
-    sal_Bool operator != (const LwpObjectID &Other) const;
+    bool operator == (const LwpObjectID &Other) const;
+    bool operator != (const LwpObjectID &Other) const;
     LwpObject* obj(VO_TYPE tag=VO_INVALID) const;
     size_t HashCode() const;
 };
 
-inline sal_Bool LwpObjectID::IsNull() const
+inline bool LwpObjectID::IsNull() const
 {
     return (m_nLow == 0) && (m_nHigh == 0);
 }
 
-inline sal_Bool LwpObjectID::operator == (const LwpObjectID &Other) const
+inline bool LwpObjectID::operator == (const LwpObjectID &Other) const
 {
     return (m_nHigh == Other.m_nHigh) && (m_nLow == Other.m_nLow);
 }
 
-inline sal_Bool LwpObjectID::operator != (const LwpObjectID &Other) const
+inline bool LwpObjectID::operator != (const LwpObjectID &Other) const
 {
     return (m_nHigh != Other.m_nHigh) || (m_nLow != Other.m_nLow);
 }
 
-inline sal_Bool LwpObjectID::IsCompressed()
+inline bool LwpObjectID::IsCompressed()
 {
     return m_bIsCompressed;
 }
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 52949e4c2316..312ae67bc3f7 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -65,7 +65,7 @@
 /**
  * @descr  ctor() from LwpSvStream
  */
-LwpObjectStream::LwpObjectStream(LwpSvStream *pStrm, sal_Bool isCompressed, sal_uInt16 size)
+LwpObjectStream::LwpObjectStream(LwpSvStream *pStrm, bool isCompressed, sal_uInt16 size)
     :m_pContentBuf(NULL), m_nBufSize(size), m_nReadPos(0),
     m_pStrm(pStrm), m_bCompressed(isCompressed)
 {
@@ -192,26 +192,26 @@ void LwpObjectStream::SeekRel(sal_uInt16 pos)
 /**
  * @descr  Seek to pos in object buffer/buffer
  */
-sal_Bool LwpObjectStream::Seek( sal_uInt16 pos)
+bool LwpObjectStream::Seek( sal_uInt16 pos)
 {
     if (pos < m_nBufSize)
     {
         m_nReadPos = pos;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /**
  * @descr  Quick read sal_Bool
  */
-sal_Bool LwpObjectStream::QuickReadBool(bool *pFailure)
+bool LwpObjectStream::QuickReadBool(bool *pFailure)
 {
     SVBT16 aValue = {0};
     sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue));
     if (pFailure)
         *pFailure = (nRead != sizeof(aValue));
-    return static_cast<sal_Bool>(SVBT16ToShort(aValue));
+    return static_cast<bool>(SVBT16ToShort(aValue));
 }
 /**
  * @descr  Quick read sal_uInt32
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx
index 4fbfeff62a64..5c6f3aa9fd3f 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.hxx
@@ -75,7 +75,7 @@
 class LwpObjectStream
 {
 public:
-    LwpObjectStream(LwpSvStream *pStrm, sal_Bool isCompressed, sal_uInt16 size);
+    LwpObjectStream(LwpSvStream *pStrm, bool isCompressed, sal_uInt16 size);
     ~LwpObjectStream();
 private:
     sal_uInt8* m_pContentBuf;           //The content buffer of the object
@@ -87,16 +87,16 @@ private:
     sal_uInt16 m_nBufSize;              //The total size of m_pContentBuf
     sal_uInt16 m_nReadPos;          //The position of the quick read
     LwpSvStream* m_pStrm;
-    sal_Bool m_bCompressed;
+    bool m_bCompressed;
 public:
     sal_uInt16 QuickRead(void* buf, sal_uInt16 len);
     sal_uInt16 GetPos() { return m_nReadPos; }
     void SeekRel(sal_uInt16 pos);
-    sal_Bool Seek( sal_uInt16 pos);
+    bool Seek( sal_uInt16 pos);
     void SkipExtra();
     sal_uInt16 CheckExtra();
 
-    sal_Bool QuickReadBool(bool *pFailure=NULL);
+    bool QuickReadBool(bool *pFailure=NULL);
     sal_uInt32 QuickReaduInt32(bool *pFailure=NULL);
     sal_uInt16 QuickReaduInt16(bool *pFailure=NULL);
     sal_uInt8 QuickReaduInt8(bool *pFailure=NULL);
diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx
index 1f64516901e0..814689a6bda6 100644
--- a/lotuswordpro/source/filter/lwpoverride.cxx
+++ b/lotuswordpro/source/filter/lwpoverride.cxx
@@ -168,7 +168,7 @@ void LwpTextAttributeOverride::Read(LwpObjectStream* pStrm)
     pStrm->SkipExtra();
 }
 
-sal_Bool LwpTextAttributeOverride::IsHighlight()
+bool LwpTextAttributeOverride::IsHighlight()
 {
     return (m_nValues & TAO_HIGHLIGHT);
 }
@@ -213,16 +213,16 @@ void LwpBulletOverride::Read(LwpObjectStream * pStrm)
 {
     if (pStrm->QuickReadBool())
     {
-        m_bIsNull= sal_False;
+        m_bIsNull= false;
         ReadCommon(pStrm);
         m_SilverBullet.ReadIndexed(pStrm);
     }
     else
-        m_bIsNull = sal_True;
+        m_bIsNull = true;
 
     pStrm->SkipExtra();
 }
-void LwpBulletOverride::OverrideSkip(sal_Bool bOver)
+void LwpBulletOverride::OverrideSkip(bool bOver)
 {
     if (bOver)
     {
@@ -234,7 +234,7 @@ void LwpBulletOverride::OverrideSkip(sal_Bool bOver)
     }
 }
 
-void LwpBulletOverride::OverrideRightAligned(sal_Bool bOver)
+void LwpBulletOverride::OverrideRightAligned(bool bOver)
 {
     if(bOver)
     {
@@ -551,7 +551,7 @@ sal_uInt16 LwpIndentOverride::GetRelative()
     return RELATIVE_REST;
 }
 
-sal_Bool LwpIndentOverride::IsUseRelative()
+bool LwpIndentOverride::IsUseRelative()
 {
     return (m_nValues & IO_USE_RELATIVE) != 0;
 }
@@ -582,7 +582,7 @@ void LwpIndentOverride::OverrideIndentRest(sal_Int32 val)
     m_nOverride |= IO_REST;
 }
 
-void LwpIndentOverride::OverrideUseRelative(sal_Bool use)
+void LwpIndentOverride::OverrideUseRelative(bool use)
 {
     if (use)
     {
diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx
index 3a4181cff80c..70012551f36b 100644
--- a/lotuswordpro/source/filter/lwpoverride.hxx
+++ b/lotuswordpro/source/filter/lwpoverride.hxx
@@ -136,7 +136,7 @@ public:
 
     inline sal_uInt16 GetHideLevels() const;
 
-    sal_Bool IsHighlight();
+    bool IsHighlight();
 
 protected:
     LwpTextAttributeOverride(LwpTextAttributeOverride const& rOther);
@@ -179,7 +179,7 @@ private:
 class LwpBulletOverride : public LwpOverride
 {
 public:
-    LwpBulletOverride() {m_bIsNull = sal_True;}
+    LwpBulletOverride() {m_bIsNull = true;}
 
     virtual LwpBulletOverride* clone() const SAL_OVERRIDE;
 
@@ -189,22 +189,22 @@ public:
 
     void Override(LwpBulletOverride* pOther);
 
-    inline sal_Bool IsSilverBulletOverridden();
-    inline sal_Bool IsSkipOverridden();
-    inline sal_Bool IsRightAlignedOverridden();
-    inline sal_Bool IsSkip();
-    inline sal_Bool IsRightAligned();
-    inline sal_Bool IsEditable();
+    inline bool IsSilverBulletOverridden();
+    inline bool IsSkipOverridden();
+    inline bool IsRightAlignedOverridden();
+    inline bool IsSkip();
+    inline bool IsRightAligned();
+    inline bool IsEditable();
 
     void OverrideSilverBullet(LwpObjectID aID);
-    void OverrideSkip(sal_Bool bOver);
-    void OverrideRightAligned(sal_Bool bOver);
+    void OverrideSkip(bool bOver);
+    void OverrideRightAligned(bool bOver);
 
     inline void RevertSilverBullet();
     inline void RevertSkip();
     inline void RevertRightAligned();
 
-    sal_Bool IsInValid(){return m_bIsNull;}
+    bool IsInValid(){return m_bIsNull;}
 
 protected:
     LwpBulletOverride(LwpBulletOverride const& rOther);
@@ -223,7 +223,7 @@ private:
     };
 
     LwpObjectID m_SilverBullet;
-    sal_Bool m_bIsNull;
+    bool m_bIsNull;
 };
 
 inline LwpObjectID LwpBulletOverride::GetSilverBullet() const
@@ -231,34 +231,34 @@ inline LwpObjectID LwpBulletOverride::GetSilverBullet() const
     return m_SilverBullet;
 }
 
-inline sal_Bool LwpBulletOverride::IsSilverBulletOverridden()
+inline bool LwpBulletOverride::IsSilverBulletOverridden()
 {
-    return (sal_Bool)((m_nOverride & BO_SILVERBULLET) != 0);
+    return ((m_nOverride & BO_SILVERBULLET) != 0);
 }
 
-inline sal_Bool LwpBulletOverride::IsSkipOverridden()
+inline bool LwpBulletOverride::IsSkipOverridden()
 {
-    return (sal_Bool)((m_nOverride & BO_SKIP) != 0);
+    return ((m_nOverride & BO_SKIP) != 0);
 }
 
-inline sal_Bool LwpBulletOverride::IsRightAlignedOverridden()
+inline bool LwpBulletOverride::IsRightAlignedOverridden()
 {
-    return (sal_Bool)((m_nOverride & BO_RIGHTALIGN) != 0);
+    return ((m_nOverride & BO_RIGHTALIGN) != 0);
 }
 
-inline sal_Bool LwpBulletOverride::IsSkip()
+inline bool LwpBulletOverride::IsSkip()
 {
-    return (sal_Bool)((m_nValues & BO_SKIP) != 0);
+    return ((m_nValues & BO_SKIP) != 0);
 }
 
-inline sal_Bool LwpBulletOverride::IsEditable()
+inline bool LwpBulletOverride::IsEditable()
 {
-    return (sal_Bool)((m_nValues & BO_EDITABLE) != 0);
+    return ((m_nValues & BO_EDITABLE) != 0);
 }
 
-inline sal_Bool LwpBulletOverride::IsRightAligned()
+inline bool LwpBulletOverride::IsRightAligned()
 {
-    return (sal_Bool)((m_nValues & BO_RIGHTALIGN) != 0);
+    return ((m_nValues & BO_RIGHTALIGN) != 0);
 }
 
 inline void LwpBulletOverride::RevertSilverBullet()
@@ -413,13 +413,13 @@ public:
     inline double GetRight() const;
 
     sal_uInt16 GetRelative();
-    sal_Bool IsUseRelative();
+    bool IsUseRelative();
     void Override(LwpIndentOverride* other);
     void OverrideIndentAll(sal_Int32 val);
     void OverrideIndentFirst(sal_Int32 val);
     void OverrideIndentRight(sal_Int32 val);
     void OverrideIndentRest(sal_Int32 val);
-    void OverrideUseRelative(sal_Bool use);
+    void OverrideUseRelative(bool use);
     void OverrideRelative(sal_uInt16 relative);
     sal_Int32 GetMAll() const {return m_nAll;}
     sal_Int32 GetMFirst() const {return m_nFirst;}
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 69a657e419a6..ec388047bcdc 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -429,20 +429,20 @@ OUString LwpPageLayout::RegisterEndnoteStyle()
 * @descr:   Whether current page layout has columns
 *
 */
-sal_Bool LwpPageLayout::HasColumns()
+bool LwpPageLayout::HasColumns()
 {
-    return GetNumCols() > 1 ? sal_True : sal_False;
+    return GetNumCols() > 1;
 }
 
 /**
 * @descr:   Whether has filler page text in current page layout
 *
 */
-sal_Bool LwpPageLayout::HasFillerPageText(LwpFoundry* pFoundry)
+bool LwpPageLayout::HasFillerPageText(LwpFoundry* pFoundry)
 {
-    if(!pFoundry) return sal_False;
+    if(!pFoundry) return false;
 
-    sal_Bool bFillerPage = sal_False;
+    bool bFillerPage = false;
     LwpLayout::UseWhenType eWhenType = GetUseWhenType();
     if(eWhenType==LwpLayout::StartOnOddPage||eWhenType==LwpLayout::StartOnEvenPage)
     {
@@ -456,15 +456,15 @@ sal_Bool LwpPageLayout::HasFillerPageText(LwpFoundry* pFoundry)
         {
             if((eWhenType==LwpLayout::StartOnOddPage)&&(LwpTools::IsOddNumber(nPageNumber)))
             {
-                bFillerPage = sal_True;
+                bFillerPage = true;
             }
             else if((eWhenType==LwpLayout::StartOnEvenPage)&&(LwpTools::IsEvenNumber(nPageNumber)))
             {
-                bFillerPage = sal_True;
+                bFillerPage = true;
             }
             else
             {
-                bFillerPage = sal_False;
+                bFillerPage = false;
             }
         }
     }
@@ -641,7 +641,7 @@ void LwpPageLayout::GetWidthAndHeight(double& fWidth, double& fHeight)
     {
         //replaced by printer paper size
         Printer aPrinter;
-        sal_Bool bScreen = aPrinter.IsDisplayPrinter();
+        bool bScreen = aPrinter.IsDisplayPrinter();
         if (!bScreen)//Printer available
         {
             Size aPaperSize = aPrinter.GetPaperSize();
@@ -686,7 +686,7 @@ double LwpPageLayout::GetHeight()
 * @descr:  Compare the position of layout. If the poistion of this layout is earlier than other layout,return ture, or return false
 *
 */
-sal_Bool LwpPageLayout::operator<(LwpPageLayout& Other)
+bool LwpPageLayout::operator<(LwpPageLayout& Other)
 {
     LwpPara* pThisPara = GetPagePosition();
     LwpPara* pOtherPara = Other.GetPagePosition();
@@ -704,9 +704,9 @@ sal_Bool LwpPageLayout::operator<(LwpPageLayout& Other)
     }
 
     if(!pThisPara)
-        return sal_True;
+        return true;
 
-    return sal_False;
+    return false;
 }
 
 /**
@@ -804,7 +804,7 @@ void LwpHeaderLayout::ParseMargins(XFHeaderStyle* ph1)
     ph1->SetMargins( left, right, GetMarginsValue(MARGIN_BOTTOM));
 
     //Word Pro has no dynamic spacing, should be set to false
-    ph1->SetDynamicSpace(sal_False);
+    ph1->SetDynamicSpace(false);
 }
 
 void LwpHeaderLayout::ParseBorder(XFHeaderStyle* pHeaderStyle)
@@ -880,7 +880,7 @@ void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
     {
         LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
         LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr();
-        pChangeMgr->SetHeadFootFribMap(sal_True);
+        pChangeMgr->SetHeadFootFribMap(true);
 
         //Call the RegisterStyle first to register the styles in header paras, and then XFConvert()
         pStory->SetFoundry(m_pFoundry);
@@ -892,7 +892,7 @@ void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
         pChangeMgr->SetHeadFootChange(pHeader);
         pStory->XFConvert(pHeader);
 
-        pChangeMgr->SetHeadFootFribMap(sal_False);
+        pChangeMgr->SetHeadFootFribMap(false);
     }
     mp1->SetHeader(pHeader);
 }
@@ -968,7 +968,7 @@ void LwpFooterLayout::ParseMargins(XFFooterStyle* pFooterStyle)
     pFooterStyle->SetMargins( left, right, GetMarginsValue(MARGIN_TOP));
 
     //Word Pro has no dynamic spacing, should be set to false
-    pFooterStyle->SetDynamicSpace(sal_False);
+    pFooterStyle->SetDynamicSpace(false);
 }
 
 void LwpFooterLayout::ParseBorder(XFFooterStyle* pFooterStyle)
@@ -1034,7 +1034,7 @@ void LwpFooterLayout::RegisterStyle(XFMasterPage* mp1)
     {
         LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
         LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr();
-        pChangeMgr->SetHeadFootFribMap(sal_True);
+        pChangeMgr->SetHeadFootFribMap(true);
 
         pStory->SetFoundry(m_pFoundry);
         pStory->RegisterStyle();
@@ -1047,7 +1047,7 @@ void LwpFooterLayout::RegisterStyle(XFMasterPage* mp1)
 
         pStory->XFConvert(pFooter);
 
-        pChangeMgr->SetHeadFootFribMap(sal_False);
+        pChangeMgr->SetHeadFootFribMap(false);
     }
     mp1->SetFooter(pFooter);
 }
diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx
index f26d580e8bf4..167f81015df7 100644
--- a/lotuswordpro/source/filter/lwppagelayout.hxx
+++ b/lotuswordpro/source/filter/lwppagelayout.hxx
@@ -103,13 +103,13 @@ protected:
     LwpAtomHolder*  m_pPaperName;
     XFPageMaster* m_pXFPageMaster;
 public:
-    sal_Bool HasColumns();
-    sal_Bool HasFillerPageText(LwpFoundry* pFoundry);
+    bool HasColumns();
+    bool HasFillerPageText(LwpFoundry* pFoundry);
     void ConvertFillerPageText(XFContentContainer* pCont);
     void ResetXFColumns();
     LwpPageLayout* GetOddChildLayout();
     virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber = 0) SAL_OVERRIDE;
-    sal_Bool operator <(LwpPageLayout& Other);
+    bool operator <(LwpPageLayout& Other);
     LwpPara* GetPagePosition();
 };
 
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 7a0027860434..961f1113c0a9 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -109,12 +109,12 @@ LwpPara::LwpPara(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
     , m_pBreaks(NULL)
     , m_pIndentOverride(NULL)
     , m_AllText("")
-    , m_bHasBullet(sal_False)
+    , m_bHasBullet(false)
     , m_pSilverBullet(NULL)
     , m_pBullOver(NULL)
-    , m_bBullContinue(sal_False)
+    , m_bBullContinue(false)
     , m_SectionStyleName("")
-    , m_bHasDropcap(sal_False)
+    , m_bHasDropcap(false)
     , m_nLines(0)
     , m_nChars(0)
     , m_pDropcapLayout(NULL)
@@ -160,10 +160,10 @@ void LwpPara::Read()
 {
     LwpDLVList::Read();
 
-    sal_Bool Simple;
-    sal_Bool Notify = sal_False;
+    bool Simple;
+    bool Notify = false;
     if(LwpFileHeader::m_nFileRevision<0x0006)
-        Simple = sal_False;
+        Simple = false;
     else if(LwpFileHeader::m_nFileRevision<0x000B)
         Simple = m_pObjStrm->QuickReaduInt8();
     else
@@ -264,7 +264,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
 
     LwpStory *pStory = dynamic_cast<LwpStory*>(m_Story.obj());
 
-    if (pStory && pStory->GetDropcapFlag() == sal_True)
+    if (pStory && pStory->GetDropcapFlag())
     {
         ParseDropcapContent();
         return;
@@ -301,7 +301,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
         if (pBulletStyleMgr)
         {
             pBulletStyleMgr->SetCurrentSilverBullet(LwpObjectID());
-            pBulletStyleMgr->SetContinueFlag(sal_False);
+            pBulletStyleMgr->SetContinueFlag(false);
         }
         m_pXFContainer->Add(pPara);
     }
@@ -313,22 +313,22 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
         AddBreakAfter(m_pXFContainer);
 }
 
-sal_Bool LwpPara::RegisterMasterPage(XFParaStyle* pBaseStyle)
+bool LwpPara::RegisterMasterPage(XFParaStyle* pBaseStyle)
 {
-    sal_Bool bSuccess = sal_False;
+    bool bSuccess = false;
     //get story
     LwpStory* pStory = dynamic_cast<LwpStory*>(m_Story.obj());
     //if pagelayout is modified, register the pagelayout
     if(pStory && pStory->IsPMModified())
     {
-        sal_Bool bNewSection = pStory->IsNeedSection();
+        bool bNewSection = pStory->IsNeedSection();
         LwpPageLayout* pLayout = pStory->GetCurrentLayout();
         if(bNewSection)
         {
             RegisterNewSectionStyle(pLayout);
         }
 
-        bSuccess = sal_True;
+        bSuccess = true;
         //register master page style
         XFParaStyle* pOverStyle = new XFParaStyle();
         *pOverStyle = *pBaseStyle;
@@ -366,8 +366,8 @@ void LwpPara::RegisterStyle()
     }
 
     XFParaStyle* pOverStyle = NULL;
-    sal_Bool noSpacing = sal_True;
-    sal_Bool noIndent = sal_True;
+    bool noSpacing = true;
+    bool noIndent = true;
     LwpParaProperty* pBulletProps = NULL, *pNumberingProps = NULL;
 
     if (m_pProps != NULL)
@@ -399,7 +399,7 @@ void LwpPara::RegisterStyle()
                 break;
             case PP_LOCAL_INDENT:
             {
-                noIndent = sal_False;
+                noIndent = false;
                 if (!rParaStyle.GetIndent())
                     OverrideIndent(NULL,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle);
 
@@ -411,7 +411,7 @@ void LwpPara::RegisterStyle()
                 break;
             case PP_LOCAL_SPACING:
             {
-                noSpacing = sal_False;
+                noSpacing = false;
                 if (!rParaStyle.GetSpacing())
                     OverrideSpacing(NULL,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle);
                 else
@@ -576,9 +576,9 @@ void LwpPara::RegisterStyle()
                     OUString aPreBullStyleName;
                     LwpNumberingOverride* pNumbering = this->GetParaNumbering();
                     sal_uInt16 nPosition = pNumbering->GetPosition();
-                    sal_Bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition);
+                    bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition);
                     /*sal_Bool bResetSection =*/ m_pSilverBullet->IsNewSection(nPosition);
-                    sal_Bool bHeading;
+                    bool bHeading;
                     LwpPara* pPara = this;
                     LwpPara* pPrePara = NULL;
                     LwpSilverBullet* pParaSilverBullet = NULL;
@@ -711,11 +711,11 @@ void LwpPara::RegisterStyle()
                     if (nNum > 1)
                     {
                         m_aBulletStyleName = aPreBullStyleName;
-                        m_bBullContinue = sal_True;
+                        m_bBullContinue = true;
                     }
                     else
                     {
-                        m_bBullContinue = sal_False;
+                        m_bBullContinue = false;
                         if (this->IsInCell())
                         {
                             XFListStyle* pOldStyle = static_cast<XFListStyle*>(pXFStyleManager->FindStyle(m_aBulletStyleName));
@@ -781,7 +781,7 @@ void LwpPara::RegisterStyle()
     m_Fribs.SetPara(this);
     m_Fribs.RegisterStyle();
 
-    if (m_bHasDropcap == sal_True)
+    if (m_bHasDropcap)
     {
         GatherDropcapInfo();
         XFParaStyle* pStyle = new XFParaStyle;
@@ -930,14 +930,14 @@ XFContentContainer* LwpPara::AddBulletList(XFContentContainer* pCont)
     }
 
     sal_uInt16 nLevel = m_nLevel;
-    sal_Bool bOrdered = sal_False;
+    bool bOrdered = false;
     /*LwpStory* pMyStory =*/ GetStory();
 
     pBulletStyleMgr->SetContinueFlag(m_bBullContinue);
 
     if (m_pSilverBullet->IsBulletOrdered())
     {
-        bOrdered = sal_True;
+        bOrdered = true;
     }
     if (m_pSilverBullet->HasName())
     {
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 4095bd111684..c88280a5dcfb 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -172,7 +172,7 @@ public:
     OUString GetBulletChar() const;
     sal_uInt32 GetBulletFontID() const;
     sal_uInt16 GetLevel() const;
-    sal_Bool GetBulletFlag() const;
+    bool GetBulletFlag() const;
 
     void GetParaNumber(sal_uInt16 nPosition, ParaNumbering* pParaNumbering);
     LwpFribPtr* GetFribs();
@@ -182,16 +182,16 @@ public:
     OUString GetBulletStyleName() const;
     void SetBelowSpacing(double value);
     void SetBulletStyleName(const OUString& rNewName);
-    void SetBulletFlag(sal_Bool bFlag);
+    void SetBulletFlag(bool bFlag);
     void SetIndent(LwpIndentOverride* pIndentOverride);
     void SetFirstFrib(const OUString& Content,sal_uInt32 FontID);
-    OUString GetContentText(sal_Bool bAllText = sal_False);
+    OUString GetContentText(bool bAllText = false);
 
-    void SetParaDropcap(sal_Bool bFlag);
+    void SetParaDropcap(bool bFlag);
     void SetDropcapLines(sal_uInt16 number);
     void SetDropcapChars(sal_uInt32 chars);
     void SetDropcapLayout(LwpDropcapLayout* pLayout);
-    sal_Bool IsHasDropcap();
+    bool IsHasDropcap();
 
     XFContentContainer* GetXFContainer();
     void AddXFContent(XFContent* pCont);
@@ -201,10 +201,10 @@ public:
 
     LwpBulletStyleMgr* GetBulletStyleMgr();
     sal_uInt32 GetOrdinal(){ return m_nOrdinal;}
-    sal_Bool operator <(LwpPara& Other);
-    sal_Bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
+    bool operator <(LwpPara& Other);
+    bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
 
-    sal_Bool IsInCell();
+    bool IsInCell();
 
     void SetAllText(const OUString& sText);
     OUString GetStyleName(){return m_StyleName;}
@@ -234,17 +234,17 @@ protected:
     sal_uInt32 m_FontID;//for silver bullet
     OUString m_AllText;//get all text in this paragraph
 
-    sal_Bool m_bHasBullet;
+    bool m_bHasBullet;
     LwpObjectID m_aSilverBulletID;
     LwpSilverBullet* m_pSilverBullet;
     LwpBulletOverride* m_pBullOver;
     boost::scoped_ptr<LwpNumberingOverride> m_pParaNumbering;
     OUString m_aBulletStyleName;
-    sal_Bool m_bBullContinue;
+    bool m_bBullContinue;
     //end add
 
     OUString m_SectionStyleName;
-    sal_Bool m_bHasDropcap;
+    bool m_bHasDropcap;
     sal_uInt16 m_nLines;
     sal_uInt32 m_nChars;
     LwpDropcapLayout* m_pDropcapLayout;
@@ -285,7 +285,7 @@ private:
     void OverrideParaBullet(LwpParaProperty* pProps);
     void OverrideParaNumbering(LwpParaProperty* pProps);
 
-    sal_Bool RegisterMasterPage(XFParaStyle* pBaseStyle);
+    bool RegisterMasterPage(XFParaStyle* pBaseStyle);
     void RegisterNewSectionStyle(LwpPageLayout* pLayout);
 
     void ParseDropcapContent();
@@ -319,11 +319,11 @@ inline void LwpPara::SetBulletStyleName(const OUString& rNewName)
 {
     m_aBulletStyleName = rNewName;
 }
-inline void LwpPara::SetBulletFlag(sal_Bool bFlag)
+inline void LwpPara::SetBulletFlag(bool bFlag)
 {
     m_bHasBullet = bFlag;
 }
-inline sal_Bool LwpPara::GetBulletFlag() const
+inline bool LwpPara::GetBulletFlag() const
 {
     return m_bHasBullet;
 }
@@ -372,11 +372,11 @@ inline LwpStory* LwpPara::GetStory()
     return NULL;
 }
 
-inline sal_Bool LwpPara::IsHasDropcap()
+inline bool LwpPara::IsHasDropcap()
 {
     return m_bHasDropcap;
 }
-inline void LwpPara::SetParaDropcap(sal_Bool bFlag)
+inline void LwpPara::SetParaDropcap(bool bFlag)
 {
     m_bHasDropcap = bFlag;
 }
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index a8cb05e83bb1..70df2579552a 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -118,7 +118,7 @@ using boost::polymorphic_downcast;
 /**
  * @short   get text of paragraph
  */
-OUString LwpPara::GetContentText(sal_Bool bAllText)
+OUString LwpPara::GetContentText(bool bAllText)
 {
 //  rFont = m_FontID;
     if (bAllText)
@@ -472,7 +472,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
         }
         else
         {
-            m_bHasBullet = sal_True;
+            m_bHasBullet = true;
 
             LwpOverride* pBullet= pParaStyle->GetBulletOverride();
             SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -508,7 +508,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
             m_aSilverBulletID = pBullOver->GetSilverBullet();
             if (!m_aSilverBulletID.IsNull())
             {
-                m_bHasBullet = sal_True;
+                m_bHasBullet = true;
 
                 m_pSilverBullet = dynamic_cast<LwpSilverBullet*>(m_aSilverBulletID.obj(VO_SILVERBULLET));
                 if (m_pSilverBullet)
@@ -617,7 +617,7 @@ LwpTabOverride* LwpPara::GetLocalTabOverride()
 * @descr:   Determined which para is earlier in position
 *
 */
-sal_Bool LwpPara::operator< (LwpPara& Other)
+bool LwpPara::operator< (LwpPara& Other)
 {
     return m_nOrdinal < Other.GetOrdinal();
 }
@@ -626,7 +626,7 @@ sal_Bool LwpPara::operator< (LwpPara& Other)
 * @descr:  If the two layouts in the same para, compare which layout is earlied according to frib order
 *
 */
-sal_Bool LwpPara::ComparePagePosition(LwpVirtualLayout * pPreLayout, LwpVirtualLayout * pNextLayout)
+bool LwpPara::ComparePagePosition(LwpVirtualLayout * pPreLayout, LwpVirtualLayout * pNextLayout)
 {
     m_Fribs.SetPara(this);
     return m_Fribs.ComparePagePosition(pPreLayout, pNextLayout);
@@ -635,13 +635,13 @@ sal_Bool LwpPara::ComparePagePosition(LwpVirtualLayout * pPreLayout, LwpVirtualL
 /**
  * @short   check paragraph in cell or not
  */
-sal_Bool LwpPara::IsInCell()
+bool LwpPara::IsInCell()
 {
     LwpStory *pStory = GetStory();
     LwpVirtualLayout* pLayout = pStory ? pStory->GetLayout(NULL) : NULL;
     if(pLayout && pLayout->IsCell())
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
index ceb4ee2ba53c..77f8243f247d 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
@@ -90,19 +90,19 @@ public:
 
     void Override(LwpParaBorderOverride* pOther);
 
-    inline sal_Bool IsBorderStuffOverridden();
-    inline sal_Bool IsBetweenStuffOverridden();
-    inline sal_Bool IsShadowOverridden();
-    inline sal_Bool IsMarginsOverridden();
-    inline sal_Bool IsAboveTypeOverridden();
-    inline sal_Bool IsBelowTypeOverridden();
-    inline sal_Bool IsRightTypeOverridden();
-    inline sal_Bool IsBetweenTypeOverridden();
-    inline sal_Bool IsAboveWidthOverridden();
-    inline sal_Bool IsBelowWidthOverridden();
-    inline sal_Bool IsBetweenWidthOverridden();
-    inline sal_Bool IsRightWidthOverridden();
-    inline sal_Bool IsBetweenMarginOverridden();
+    inline bool IsBorderStuffOverridden();
+    inline bool IsBetweenStuffOverridden();
+    inline bool IsShadowOverridden();
+    inline bool IsMarginsOverridden();
+    inline bool IsAboveTypeOverridden();
+    inline bool IsBelowTypeOverridden();
+    inline bool IsRightTypeOverridden();
+    inline bool IsBetweenTypeOverridden();
+    inline bool IsAboveWidthOverridden();
+    inline bool IsBelowWidthOverridden();
+    inline bool IsBetweenWidthOverridden();
+    inline bool IsRightWidthOverridden();
+    inline bool IsBetweenMarginOverridden();
 
     void OverrideBorderStuff(LwpBorderStuff* pBorderStuff);
     void OverrideBetweenStuff(LwpBorderStuff* pBorderStuff);
@@ -178,57 +178,57 @@ private:
     sal_uInt32          m_nBetweenMargin;
 };
 
-inline sal_Bool LwpParaBorderOverride::IsBorderStuffOverridden()
+inline bool LwpParaBorderOverride::IsBorderStuffOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_STUFF) != 0);
+    return ((m_nOverride & PBO_STUFF) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsBetweenStuffOverridden()
+inline bool LwpParaBorderOverride::IsBetweenStuffOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_BETWEENSTUFF) != 0);
+    return ((m_nOverride & PBO_BETWEENSTUFF) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsShadowOverridden()
+inline bool LwpParaBorderOverride::IsShadowOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_SHADOW) != 0);
+    return ((m_nOverride & PBO_SHADOW) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsMarginsOverridden()
+inline bool LwpParaBorderOverride::IsMarginsOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_MARGINS) != 0);
+    return ((m_nOverride & PBO_MARGINS) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsAboveTypeOverridden()
+inline bool LwpParaBorderOverride::IsAboveTypeOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_ABOVETYPE) != 0);
+    return ((m_nOverride & PBO_ABOVETYPE) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsBelowTypeOverridden()
+inline bool LwpParaBorderOverride::IsBelowTypeOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_BELOWTYPE) != 0);
+    return ((m_nOverride & PBO_BELOWTYPE) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsRightTypeOverridden()
+inline bool LwpParaBorderOverride::IsRightTypeOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_RIGHTTYPE) != 0);
+    return ((m_nOverride & PBO_RIGHTTYPE) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsBetweenTypeOverridden()
+inline bool LwpParaBorderOverride::IsBetweenTypeOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_BETWEENTYPE) != 0);
+    return ((m_nOverride & PBO_BETWEENTYPE) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsAboveWidthOverridden()
+inline bool LwpParaBorderOverride::IsAboveWidthOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_ABOVE) != 0);
+    return ((m_nOverride & PBO_ABOVE) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsBelowWidthOverridden()
+inline bool LwpParaBorderOverride::IsBelowWidthOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_BELOW) != 0);
+    return ((m_nOverride & PBO_BELOW) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsBetweenWidthOverridden()
+inline bool LwpParaBorderOverride::IsBetweenWidthOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_BETWEEN) != 0);
+    return ((m_nOverride & PBO_BETWEEN) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsRightWidthOverridden()
+inline bool LwpParaBorderOverride::IsRightWidthOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_RIGHT) != 0);
+    return ((m_nOverride & PBO_RIGHT) != 0);
 }
-inline sal_Bool LwpParaBorderOverride::IsBetweenMarginOverridden()
+inline bool LwpParaBorderOverride::IsBetweenMarginOverridden()
 {
-    return (sal_Bool)((m_nOverride & PBO_BETWEENMARGIN) != 0);
+    return ((m_nOverride & PBO_BETWEENMARGIN) != 0);
 }
 
 inline void LwpParaBorderOverride::RevertBorderStuff()
diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx b/lotuswordpro/source/filter/lwpparaproperty.cxx
index 7a8469ce17e8..0b8c80b412cb 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.cxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.cxx
@@ -115,7 +115,7 @@ LwpParaProperty* LwpParaProperty::ReadPropertyList(LwpObjectStream* pFile,LwpObj
 
             case TAG_PARA_BULLET:
                 NewProp = new LwpParaBulletProperty(pFile);
-                static_cast<LwpPara*>(Whole)->SetBulletFlag(sal_True);
+                static_cast<LwpPara*>(Whole)->SetBulletFlag(true);
                 break;
 
             case TAG_PARA_NUMBERING:
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index 03c06a2dfe2c..70b8e93ea622 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -277,20 +277,20 @@ void LwpParaStyle::ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::
         break;
     case 0x15: //double , fall through!
     case 0x16: //thick double
-        pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False);
+        pXFBorders->SetDoubleLine(eXFBorderSide, true, false);
         pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.333));
         pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.334));
         pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.333));
 //      pXFBorders->SetWidth(eXFBorderSide, fWidth);
         break;
     case 0x18: //thick-thin
-        pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False);
+        pXFBorders->SetDoubleLine(eXFBorderSide, true, false);
         pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.5));
         pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.25));
         pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.25));
         break;
     case 0x19: //thin-thick
-        pXFBorders->SetDoubleLine(eXFBorderSide, sal_True, sal_False);
+        pXFBorders->SetDoubleLine(eXFBorderSide, true, false);
         pXFBorders->SetWidthInner(eXFBorderSide, static_cast<float>(fWidth*0.7));
         pXFBorders->SetWidthOuter(eXFBorderSide, static_cast<float>(fWidth*0.15));
         pXFBorders->SetWidthSpace(eXFBorderSide, static_cast<float>(fWidth*0.15));
@@ -317,12 +317,12 @@ void LwpParaStyle::ApplyParaBorder(XFParaStyle* pParaStyle, LwpParaBorderOverrid
         if( offsetX && offsetY && color.IsValidColor() )
         {
             XFColor aXFColor(color.To24Color());
-            sal_Bool left = sal_False;
-            sal_Bool top = sal_False;
+            bool left = false;
+            bool top = false;
             if( offsetX < 0 )
-                left = sal_True;
+                left = true;
             if( offsetY < 0 )
-                top = sal_True;
+                top = true;
             if( left )
             {
                 if( top )
@@ -405,7 +405,7 @@ void LwpParaStyle::ApplyAlignment(XFParaStyle* pParaStyle, LwpAlignmentOverride*
     LwpAlignmentOverride::AlignType type;
 
     type = pAlign->GetAlignType();
-    pParaStyle->SetNumberRight(sal_False);//to identify its align attribute
+    pParaStyle->SetNumberRight(false);//to identify its align attribute
     switch(type)
     {
     case LwpAlignmentOverride::ALIGN_LEFT:
@@ -425,7 +425,7 @@ void LwpParaStyle::ApplyAlignment(XFParaStyle* pParaStyle, LwpAlignmentOverride*
         alignType = enumXFAlignJustify;
         break;
     case LwpAlignmentOverride::ALIGN_NUMERICRIGHT:
-        pParaStyle->SetNumberRight(sal_True);//to identify its align attribute
+        pParaStyle->SetNumberRight(true);//to identify its align attribute
         alignType = enumXFAlignEnd;
         break;
     default:
diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index 8bd20f55a815..44740cdae8b7 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -82,7 +82,7 @@ void LwpPropListElement::Read()
     m_pObjStrm->SkipExtra();
 }
 
-sal_Bool LwpPropListElement::IsNamed(const OUString& name)
+bool LwpPropListElement::IsNamed(const OUString& name)
 {
     return name.equals(m_Name.str());
 }
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index 1519bcd6240b..21d4cff2beab 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -75,7 +75,7 @@ public:
     LwpPropListElement(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
     virtual ~LwpPropListElement(){}
     void Read() SAL_OVERRIDE;
-    sal_Bool IsNamed(const OUString& name);
+    bool IsNamed(const OUString& name);
     LwpPropListElement* GetNext();
     LwpAtomHolder GetValue(){return m_Value;}
     LwpAtomHolder GetName(){return m_Name;}
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index ba7162450925..f8ead032fc9d 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -459,12 +459,12 @@ void LwpRowLayout::SetCellSplit(sal_uInt16 nEffectRows)
 /**
  * @short   check if the row has merge cell
  */
-sal_Bool LwpRowLayout::GetMergeCellFlag()
+bool LwpRowLayout::GetMergeCellFlag()
 {
     if (m_ConnCellList.empty())
-        return sal_False;
+        return false;
     else
-        return sal_True;
+        return true;
 }
 
 LwpRowHeadingLayout::LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index 07de2c6404c4..d4bf758fef17 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -108,7 +108,7 @@ public:
     void ConvertCommonRow(XFTable* pXFTable,sal_uInt8 nStartCol,sal_uInt8 nEndCol);
     void CollectMergeInfo();
     void SetCellSplit(sal_uInt16 nEffectRows);
-    sal_Bool GetMergeCellFlag();
+    bool GetMergeCellFlag();
     sal_uInt16 GetCurMaxSpannedRows(sal_uInt8 nStartCol,sal_uInt8 nEndCol);
     void RegisterCurRowStyle(XFRow* pXFRow,sal_uInt16 nRowMark);
 };
diff --git a/lotuswordpro/source/filter/lwpsdwrect.cxx b/lotuswordpro/source/filter/lwpsdwrect.cxx
index 221b4edbb74d..189ae3109b7c 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.cxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.cxx
@@ -68,7 +68,7 @@
  * @date:   11/19/2004
  * @short:  Default constructor
 **************************************************************************/
-SdwRectangle::SdwRectangle() : m_bRotated(sal_False)
+SdwRectangle::SdwRectangle() : m_bRotated(false)
 {
     for (sal_uInt16 i = 0; i < 4; i++)
     {
@@ -81,7 +81,7 @@ SdwRectangle::SdwRectangle() : m_bRotated(sal_False)
  * @param:  aPt0~aPt3 four corner points of a rectangle.
 **************************************************************************/
 SdwRectangle::SdwRectangle(const Point& rPt0, const Point& rPt1,
-        const Point& rPt2, const Point& rPt3) : m_bRotated(sal_True)
+        const Point& rPt2, const Point& rPt3) : m_bRotated(true)
 {
     m_nRectCorner[0] = rPt0;
     m_nRectCorner[1] = rPt1;
@@ -90,7 +90,7 @@ SdwRectangle::SdwRectangle(const Point& rPt0, const Point& rPt1,
 
     if (rPt0.Y() == rPt1.Y() && rPt0.Y() < rPt3.Y())
     {
-        m_bRotated = sal_False;
+        m_bRotated = false;
     }
 }
 
@@ -119,7 +119,7 @@ SdwRectangle::~SdwRectangle()
  * @short:  Get the flag whether if the rectangle has been rotated.
  * @return: m_bRotated rotation flag.
 **************************************************************************/
-sal_Bool SdwRectangle::IsRectRotated() const
+bool SdwRectangle::IsRectRotated() const
 {
     return m_bRotated;
 }
diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx
index e622c4315b2e..846c1b9c7c4b 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.hxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.hxx
@@ -91,7 +91,7 @@
 class SdwRectangle
 {
 private:
-    sal_Bool m_bRotated;
+    bool m_bRotated;
 
 public:
     Point m_nRectCorner[4];
@@ -108,7 +108,7 @@ public:
     ~SdwRectangle();
 
 public:
-    sal_Bool IsRectRotated() const;
+    bool IsRectRotated() const;
 
     Point GetRectCenter() const ;
 
diff --git a/lotuswordpro/source/filter/lwpsection.cxx b/lotuswordpro/source/filter/lwpsection.cxx
index d124b6a1d7fb..42838566014d 100644
--- a/lotuswordpro/source/filter/lwpsection.cxx
+++ b/lotuswordpro/source/filter/lwpsection.cxx
@@ -146,13 +146,13 @@ void LwpIndexSection::Read()
     m_pObjStrm->SkipExtra();
 }
 
-sal_Bool LwpIndexSection::IsFormatRunin()
+bool LwpIndexSection::IsFormatRunin()
 {
     return (m_nFlags & RUN_IN);
 
 }
 
-sal_Bool LwpIndexSection::IsFormatSeparator()
+bool LwpIndexSection::IsFormatSeparator()
 {
     return (m_nFlags & SEPARATORS);
 
diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx
index 4c15d80de346..1860641c85f4 100644
--- a/lotuswordpro/source/filter/lwpsection.hxx
+++ b/lotuswordpro/source/filter/lwpsection.hxx
@@ -153,8 +153,8 @@ class LwpIndexSection : public LwpSection
 public:
     LwpIndexSection(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpIndexSection();
-    sal_Bool IsFormatRunin();
-    sal_Bool IsFormatSeparator();
+    bool IsFormatRunin();
+    bool IsFormatSeparator();
 protected:
     void Read() SAL_OVERRIDE;
 private:
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 91c693612fad..8aad25581ec9 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -120,7 +120,7 @@ void LwpSilverBullet::RegisterStyle()
     if (this->IsBulletOrdered() && this->HasName())
     {
         //todo: find the flag in the file
-        sal_Bool bCumulative = sal_False;
+        bool bCumulative = false;
 
         for (sal_uInt8 nPos = 1; nPos < 10; nPos++)
         {
@@ -134,7 +134,7 @@ void LwpSilverBullet::RegisterStyle()
                 {
                     m_pHideLevels[nPos] = aParaNumbering.nNumLevel;
                     sal_uInt16 nDisplayLevel = this->GetDisplayLevel(nPos);
-                    bCumulative = (sal_Bool)(nDisplayLevel > 1);
+                    bCumulative = (nDisplayLevel > 1);
                     OUString aPrefix = this->GetAdditionalName(nPos);
 
                     XFNumFmt aFmt;
@@ -327,17 +327,17 @@ OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
  * @descr:
  * @return:  sal_True if list is ordered, sal_False if list is unordered.
  */
-sal_Bool LwpSilverBullet::IsBulletOrdered()
+bool LwpSilverBullet::IsBulletOrdered()
 {
     if (!m_pBulletPara)
-        return sal_False;
+        return false;
 
     LwpFribPtr* pFribs = m_pBulletPara->GetFribs();
 
     if (!pFribs)
-        return sal_False;
+        return false;
 
-    return (sal_Bool)(pFribs->HasFrib(FRIB_TAG_PARANUMBER) != NULL);
+    return (pFribs->HasFrib(FRIB_TAG_PARANUMBER) != NULL);
 }
 
 /**
@@ -375,8 +375,8 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
 {
     OUString aRet, aEmpty;
     sal_uInt16 nHideBit = (1 << nPos);
-    sal_Bool bDivisionName = sal_False;
-    sal_Bool bSectionName = sal_False;
+    bool bDivisionName = false;
+    bool bSectionName = false;
 
     LwpFrib* pParaFrib = m_pBulletPara->GetFribs()->GetFribs();
     if (!pParaFrib)
@@ -400,11 +400,11 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
             {
                 if (nType == 0x000D)
                 {
-                    bDivisionName = sal_True;
+                    bDivisionName = true;
                 }
                 else if (nType == 0x000E)
                 {
-                    bSectionName= sal_True;
+                    bSectionName= true;
                 }
             }
         }
@@ -459,16 +459,16 @@ OUString LwpSilverBullet::GetSectionName()
     return pStory->GetSectionName();
 }
 
-sal_Bool LwpSilverBullet::HasName()
+bool LwpSilverBullet::HasName()
 {
     LwpAtomHolder* pName = this->GetName();
     if (pName)
     {
-        return (sal_Bool)(!pName->str().isEmpty());
+        return (!pName->str().isEmpty());
     }
     else
     {
-        return sal_False;
+        return false;
     }
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index 89ccf776b49a..511b1f80ef56 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -101,7 +101,7 @@ public:
 
     void Read() SAL_OVERRIDE;
 
-    sal_Bool IsBulletOrdered();
+    bool IsBulletOrdered();
 
     OUString GetBulletFontName();
 
@@ -117,13 +117,13 @@ public:
 
     inline LwpPara* GetNumberingPara();
 
-    sal_Bool HasName();
+    bool HasName();
 
     static OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber);
 
-    inline sal_Bool IsPosCumulative(sal_uInt16 nHideLevels);
-    inline sal_Bool IsLesserLevel(sal_uInt16 nPos);
-    inline sal_Bool IsNewSection(sal_uInt16 nPos);
+    inline bool IsPosCumulative(sal_uInt16 nHideLevels);
+    inline bool IsLesserLevel(sal_uInt16 nPos);
+    inline bool IsNewSection(sal_uInt16 nPos);
 
     LwpPara* GetBulletPara();
 
@@ -169,18 +169,18 @@ inline LwpPara* LwpSilverBullet::GetNumberingPara()
 {
     return m_pBulletPara;
 }
-inline sal_Bool LwpSilverBullet::IsPosCumulative(sal_uInt16 nHideLevels)
+inline bool LwpSilverBullet::IsPosCumulative(sal_uInt16 nHideLevels)
 {
     sal_uInt16 AttrMask = ~nHideLevels;
-    return (sal_Bool)((AttrMask & (AttrMask - 1)) != 0);
+    return ((AttrMask & (AttrMask - 1)) != 0);
 }
-inline sal_Bool LwpSilverBullet::IsLesserLevel(sal_uInt16 nPos)
+inline bool LwpSilverBullet::IsLesserLevel(sal_uInt16 nPos)
 {
-    return (sal_Bool)((m_pResetPositionFlags[nPos] & LESSERLEVEL) != 0);
+    return ((m_pResetPositionFlags[nPos] & LESSERLEVEL) != 0);
 }
-inline sal_Bool LwpSilverBullet::IsNewSection(sal_uInt16 nPos)
+inline bool LwpSilverBullet::IsNewSection(sal_uInt16 nPos)
 {
-    return (sal_Bool)((m_pResetPositionFlags[nPos] & NEWSECTION) != 0);
+    return ((m_pResetPositionFlags[nPos] & NEWSECTION) != 0);
 }
 
 #endif
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 8d16d71e65f8..b75599de26a4 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -69,10 +69,10 @@
 
 LwpStory::LwpStory(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpContent(objHdr, pStrm)
-    , m_bPMModified(sal_False)
+    , m_bPMModified(false)
     , m_pCurrentLayout(NULL)
     , m_pTabLayout(NULL)
-    , m_bDropcap(sal_False)
+    , m_bDropcap(false)
     , m_pHyperlinkMgr(new LwpHyperlinkMgr)
     , m_pXFContainer(NULL)
 {
@@ -192,7 +192,7 @@ void LwpStory::SetCurrentLayout(LwpPageLayout *pPageLayout)
         m_pCurrentLayout = pPageLayout;
         m_pTabLayout = pPageLayout;
     }
-    m_bPMModified = sal_True;
+    m_bPMModified = true;
 }
 
 void LwpStory::AddPageLayout(LwpPageLayout * pObject)
@@ -282,16 +282,16 @@ void LwpStory::SortPageLayout()
  * @param:
  * @return:  sal_True if need create a new section
 **************************************************************************/
-sal_Bool LwpStory::IsNeedSection()
+bool LwpStory::IsNeedSection()
 {
-    sal_Bool bColumns = sal_False;
-    sal_Bool bNewSection = sal_False;
+    bool bColumns = false;
+    bool bNewSection = false;
     if(m_pCurrentLayout)
     {
         if(m_pCurrentLayout->HasColumns())
         {
             //get the following pagelayout and its type
-            bColumns = sal_True;
+            bColumns = true;
             LwpPageLayout* pNextLayout = GetNextPageLayout();
             if(pNextLayout)
             {
@@ -302,16 +302,16 @@ sal_Bool LwpStory::IsNeedSection()
                 case LwpLayout::StartWithinColume://not support now
                 case LwpLayout::StartWithinPage:
                 {
-                    bColumns =sal_False;
-                    bNewSection = sal_True;
+                    bColumns =false;
+                    bNewSection = true;
                     break;
                 }
                 case LwpLayout::StartOnNextPage:
                 case LwpLayout::StartOnOddPage://not support now
                 case LwpLayout::StartOnEvenPage://not support now
                 {
-                    bColumns =sal_True;
-                    bNewSection = sal_False;
+                    bColumns =true;
+                    bNewSection = false;
                     break;
                 }
                 default:
@@ -325,7 +325,7 @@ sal_Bool LwpStory::IsNeedSection()
                 m_pCurrentLayout->ResetXFColumns();
             }
         }
-        SetPMModified(sal_False);
+        SetPMModified(false);
     }
     return bNewSection;
 }
@@ -464,7 +464,7 @@ LwpPara* LwpStory::GetLastParaOfPreviousStory()
  * @param:
  * @return:
 **************************************************************************/
-OUString LwpStory::GetContentText(sal_Bool bAllText)
+OUString LwpStory::GetContentText(bool bAllText)
 {
     if (bAllText)//convert all text fribs
     {
@@ -474,7 +474,7 @@ OUString LwpStory::GetContentText(sal_Bool bAllText)
         while (pPara)
         {
             pPara->SetFoundry(m_pFoundry);
-            sText += pPara->GetContentText(sal_True);
+            sText += pPara->GetContentText(true);
             pPara = dynamic_cast<LwpPara*>(pPara->GetNext()->obj());
         }
         return sText;
@@ -519,7 +519,7 @@ OUString LwpStory::RegisterFirstFribStyle()
     return OUString("");
 }
 
-sal_Bool LwpStory::IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos)
+bool LwpStory::IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos)
 {
     std::vector <NamePosPair>::reverse_iterator rIter;
     for (rIter = m_vBulletStyleNameList.rbegin(); rIter != m_vBulletStyleNameList.rend(); ++rIter)
@@ -528,10 +528,10 @@ sal_Bool LwpStory::IsBullStyleUsedBefore(const OUString& rStyleName, const sal_u
         sal_uInt8 nPosition = (*rIter).second;
         if (aName == rStyleName && nPosition == nPos)
         {
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index dd86d728d094..f096e7d8c999 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -84,12 +84,12 @@ private:
     std::vector <NamePosPair> m_vBulletStyleNameList;
 
     // , 02/16/2005
-    sal_Bool m_bPMModified;
+    bool m_bPMModified;
     LwpPageLayout* m_pCurrentLayout;    //for register page layout style
     std::vector<LwpPageLayout*> m_LayoutList;
     LwpLayout* m_pTabLayout;    //for register tab style
 
-    sal_Bool m_bDropcap;
+    bool m_bDropcap;
     LwpHyperlinkMgr* m_pHyperlinkMgr;
     OUString m_CurrSectionName;
 
@@ -112,29 +112,29 @@ public:
      XFContentContainer* GetXFContent();
     void AddXFContent(XFContent* pContent);
 
-    inline sal_Bool GetDropcapFlag();
+    inline bool GetDropcapFlag();
     inline LwpPageLayout* GetCurrentLayout();
     inline LwpMiddleLayout* GetTabLayout();//for register tab style
     inline OUString GetSectionName();
     inline LwpHyperlinkMgr* GetHyperlinkMgr();
 
-    inline sal_Bool IsPMModified();
-    inline void SetPMModified(sal_Bool bPMModified);
-    inline void SetDropcapFlag(sal_Bool bFlag);
+    inline bool IsPMModified();
+    inline void SetPMModified(bool bPMModified);
+    inline void SetDropcapFlag(bool bFlag);
     inline void SetTabLayout(LwpLayout* pLayout);
     inline void SetSectionName(const OUString& StyleName);
 
     void SetCurrentLayout(LwpPageLayout* pPageLayout);
     void AddPageLayout(LwpPageLayout* pObject);
     LwpPageLayout* GetNextPageLayout();
-    sal_Bool IsNeedSection();
+    bool IsNeedSection();
     void SortPageLayout();
 
     LwpPara* GetLastParaOfPreviousStory();
 
-    OUString GetContentText(sal_Bool bAllText = sal_False);//add by ,for CHB,05/5/25
+    OUString GetContentText(bool bAllText = false);//add by ,for CHB,05/5/25
     inline void AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos);
-    sal_Bool IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos);
+    bool IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos);
 
     OUString RegisterFirstFribStyle();
 };
@@ -151,7 +151,7 @@ LwpObjectID* LwpStory::GetLastPara()
 {
     return m_ParaList.GetTail();
 }
-sal_Bool LwpStory::GetDropcapFlag()
+bool LwpStory::GetDropcapFlag()
 {
     return m_bDropcap;
 }
@@ -161,11 +161,11 @@ LwpMiddleLayout* LwpStory::GetTabLayout()
         return m_pTabLayout;
     return static_cast<LwpMiddleLayout*>(GetLayout(NULL));
 }
-void LwpStory::SetPMModified(sal_Bool bPMModified)
+void LwpStory::SetPMModified(bool bPMModified)
 {
     m_bPMModified = bPMModified;
 }
-void LwpStory::SetDropcapFlag(sal_Bool bFlag)
+void LwpStory::SetDropcapFlag(bool bFlag)
 {
     m_bDropcap = bFlag;
 }
@@ -181,7 +181,7 @@ OUString LwpStory::GetSectionName()
 {
     return m_CurrSectionName;
 }
-sal_Bool LwpStory::IsPMModified()
+bool LwpStory::IsPMModified()
 {
     return m_bPMModified;
 }
diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx
index 26eada55e008..4be1075a5400 100644
--- a/lotuswordpro/source/filter/lwptable.cxx
+++ b/lotuswordpro/source/filter/lwptable.cxx
@@ -129,11 +129,11 @@ void LwpTable::Read()
     m_pObjStrm->SkipExtra();
 }
 
-sal_Bool LwpTable::IsNumberDown()
+bool LwpTable::IsNumberDown()
 {
     if (m_nAttributes & NUMBER_DOWN)
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
 void  LwpTable::Parse(IXFStream* /*pOutputStream*/)
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index 79b4485d6314..e421a92227ba 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -125,8 +125,8 @@ public:
     sal_uInt16 GetRow() {return m_nRow;}
     sal_uInt16 GetColumn() {return m_nColumn;}
     LwpTableLayout * GetTableLayout(){return static_cast<LwpTableLayout *>(GetLayout(NULL));}
-    sal_Bool IsNumberDown();
-    virtual sal_Bool IsTable() SAL_OVERRIDE { return sal_True;}
+    bool IsNumberDown();
+    virtual bool IsTable() SAL_OVERRIDE { return true;}
     LwpSuperTableLayout* GetSuperTableLayout();
 protected:
     LwpDLVListHeadTail m_RowCache;
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index eab19697b2c2..0fe5952518da 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -175,20 +175,20 @@ void LwpSuperTableLayout::RegisterNewStyle()
  * @param
  * @return sal_Bool
  */
-sal_Bool LwpSuperTableLayout::IsSizeRightToContent()
+bool LwpSuperTableLayout::IsSizeRightToContent()
 {
     /* Only "with paragraph above" tables can size right to content. */
     if (GetRelativeType() == LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE)
         return LwpPlacableLayout::IsSizeRightToContent();
 
-    return sal_False;
+    return false;
 }
 /**
  * @short   Judge whether table is justifiable, borrowed from Word Pro code
  * @param
  * @return sal_Bool
  */
-sal_Bool LwpSuperTableLayout::IsJustifiable()
+bool LwpSuperTableLayout::IsJustifiable()
 {
     return (GetRelativeType() != LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE || IsSizeRightToContent());
 }
@@ -379,7 +379,7 @@ void  LwpSuperTableLayout::XFConvert(XFContentContainer* pCont)
  * @param
  * @return
  */
-void  LwpSuperTableLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart , sal_Int32 nEnd , sal_Bool bAll)
+void  LwpSuperTableLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart, sal_Int32 nEnd, bool bAll)
 {
     if(m_pFrame)
     {
@@ -851,7 +851,7 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
 
     sal_uInt16 nRowNum = pTmpTable->GetRowCount();
     sal_uInt8* CellMark = new sal_uInt8[nRowNum];
-    sal_Bool bFindFlag = sal_False;
+    bool bFindFlag = false;
 
     if (nRowNum == 1)
     {
@@ -982,7 +982,7 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable,XFTable* pXFTable,
  * @param  pXFTable - pointer of tmp XFtable
  * @param  CellMark - pointer of cell mark array
  */
-sal_Bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMark,
+bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable, sal_uInt8* pCellMark,
             sal_uInt8& nMaxColSpan)
 {
     sal_uInt16 nRowNum = pXFTable->GetRowCount();
@@ -990,7 +990,7 @@ sal_Bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMar
     sal_uInt8 nCellMark=0;
     sal_uInt8 nCount;
     sal_uInt8 nColSpan;
-    sal_Bool bFindFlag = sal_False;
+    bool bFindFlag = false;
     XFRow* pTmpRow;
 
     for(sal_uInt8 i=1;i<=nColNum;i++)
@@ -1010,7 +1010,7 @@ sal_Bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMar
                 if (pCell)
                     nColSpan += static_cast<sal_uInt8>(pCell->GetColSpaned());
                 else
-                    return sal_False;
+                    return false;
             }
             if (nColSpan > nMaxColSpan)
                 nMaxColSpan = nColSpan;
@@ -1046,7 +1046,7 @@ sal_Bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMar
         }
         if (nRowLoop == nRowNum+1)
         {
-            bFindFlag = sal_True;
+            bFindFlag = true;
             return bFindFlag;
         }
 
@@ -1192,7 +1192,7 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
         if ( pXFPara)
         {
             OUString sNumfmt = pCellLayout->GetNumfmtName();
-            sal_Bool bColorMod = sal_False;
+            bool bColorMod = false;
             XFNumberStyle* pNumStyle = NULL;
             XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
             if (!sNumfmt.isEmpty())
@@ -1200,7 +1200,7 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
                 pNumStyle = (XFNumberStyle*)pXFStyleManager->FindStyle( sNumfmt);
                 XFColor aColor = pNumStyle->GetColor();
                 if ( aColor != aNullColor )
-                    bColorMod = sal_True;//end
+                    bColorMod = true;//end
             }
 
             XFParaStyle * pStyle = pXFStyleManager->FindParaStyle(pXFPara->GetStyleName());
@@ -1294,7 +1294,7 @@ void LwpTableLayout::SplitConflictCells()
             continue;
         }
         pRowLayout= iter1->second;
-        if (pRowLayout->GetMergeCellFlag() == sal_False)
+        if (pRowLayout->GetMergeCellFlag() == false)
         {
             i++;
             continue;
@@ -1309,7 +1309,7 @@ void LwpTableLayout::SplitConflictCells()
                     if (iter2 == m_RowsMap.end())
                         continue;
                     pEffectRow = iter2->second;
-                if (pEffectRow->GetMergeCellFlag() == sal_False)
+                if (pEffectRow->GetMergeCellFlag() == false)
                     continue;
                 else
                     pEffectRow->SetCellSplit(nEffectRows);
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index ef72b752ca26..f6dd6acc8be7 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -142,7 +142,7 @@ private:
                 sal_uInt8 nEndCol,sal_uInt16 nRowID);
     void ConvertColumn(XFTable *pXFTable,sal_uInt8 nStartCol,sal_uInt8 nEndCol);
     sal_uInt16 ConvertHeadingRow(XFTable* pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow);
-    sal_Bool  FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMark,sal_uInt8& nMaxColSpan);
+    bool  FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMark,sal_uInt8& nMaxColSpan);
     void SplitRowToCells(XFTable* pTmpTable,XFTable* pXFTable,
                 sal_uInt8 nFirstColSpann,sal_uInt8* pCellMark);
 
@@ -178,14 +178,14 @@ public:
     void ApplyAlignment(XFTableStyle * pTableStyle);
     void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
     // for frame style
-    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
+    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
     void RegisterFrameStyle();
     LwpTableHeadingLayout* GetTableHeadingLayout();
 protected:
     void Read() SAL_OVERRIDE;
     LwpTableLayout* GetTableLayout();
-    sal_Bool IsSizeRightToContent();
-    sal_Bool IsJustifiable();
+    bool IsSizeRightToContent();
+    bool IsJustifiable();
     LwpFrame* m_pFrame;
 
 private:
@@ -204,7 +204,7 @@ public:
     double GetWidth() SAL_OVERRIDE {return LwpTools::ConvertFromUnitsToMetric(cwidth);}
     using LwpVirtualLayout::RegisterStyle;
     void RegisterStyle(double dCalculatedWidth);
-    sal_Bool IsJustifiable(){return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);}
+    bool IsJustifiable(){return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);}
 protected:
     void Read() SAL_OVERRIDE;
     sal_uInt8 ccolid;
diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx
index 7a6e7afbfa89..b9c28e21e5c2 100644
--- a/lotuswordpro/source/filter/lwptaboverride.hxx
+++ b/lotuswordpro/source/filter/lwptaboverride.hxx
@@ -88,7 +88,7 @@ public:
     }
 
     inline LwpObjectID* GetTabRackID();
-    inline sal_Bool IsTabRackOverridden();
+    inline bool IsTabRackOverridden();
     inline void Override(LwpTabOverride* pOther);
     inline void OverrideTabRack(LwpObjectID* pTabRackID);
 
@@ -121,7 +121,7 @@ inline void LwpTabOverride::Override(LwpTabOverride* pOther)
     }
 }
 
-inline sal_Bool LwpTabOverride::IsTabRackOverridden()
+inline bool LwpTabOverride::IsTabRackOverridden()
 {
     return (m_nOverride & TO_TABRACK) != 0;
 }
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index 561020b20f0b..d647ec817afa 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -88,7 +88,7 @@ public:
     virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
     LwpObjectID GetNextID(){return *GetNext();}
     sal_uInt8 GetColumnID(){return cColumn;}
-    virtual sal_Bool IsFormula(){return sal_False;}
+    virtual bool IsFormula(){return false;}
     LwpObjectID GetValueID(){return cValue;}
 
     virtual void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=NULL);
@@ -229,14 +229,14 @@ public:
 
     inline void SetAbsolute(void);
     inline void ClearAbsolute(void);
-    sal_Bool IsAbsolute(void);
+    bool IsAbsolute(void);
 
     inline void SetAfter(void);
     inline void ClearAfter(void);
-    sal_Bool IsAfter(void);
+    bool IsAfter(void);
 
-    void SetBad(sal_Bool Bad);
-    sal_Bool IsBad(void);
+    void SetBad(bool Bad);
+    bool IsBad(void);
 
     void QuickRead(LwpObjectStream *pStrm);
 
@@ -280,19 +280,19 @@ LwpRowColumnQualifier::LwpRowColumnQualifier()
     cFlags = 0;
 }
 
-inline sal_Bool
+inline bool
 LwpRowColumnQualifier::IsAfter()
 {
     return cFlags & REF_AFTER ? sal_True : sal_False;
 }
 
-inline sal_Bool
+inline bool
 LwpRowColumnQualifier::IsBad()
 {
     return cFlags & REF_BAD ? sal_True : sal_False;
 }
 
-inline sal_Bool
+inline bool
 LwpRowColumnQualifier::IsAbsolute()
 {
     return cFlags & REF_ABSOLUTE ? sal_True : sal_False;
@@ -317,14 +317,14 @@ public:
 
     void SetAbsolute(void);
     void ClearAbsolute(void);
-    sal_Bool IsAbsolute(void);
+    bool IsAbsolute(void);
 
     void SetAfter(void);
     void ClearAfter(void);
-    sal_Bool IsAfter(void);
+    bool IsAfter(void);
 
-    void SetBad(sal_Bool Bad);
-    sal_Bool IsBad(void);
+    void SetBad(bool Bad);
+    bool IsBad(void);
     void SetRowDelta(sal_uInt16 ReferenceRowID, sal_uInt16 FormulaRowID);
 
 private:
@@ -365,7 +365,7 @@ LwpRowSpecifier::ClearAbsolute(void)
     cQualifier.ClearAbsolute();
 }
 
-inline sal_Bool
+inline bool
 LwpRowSpecifier::IsAbsolute()
 {
     return cQualifier.IsAbsolute();
@@ -383,19 +383,19 @@ LwpRowSpecifier::ClearAfter(void)
     cQualifier.ClearAfter();
 }
 
-inline sal_Bool
+inline bool
 LwpRowSpecifier::IsAfter()
 {
     return cQualifier.IsAfter();
 }
 
 inline void
-LwpRowSpecifier::SetBad(sal_Bool Bad)
+LwpRowSpecifier::SetBad(bool Bad)
 {
     cQualifier.SetBad(Bad);
 }
 
-inline sal_Bool
+inline bool
 LwpRowSpecifier::IsBad()
 {
     return cQualifier.IsBad();
@@ -420,12 +420,12 @@ public:
     sal_uInt8 ColumnID(sal_uInt8 FormulaColumn);
     void SetAbsolute(void);
     void ClearAbsolute(void);
-    sal_Bool IsAbsolute(void);
+    bool IsAbsolute(void);
     void SetAfter(void);
     void ClearAfter(void);
-    sal_Bool IsAfter(void);
-    void SetBad(sal_Bool Bad);
-    sal_Bool IsBad(void);
+    bool IsAfter(void);
+    void SetBad(bool Bad);
+    bool IsBad(void);
     void SetColumnDelta(sal_uInt8 ReferenceColumnID, sal_uInt8 FormulaColumnID);
 
 private:
@@ -459,7 +459,7 @@ LwpColumnSpecifier::ClearAbsolute(void)
     cQualifier.ClearAbsolute();
 }
 
-inline sal_Bool
+inline bool
 LwpColumnSpecifier::IsAbsolute()
 {
     return cQualifier.IsAbsolute();
@@ -477,19 +477,19 @@ LwpColumnSpecifier::ClearAfter(void)
     cQualifier.ClearAfter();
 }
 
-inline sal_Bool
+inline bool
 LwpColumnSpecifier::IsAfter()
 {
     return cQualifier.IsAfter();
 }
 
 inline void
-LwpColumnSpecifier::SetBad(sal_Bool Bad)
+LwpColumnSpecifier::SetBad(bool Bad)
 {
     cQualifier.SetBad(Bad);
 }
 
-inline sal_Bool
+inline bool
 LwpColumnSpecifier::IsBad()
 {
     return cQualifier.IsBad();
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 84e69a3dcd0f..ae55778833dd 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -78,7 +78,7 @@ LwpFormulaArg::~LwpFormulaArg()
 
  LwpFormulaInfo::LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpCellList(objHdr, pStrm)
-    , m_bSupported(sal_True)
+    , m_bSupported(true)
     , m_nFormulaRow(0)
 {}
 
@@ -104,13 +104,13 @@ LwpFormulaInfo::~LwpFormulaInfo()
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool LwpFormulaInfo::ReadConst()
+bool LwpFormulaInfo::ReadConst()
 {
     double Constant = m_pObjStrm->QuickReadDouble();
 
     m_aStack.push_back( new LwpFormulaConst(Constant) );
 
-    return sal_True;
+    return true;
 }
 /**
 *   Need more effort for unicode.
@@ -119,7 +119,7 @@ sal_Bool LwpFormulaInfo::ReadConst()
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool LwpFormulaInfo::ReadText()
+bool LwpFormulaInfo::ReadText()
 {
     m_pObjStrm->QuickReadInt16(); //Disk Size
     sal_uInt16 nStrLen = m_pObjStrm->QuickReadInt16();
@@ -133,7 +133,7 @@ sal_Bool LwpFormulaInfo::ReadText()
     aText += "\"";
 
     m_aStack.push_back(new LwpFormulaText(aText));
-    return sal_True;
+    return true;
 }
 /**
 *
@@ -142,11 +142,11 @@ sal_Bool LwpFormulaInfo::ReadText()
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool LwpFormulaInfo::ReadCellID()
+bool LwpFormulaInfo::ReadCellID()
 {
     LwpRowSpecifier RowSpecifier;
     LwpColumnSpecifier ColumnSpecifier;
-    sal_Bool readSucceeded = true;
+    bool readSucceeded = true;
 
     RowSpecifier.QuickRead(m_pObjStrm);
     ColumnSpecifier.QuickRead(m_pObjStrm);
@@ -162,9 +162,9 @@ sal_Bool LwpFormulaInfo::ReadCellID()
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool LwpFormulaInfo::ReadCellRange()
+bool LwpFormulaInfo::ReadCellRange()
 {
-    sal_Bool readSucceeded = sal_True;
+    bool readSucceeded = true;
     if (!ReadCellID( )) // start
         readSucceeded = false;
     LwpFormulaCellAddr* pStartCellAddr = (LwpFormulaCellAddr*)m_aStack.back();
@@ -192,10 +192,10 @@ sal_Bool LwpFormulaInfo::ReadCellRange()
 *   @param
 *   @return sal_Bool.
 */
-sal_Bool LwpFormulaInfo::ReadExpression()
+bool LwpFormulaInfo::ReadExpression()
 {
     sal_uInt16 TokenType, DiskLength;
-    sal_Bool readSucceeded = sal_True;
+    bool readSucceeded = true;
 
     /* Read the compiled expression length */
 //  Len = m_pObjStrm->QuickReaduInt16();
@@ -216,7 +216,7 @@ sal_Bool LwpFormulaInfo::ReadExpression()
 
             case TK_CELLID:
                 if (!ReadCellID())
-                    readSucceeded = sal_False;
+                    readSucceeded = false;
                 break;
 
             case TK_CELLRANGE:
@@ -232,7 +232,7 @@ sal_Bool LwpFormulaInfo::ReadExpression()
                 {
                     LwpFormulaFunc* pFunc = new LwpFormulaFunc(TokenType);
                     if (!ReadArguments(*pFunc))
-                        readSucceeded = sal_False;
+                        readSucceeded = false;
                     m_aStack.push_back(pFunc);
                 }
                 break;
@@ -269,7 +269,7 @@ sal_Bool LwpFormulaInfo::ReadExpression()
             default:
                 // We don't know what to do with this token, so eat it.
                 m_pObjStrm->SeekRel(DiskLength);
-                readSucceeded = sal_False;
+                readSucceeded = false;
                 break;
         }
         MarkUnsupported(TokenType);
@@ -292,7 +292,7 @@ void LwpFormulaInfo::MarkUnsupported(sal_uInt16 TokenType)
     case TK_COUNT:
     case TK_NOT:
         {
-            m_bSupported = sal_False;//Not supported formulas
+            m_bSupported = false;//Not supported formulas
         }
         break;
     default:
@@ -305,19 +305,19 @@ void LwpFormulaInfo::MarkUnsupported(sal_uInt16 TokenType)
 *   @param  LwpFormulaFunc& aFunc, functions object
 *   @return sal_Bool.
 */
-sal_Bool LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
+bool LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
 {
     sal_uInt16 NumberOfArguments = m_pObjStrm->QuickReaduInt16();
     sal_uInt16 ArgumentDiskLength, Count;
     sal_uInt8 ArgumentType;
-    sal_Bool bArgument = sal_False;
-    sal_Bool readSucceeded = sal_True;
+    bool bArgument = false;
+    bool readSucceeded = true;
 
     for (Count = 0; Count < NumberOfArguments; Count++)
     {
         ArgumentType = (sal_uInt8) m_pObjStrm->QuickReaduInt16(); // written as lushort
         ArgumentDiskLength = m_pObjStrm->QuickReaduInt16();
-        bArgument = sal_True;
+        bArgument = true;
 
         switch(ArgumentType)
         {
@@ -342,9 +342,9 @@ sal_Bool LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
                 break;
 
             default:
-                bArgument = sal_False;
+                bArgument = false;
                 m_pObjStrm->SeekRel(ArgumentDiskLength);
-                readSucceeded = sal_False;
+                readSucceeded = false;
                 break;
         }
 
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index cc467a6cc045..de39862915ef 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -201,21 +201,21 @@ class LwpFormulaInfo : public LwpCellList
 public:
     LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFormulaInfo();
-    sal_Bool IsFormula() SAL_OVERRIDE {return sal_True;}
+    bool IsFormula() SAL_OVERRIDE {return true;}
     void SetRow(sal_uInt16 nRow){ m_nFormulaRow = nRow;}
     OUString Convert(LwpTableLayout* pCellsMap);
     void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) SAL_OVERRIDE;
 protected:
     void Read() SAL_OVERRIDE;
-    sal_Bool ReadCellID();
-    sal_Bool ReadText();
-    sal_Bool ReadCellRange();
-    sal_Bool ReadExpression();
-    sal_Bool ReadArguments(LwpFormulaFunc& aFunc);
-    sal_Bool m_bSupported;
+    bool ReadCellID();
+    bool ReadText();
+    bool ReadCellRange();
+    bool ReadExpression();
+    bool ReadArguments(LwpFormulaFunc& aFunc);
+    bool m_bSupported;
 private:
     vector<LwpFormulaArg*> m_aStack;
-    sal_Bool ReadConst();
+    bool ReadConst();
     void MarkUnsupported(sal_uInt16 TokenType);
 
     sal_uInt16 m_nFormulaRow;
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index f9560961e89b..980802332183 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -146,7 +146,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
 {
     XFIndex* pToc = new XFIndex();
 
-    pToc->SetProtected(sal_False);
+    pToc->SetProtected(false);
     pToc->SetIndexType(enumXFIndexTOC);
 
     // add TOC template
@@ -162,7 +162,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
             continue;
         }
 
-        sal_Bool bInserted = sal_False;
+        bool bInserted = false;
         do
         {
             // One level has 1 template
@@ -225,7 +225,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
                 }
 
                 pToc->AddTemplate(OUString::number((sal_Int32)i),  m_pFoundry->FindActuralStyleName(pLevel->GetSearchStyle()), pTemplate);
-                bInserted = sal_True;
+                bInserted = true;
             }
 
             // 1 style in WordPro may be mapped to several styles in SODC
@@ -253,7 +253,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
  * @param pCont -
  * @return
  */
-void  LwpTocSuperLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart , sal_Int32 nEnd , sal_Bool bAll)
+void  LwpTocSuperLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart, sal_Int32 nEnd, bool bAll)
 {
     if(m_pFrame)
     {
@@ -334,22 +334,22 @@ void LwpTocSuperLayout::AddSourceStyle(XFIndex* pToc, LwpTocLevelData * pLevel,
  * @param  index - TOC level
  * @return sal_Bool
  */
-sal_Bool LwpTocSuperLayout::GetRightAlignPageNumber(sal_uInt16 index)
+bool LwpTocSuperLayout::GetRightAlignPageNumber(sal_uInt16 index)
 {
     if (index < MAX_LEVELS)
         return (m_nFlags[index] & TS_RIGHTALIGN) ? sal_True : sal_False;
-    return sal_False;
+    return false;
 }
 /**
  * @short   Get whether page number is used in TOC entries
  * @param  index - TOC level
  * @return sal_Bool
  */
-sal_Bool LwpTocSuperLayout::GetUsePageNumber(sal_uInt16 index)
+bool LwpTocSuperLayout::GetUsePageNumber(sal_uInt16 index)
 {
     if (index < MAX_LEVELS)
         return (m_nFlags[index] & TS_PAGENUMBER) ? sal_True : sal_False;
-    return sal_False;
+    return false;
 }
 /**
  * @short   Get what is used for separater
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index 4d3a792a3d15..00ae8ffaca23 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -78,11 +78,11 @@ public:
     void RegisterStyle() SAL_OVERRIDE;
     virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
     virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TOC_SUPERTABLE_LAYOUT;}
-    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
+    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
 protected:
     void Read() SAL_OVERRIDE;
-    sal_Bool GetRightAlignPageNumber(sal_uInt16 index);
-    sal_Bool GetUsePageNumber(sal_uInt16 index);
+    bool GetRightAlignPageNumber(sal_uInt16 index);
+    bool GetUsePageNumber(sal_uInt16 index);
     sal_uInt16 GetSeparatorType(sal_uInt16 index);
     LwpTocLevelData * GetSearchLevelPtr(sal_uInt16 index);
     LwpTocLevelData * GetNextSearchLevelPtr(sal_uInt16 index, LwpTocLevelData * pCurData);
@@ -154,9 +154,9 @@ public:
     void RegisterStyle() SAL_OVERRIDE;
     virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
     inline sal_uInt16 GetLevel(void){return m_nLevel;}
-    inline sal_Bool GetUseText(void){   return (m_nFlags & USETEXT) ? sal_True : sal_False;}
+    inline bool GetUseText(void){   return (m_nFlags & USETEXT) ? sal_True : sal_False;}
     inline OUString GetSearchStyle(void){return m_SearchName.str();}
-    inline sal_Bool GetUseLeadingText(void){    return (m_nFlags & USENUMBER) ? sal_True : sal_False;}
+    inline bool GetUseLeadingText(void){    return (m_nFlags & USENUMBER) ? sal_True : sal_False;}
 private:
     sal_uInt16 m_nFlags;
     sal_uInt16 m_nLevel;
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index ce391441883a..897a913b0735 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -119,7 +119,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm,
         sal_uInt8 readbyte;
         sal_uInt16 readword;
 
-        sal_Bool flag = sal_False;  //switch if unicode part reached
+        bool flag = false;  //switch if unicode part reached
         sal_uInt16 sublen = 0;
 
         while(readLen<strlen)
@@ -133,7 +133,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm,
 
                 if(readbyte == 0x00)
                 {
-                    flag = sal_True;
+                    flag = true;
                     if(sublen>0)    //add it to the strBuf
                     {
                         strBuf.append( OUString(buf, sublen, aEncoding) ); //try the aEncoding
@@ -159,7 +159,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm,
 
                 if(readword == 0x0000)
                 {
-                    flag = sal_False;
+                    flag = false;
                     if(sublen)
                     {
                         unibuf[sublen] = '\0';
@@ -187,7 +187,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm,
 /**
  * @descr       Judge if the data (len) in object stream is lwp unicode packed
 */
-sal_Bool LwpTools::IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len)
+bool LwpTools::IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len)
 {
     sal_uInt8 byte;
     sal_uInt16 oldpos = pObjStrm->GetPos();
@@ -198,18 +198,18 @@ sal_Bool LwpTools::IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len)
         if (byte == 0x00)
         {
             pObjStrm->Seek(oldpos);
-            return sal_True;
+            return true;
         }
     }
     pObjStrm->Seek(oldpos);
-    return sal_False;
+    return false;
 }
 
-sal_Bool LwpTools::isFileUrl(const OString &fileName)
+bool LwpTools::isFileUrl(const OString &fileName)
 {
     if (fileName.startsWith("file://") )
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
 OUString LwpTools::convertToFileUrl(const OString &fileName)
@@ -245,7 +245,7 @@ OUString LwpTools::DateTimeToOUString(LtTm & dt)
 /**
  * @descr   get the system date format
 */
-XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
+XFDateStyle* LwpTools::GetSystemDateStyle(bool bLongFormat)
 {
     icu::DateFormat::EStyle style;
     if (bLongFormat)
@@ -314,7 +314,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j <= 2)
-                    pDateStyle->AddYear(sal_False);
+                    pDateStyle->AddYear(false);
                 else
                     pDateStyle->AddYear();
                 break;
@@ -331,13 +331,13 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j==1)
-                    pDateStyle->AddMonth(sal_False,sal_False);
+                    pDateStyle->AddMonth(false,false);
                 else if (j==2)
-                    pDateStyle->AddMonth(sal_True,sal_False);
+                    pDateStyle->AddMonth(true,false);
                 else if (j==3)
-                    pDateStyle->AddMonth(sal_False,sal_True);
+                    pDateStyle->AddMonth(false,true);
                 else
-                    pDateStyle->AddMonth(sal_True,sal_True);
+                    pDateStyle->AddMonth(true,true);
                 break;
             }
             case 'd':
@@ -352,7 +352,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j==1)
-                    pDateStyle->AddMonthDay(sal_False);
+                    pDateStyle->AddMonthDay(false);
                 else
                     pDateStyle->AddMonthDay();
                 break;
@@ -369,7 +369,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j==1)
-                    pDateStyle->AddHour(sal_False);
+                    pDateStyle->AddHour(false);
                 else
                     pDateStyle->AddHour();
                 break;
@@ -386,7 +386,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j==1)
-                    pDateStyle->AddHour(sal_False);
+                    pDateStyle->AddHour(false);
                 else
                     pDateStyle->AddHour();
                 break;
@@ -403,7 +403,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j==1)
-                    pDateStyle->AddMinute(sal_False);
+                    pDateStyle->AddMinute(false);
                 else
                     pDateStyle->AddMinute();
                 break;
@@ -420,9 +420,9 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j==1)
-                    pDateStyle->AddSecond(sal_False,0);
+                    pDateStyle->AddSecond(false,0);
                 else
-                    pDateStyle->AddSecond(sal_True,0);
+                    pDateStyle->AddSecond(true,0);
                 break;
             }
             case 'S':
@@ -454,7 +454,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j<=2)
-                    pDateStyle->AddWeekDay(sal_False);
+                    pDateStyle->AddWeekDay(false);
                 else
                     pDateStyle->AddWeekDay();
                 break;
@@ -538,7 +538,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                         break;
                     }
                 }
-                pDateStyle->AddAmPm(sal_True);
+                pDateStyle->AddAmPm(true);
                 break;
             }
             case 'k':
@@ -566,7 +566,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
                     }
                 }
                 if (j==1)
-                    pDateStyle->AddHour(sal_False);
+                    pDateStyle->AddHour(false);
                 else
                     pDateStyle->AddHour();
                 break;
@@ -687,7 +687,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
                     }
                 }
                 if (j==1)
-                    pTimeStyle->AddHour(sal_False);
+                    pTimeStyle->AddHour(false);
                 else
                     pTimeStyle->AddHour();
                 break;
@@ -704,7 +704,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
                     }
                 }
                 if (j==1)
-                    pTimeStyle->AddHour(sal_False);
+                    pTimeStyle->AddHour(false);
                 else
                     pTimeStyle->AddHour();
                 break;
@@ -721,7 +721,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
                     }
                 }
                 if (j==1)
-                    pTimeStyle->AddMinute(sal_False);
+                    pTimeStyle->AddMinute(false);
                 else
                     pTimeStyle->AddMinute();
                 break;
@@ -738,9 +738,9 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
                     }
                 }
                 if (j==1)
-                    pTimeStyle->AddSecond(sal_False,0);
+                    pTimeStyle->AddSecond(false,0);
                 else
-                    pTimeStyle->AddSecond(sal_True,0);
+                    pTimeStyle->AddSecond(true,0);
                 break;
             }
             case 'S':
@@ -771,7 +771,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
                         break;
                     }
                 }
-                pTimeStyle->SetAmPm(sal_True);
+                pTimeStyle->SetAmPm(true);
                 break;
             }
             case 'k':
@@ -799,7 +799,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
                     }
                 }
                 if (j==1)
-                    pTimeStyle->AddHour(sal_False);
+                    pTimeStyle->AddHour(false);
                 else
                     pTimeStyle->AddHour();
                 break;
diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx
index cad9a81a6bd8..51680bda1eb2 100644
--- a/lotuswordpro/source/filter/lwptools.hxx
+++ b/lotuswordpro/source/filter/lwptools.hxx
@@ -92,7 +92,7 @@ class LwpTools
 public:
     static sal_uInt16 QuickReadUnicode( LwpObjectStream* pObjStrm,
         OUString& str, sal_uInt16 strlen,  rtl_TextEncoding aEncoding );
-    static sal_Bool IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len);
+    static bool IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len);
 
     inline static double ConvertFromUnits(const sal_Int32& nUnits);
     inline static double ConvertToMetric(const double& fInch);
@@ -101,14 +101,14 @@ public:
 
     inline static sal_Int32 ConvertToUnits(const double& fInch);
 
-    inline static sal_Bool IsOddNumber(sal_uInt16& nNumber);
-    inline static sal_Bool IsEvenNumber(sal_uInt16& nNumber);
+    inline static bool IsOddNumber(sal_uInt16& nNumber);
+    inline static bool IsEvenNumber(sal_uInt16& nNumber);
 
-    static sal_Bool isFileUrl(const OString& fileName);
+    static bool isFileUrl(const OString& fileName);
     static OUString convertToFileUrl(const OString& fileName);
     static OUString    DateTimeToOUString(LtTm& dt);
 
-    static XFDateStyle* GetSystemDateStyle(sal_Bool bLongFormat);
+    static XFDateStyle* GetSystemDateStyle(bool bLongFormat);
     static XFTimeStyle* GetSystemTimeStyle();
 };
 
@@ -133,11 +133,11 @@ inline sal_Int32 LwpTools::ConvertToUnits(const double& fInch)
 {
     return (sal_Int32)fInch*UNITS_PER_INCH;
 }
-inline sal_Bool LwpTools::IsOddNumber(sal_uInt16& nNumber)
+inline bool LwpTools::IsOddNumber(sal_uInt16& nNumber)
 {
     return (nNumber%2)? sal_True : sal_False;
 }
-inline sal_Bool LwpTools::IsEvenNumber(sal_uInt16& nNumber)
+inline bool LwpTools::IsEvenNumber(sal_uInt16& nNumber)
 {
     return (nNumber%2)? sal_False : sal_True;
 }
diff --git a/lotuswordpro/source/filter/lwpusewhen.hxx b/lotuswordpro/source/filter/lwpusewhen.hxx
index 61b8c00c6048..ba6698a46808 100644
--- a/lotuswordpro/source/filter/lwpusewhen.hxx
+++ b/lotuswordpro/source/filter/lwpusewhen.hxx
@@ -92,16 +92,16 @@ public:
 
     inline void Read(LwpObjectStream* pStrm);
 
-    inline sal_Bool IsUseOnAllPages();
-    inline sal_Bool IsUseOnAllEvenPages();
-    inline sal_Bool IsUseOnAllOddPages();
-    inline sal_Bool IsUseOnPage();
+    inline bool IsUseOnAllPages();
+    inline bool IsUseOnAllEvenPages();
+    inline bool IsUseOnAllOddPages();
+    inline bool IsUseOnPage();
 
-    inline sal_Bool IsStartOnThisPage();
-    inline sal_Bool IsStartOnNextPage();
-    inline sal_Bool IsStartOnNextEvenPage();
-    inline sal_Bool IsStartOnNextOddPage();
-    inline sal_Bool IsStartOnThisHF();
+    inline bool IsStartOnThisPage();
+    inline bool IsStartOnNextPage();
+    inline bool IsStartOnNextEvenPage();
+    inline bool IsStartOnNextOddPage();
+    inline bool IsStartOnThisHF();
 
     inline sal_uInt16 GetUsePage();
 private:
@@ -115,47 +115,47 @@ inline void LwpUseWhen::Read(LwpObjectStream* pStrm)
     m_nUsePage = pStrm->QuickReaduInt16();
     pStrm->SkipExtra();
 }
-inline sal_Bool LwpUseWhen::IsUseOnAllPages()
+inline bool LwpUseWhen::IsUseOnAllPages()
 {
-    return (sal_Bool)((m_nFlags & STYLE_USEONALLPAGES) != 0);
+    return ((m_nFlags & STYLE_USEONALLPAGES) != 0);
 }
-inline sal_Bool LwpUseWhen::IsUseOnAllEvenPages()
+inline bool LwpUseWhen::IsUseOnAllEvenPages()
 {
-    return (sal_Bool)((m_nFlags & STYLE_USEONALLEVENPAGES) != 0);
+    return ((m_nFlags & STYLE_USEONALLEVENPAGES) != 0);
 }
-inline sal_Bool LwpUseWhen::IsUseOnAllOddPages()
+inline bool LwpUseWhen::IsUseOnAllOddPages()
 {
-    return (sal_Bool)((m_nFlags & STYLE_USEONALLODDPAGES) != 0);
+    return ((m_nFlags & STYLE_USEONALLODDPAGES) != 0);
 }
 
-inline sal_Bool LwpUseWhen::IsUseOnPage()
+inline bool LwpUseWhen::IsUseOnPage()
 {
-    return (sal_Bool)((m_nFlags & STYLE_USEONTHISPAGE) != 0);
+    return ((m_nFlags & STYLE_USEONTHISPAGE) != 0);
 }
 
-inline sal_Bool LwpUseWhen::IsStartOnThisPage()
+inline bool LwpUseWhen::IsStartOnThisPage()
 {
-    return (sal_Bool)((m_nFlags & STYLE_STARTONTHISPAGE) != 0);
+    return ((m_nFlags & STYLE_STARTONTHISPAGE) != 0);
 }
 
-inline sal_Bool LwpUseWhen::IsStartOnNextPage()
+inline bool LwpUseWhen::IsStartOnNextPage()
 {
-    return (sal_Bool)((m_nFlags & STYLE_STARTONMASK) == 0);
+    return ((m_nFlags & STYLE_STARTONMASK) == 0);
 }
 
-inline sal_Bool LwpUseWhen::IsStartOnNextOddPage()
+inline bool LwpUseWhen::IsStartOnNextOddPage()
 {
-    return (sal_Bool)((m_nFlags & STYLE_STARTONNEXTODD) != 0);
+    return ((m_nFlags & STYLE_STARTONNEXTODD) != 0);
 }
 
-inline sal_Bool LwpUseWhen::IsStartOnNextEvenPage()
+inline bool LwpUseWhen::IsStartOnNextEvenPage()
 {
-    return (sal_Bool)((m_nFlags & STYLE_STARTONNEXTEVEN) != 0);
+    return ((m_nFlags & STYLE_STARTONNEXTEVEN) != 0);
 }
 
-inline sal_Bool LwpUseWhen::IsStartOnThisHF()
+inline bool LwpUseWhen::IsStartOnThisHF()
 {
-    return (sal_Bool)((m_nFlags & STYLE_STARTONTHISHF) != 0);
+    return ((m_nFlags & STYLE_STARTONTHISHF) != 0);
 }
 
 inline sal_uInt16 LwpUseWhen::GetUsePage()
diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
index c8c8d3fe5ff6..eb2dcf184ba1 100644
--- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
@@ -102,7 +102,7 @@ public:
      * @param:  pStyle the style to be compared.
      * @return: return sal_True if equals,else sal_False.
      */
-    virtual sal_Bool    Equal(IXFStyle *pStyle) = 0;
+    virtual bool    Equal(IXFStyle *pStyle) = 0;
 
 };
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index 1f0f7c5d6cee..eab7984d8ed1 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -62,10 +62,10 @@
 
 XFBGImage::XFBGImage()
 {
-    m_bUserFileLink = sal_False;
-    m_bRepeate = sal_False;
-    m_bStretch = sal_False;
-    m_bPosition = sal_True;
+    m_bUserFileLink = false;
+    m_bRepeate = false;
+    m_bStretch = false;
+    m_bPosition = true;
     m_eHoriAlign = enumXFAlignCenter;
     m_eVertAlign = enumXFAlignCenter;
 }
@@ -73,12 +73,12 @@ XFBGImage::XFBGImage()
 void XFBGImage::SetImageData(sal_uInt8 *buf, int len)
 {
     m_strData = XFBase64::Encode(buf,len);
-    m_bUserFileLink = sal_False;
+    m_bUserFileLink = false;
 }
 
-sal_Bool    XFBGImage::Equal(IXFStyle * /* pStyle */)
+bool    XFBGImage::Equal(IXFStyle * /* pStyle */)
 {
-    return sal_False;
+    return false;
 }
 
 void    XFBGImage::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
index 2a78366e90d4..d0564bbb0c42 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
@@ -101,7 +101,7 @@ public:
      * @descr   decide whether there has been a style that is the same as this object.
      *          If it use base64 stream, i'll simply return sal_False because it's too slow to compare two base64 stream.
      */
-    virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
 
     virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
@@ -110,10 +110,10 @@ public:
 private:
     OUString   m_strFileName;
     OUString   m_strData;
-    sal_Bool    m_bUserFileLink;
-    sal_Bool    m_bRepeate;
-    sal_Bool    m_bStretch;
-    sal_Bool    m_bPosition;
+    bool       m_bUserFileLink;
+    bool       m_bRepeate;
+    bool       m_bStretch;
+    bool       m_bPosition;
     enumXFAlignType m_eHoriAlign;
     enumXFAlignType m_eVertAlign;
 };
@@ -121,31 +121,31 @@ private:
 inline void XFBGImage::SetFileLink(const OUString& fileName)
 {
     m_strFileName = fileName;
-    m_bUserFileLink = sal_True;
+    m_bUserFileLink = true;
 }
 
 inline void XFBGImage::SetPosition(enumXFAlignType horiAlign, enumXFAlignType vertAlign)
 {
-    m_bPosition = sal_True;
+    m_bPosition = true;
     m_eHoriAlign = horiAlign;
     m_eVertAlign = vertAlign;
 
-    m_bStretch = sal_False;
-    m_bRepeate = sal_False;
+    m_bStretch = false;
+    m_bRepeate = false;
 }
 
 inline void XFBGImage::SetRepeate()
 {
-    m_bRepeate = sal_True;
-    m_bStretch = sal_False;
-    m_bPosition = sal_False;
+    m_bRepeate = true;
+    m_bStretch = false;
+    m_bPosition = false;
 }
 
 inline void XFBGImage::SetStretch()
 {
-    m_bStretch = sal_True;
-    m_bRepeate = sal_False;
-    m_bPosition = sal_False;
+    m_bStretch = true;
+    m_bRepeate = false;
+    m_bPosition = false;
 }
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
index da9516703b88..6b8aabc62972 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
@@ -69,7 +69,7 @@
 class XFBookmark : public XFContent
 {
 public:
-    XFBookmark(sal_Bool isStart)
+    XFBookmark(bool isStart)
     {
         m_bStart = isStart;
     }
@@ -106,7 +106,7 @@ public:
     }
 
 private:
-    sal_Bool    m_bStart;
+    bool    m_bStart;
     OUString m_strName;
     OUString m_strDivision;
 };
@@ -114,13 +114,13 @@ private:
 class XFBookmarkStart : public XFBookmark
 {
 public:
-    XFBookmarkStart():XFBookmark(sal_True){}
+    XFBookmarkStart():XFBookmark(true){}
 };
 
 class XFBookmarkEnd : public XFBookmark
 {
 public:
-    XFBookmarkEnd():XFBookmark(sal_False){}
+    XFBookmarkEnd():XFBookmark(false){}
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index d78760fbf46b..ec406b949ac2 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -62,8 +62,8 @@
 XFBorder::XFBorder()
 {
     m_fOffset = 0;
-    m_bDouble = sal_False;
-    m_bSameWidth = sal_False;
+    m_bDouble = false;
+    m_bSameWidth = false;
     m_fWidthInner = 0;
     m_fWidthSpace = 0;
     m_fWidthOuter = 0;
@@ -79,7 +79,7 @@ void    XFBorder::SetWidth(double width)
     if( !m_bDouble )
     {
         m_fWidthInner = width;
-        m_bSameWidth = sal_True;
+        m_bSameWidth = true;
     }
     else if( m_bDouble && m_bSameWidth )
     {
@@ -89,7 +89,7 @@ void    XFBorder::SetWidth(double width)
     }
 }
 
-void    XFBorder::SetDoubleLine(sal_Bool dual,sal_Bool bSameWidth)
+void    XFBorder::SetDoubleLine(bool dual,bool bSameWidth)
 {
     m_bDouble = dual;
     m_bSameWidth = bSameWidth;
@@ -227,7 +227,7 @@ void    XFBorders::SetWidth(enumXFBorder side, double width)
     }
 }
 
-void    XFBorders::SetDoubleLine(enumXFBorder side, sal_Bool dual,sal_Bool bSameWidth)
+void    XFBorders::SetDoubleLine(enumXFBorder side, bool dual,bool bSameWidth)
 {
     switch(side)
     {
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx
index 8080a8dcd329..dd718422cbee 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx
@@ -86,7 +86,7 @@ public:
     /**
      * @descr   Set whether the border has double line.
      */
-    void        SetDoubleLine(sal_Bool dual,sal_Bool bSameWidth);
+    void        SetDoubleLine(bool dual,bool bSameWidth);
 
     /**
      * @descr   Set inner line width for border with double line.
@@ -118,8 +118,8 @@ private:
 private:
     double      m_fOffset;
     XFColor     m_aColor;
-    sal_Bool    m_bDouble;
-    sal_Bool    m_bSameWidth;
+    bool    m_bDouble;
+    bool    m_bSameWidth;
     double      m_fWidthInner;
     double      m_fWidthSpace;
     double      m_fWidthOuter;
@@ -150,7 +150,7 @@ public:
      * @descr   Set border side as doubel line.
      * @param   bSameWidth whether two borders are same width.
      */
-    void    SetDoubleLine(enumXFBorder side, sal_Bool dual,sal_Bool bSameWidth);
+    void    SetDoubleLine(enumXFBorder side, bool dual,bool bSameWidth);
 
     /**
      * @descr   Set inner border with of border side.
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 0d7d9a2d1e77..eefd6945000b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -70,7 +70,7 @@ XFCell::XFCell()
     m_nColSpaned = 1;
     m_nRepeated = 0;
     m_eValueType = enumXFValueTypeNone;
-    m_bProtect = sal_False;
+    m_bProtect = false;
 }
 
 XFCell::XFCell(const XFCell& other) : XFContentContainer(other)
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index ed983c75ae32..7cf0567c0940 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -118,7 +118,7 @@ public:
     /**
      * @descr   Set cell protected.
      */
-    void    SetProtect(sal_Bool protect=sal_True);
+    void    SetProtect(bool protect=true);
 
     /**
      * @descr   Set cell column id.
@@ -170,7 +170,7 @@ private:
     OUString   m_strValue;
     OUString   m_strDisplay;
     OUString   m_strFormula;
-    sal_Bool    m_bProtect;
+    bool    m_bProtect;
 };
 
 inline void XFCell::SetColumnSpaned(sal_Int32 num)
@@ -188,7 +188,7 @@ inline void XFCell::SetFormula(const OUString& formula)
     m_strFormula = formula;
 }
 
-inline void XFCell::SetProtect(sal_Bool protect/* =sal_True */)
+inline void XFCell::SetProtect(bool protect/* =sal_True */)
 {
     m_bProtect = protect;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index 95c1664944f5..f5b8d1980d0b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -70,7 +70,7 @@ XFCellStyle::XFCellStyle()
     m_pBorders = NULL;
     m_pFont = NULL;
     m_pBackImage = NULL;
-    m_bWrapText = sal_False;
+    m_bWrapText = false;
 }
 
 XFCellStyle::~XFCellStyle()
@@ -118,84 +118,84 @@ enumXFStyle XFCellStyle::GetStyleFamily()
 /**
  *Affirm whether two XFCellStyle objects are equal.
  */
-sal_Bool    XFCellStyle::Equal(IXFStyle *pStyle)
+bool    XFCellStyle::Equal(IXFStyle *pStyle)
 {
     if( this == pStyle )
-        return sal_True;
+        return true;
     if( !pStyle || pStyle->GetStyleFamily() != enumXFStyleTableCell )
-        return sal_False;
+        return false;
 
     XFCellStyle *pOther = static_cast<XFCellStyle*>(pStyle);
     if( !pOther )
-        return sal_False;
+        return false;
 
     if( m_strDataStyle != pOther->m_strDataStyle )
-        return sal_False;
+        return false;
 
     if( m_strParentStyleName != pOther->m_strParentStyleName )
-        return sal_False;
+        return false;
     if( m_fTextIndent != pOther->m_fTextIndent )
-        return sal_False;
+        return false;
 
     //align:
     if( m_eHoriAlign != pOther->m_eHoriAlign )
-        return sal_False;
+        return false;
     if( m_eVertAlign != pOther->m_eVertAlign )
-        return sal_False;
+        return false;
 
     if( m_aBackColor != pOther->m_aBackColor )
-        return sal_False;
+        return false;
     //shadow:
     if( m_aShadow != pOther->m_aShadow )
-        return sal_False;
+        return false;
     //margin:
     if( m_aMargin != pOther->m_aMargin )
-        return sal_False;
+        return false;
     //padding:
     if( m_aPadding != pOther->m_aPadding )
-        return sal_False;
+        return false;
 
     //wrap:
     if( m_bWrapText != pOther->m_bWrapText )
-        return sal_False;
+        return false;
 
     //font:
     if( m_pFont )
     {
         if( !pOther->m_pFont )
-            return sal_False;
+            return false;
         if(*m_pFont != *pOther->m_pFont )
-            return sal_False;
+            return false;
     }
     else if( pOther->m_pFont )
-        return sal_False;
+        return false;
 
     //border:
     if( m_pBorders )
     {
         if( !pOther->m_pBorders )
-            return sal_False;
+            return false;
         if( *m_pBorders != *pOther->m_pBorders )
-            return sal_False;
+            return false;
     }
     else if( pOther->m_pBorders )
-        return sal_False;
+        return false;
 
     //if there is backimage
     if( m_pBackImage )
     {
         if( !pOther->m_pBackImage )
-            return sal_False;
+            return false;
         if( !m_pBackImage->Equal(pOther) )
-            return sal_False;
+            return false;
     }
     else
     {
         if( pOther->m_pBackImage )
-            return sal_False;
+            return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 void XFCellStyle::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index a660f4f135ab..f9f51bd749f4 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -123,11 +123,11 @@ public:
     /**
      * @descr   Set cell value to warp if it's content is too long to be placed in an single cell.
      */
-    void    SetWrapText(sal_Bool wrap);
+    void    SetWrapText(bool wrap);
 
     virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
 
-    virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
 
     virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
@@ -145,7 +145,7 @@ private:
     XFFont      *m_pFont;
     XFShadow    m_aShadow;
     XFBorders   *m_pBorders;
-    sal_Bool    m_bWrapText;
+    bool    m_bWrapText;
 };
 
 inline void XFCellStyle::SetAlignType(enumXFAlignType hori, enumXFAlignType vert)
@@ -159,7 +159,7 @@ inline void XFCellStyle::SetDataStyle(const OUString& style)
     m_strDataStyle = style;
 }
 
-inline void XFCellStyle::SetWrapText(sal_Bool wrap)
+inline void XFCellStyle::SetWrapText(bool wrap)
 {
     m_bWrapText = wrap;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
index 688593daf4a0..8910a53c3160 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
@@ -71,12 +71,12 @@ class XFColor
 public:
     XFColor():m_nRed((sal_Int8)0),m_nGreen((sal_Int8)0),m_nBlue((sal_Int8)0)
     {
-        m_bValid = sal_False;
+        m_bValid = false;
     }
     XFColor(sal_Int32 red, sal_Int32 green, sal_Int32 blue)
         :m_nRed((sal_Int8)red),m_nGreen((sal_Int8)green),m_nBlue((sal_Int8)blue)
     {
-        m_bValid = sal_True;
+        m_bValid = true;
     }
     XFColor(sal_uInt32 color)
     {
@@ -90,7 +90,7 @@ public:
         temp = c;
         m_nBlue = static_cast<sal_uInt8>((temp&0x00ff0000)>>16);
 
-        m_bValid = sal_True;
+        m_bValid = true;
     }
 
     /**
@@ -111,7 +111,7 @@ public:
     /**
      * @descr   helper function to assert whether a color is valid.
      */
-    sal_Bool    IsValid() const{ return m_bValid;}
+    bool    IsValid() const{ return m_bValid;}
 
     OUString   ToString ()const;
 
@@ -121,7 +121,7 @@ private:
     sal_uInt8   m_nRed;
     sal_uInt8   m_nGreen;
     sal_uInt8   m_nBlue;
-    sal_Bool    m_bValid;
+    bool    m_bValid;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx
index aecace11241f..ec2df746cdc1 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx
@@ -62,9 +62,9 @@
 
 XFDate::XFDate()
 {
-    m_bFixed = 0;
+    m_bFixed = false;
     memset(&m_aDateTime, 0, sizeof(m_aDateTime));
-    m_bValued = sal_False;
+    m_bValued = false;
 }
 
 XFDate::~XFDate()
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx
index 17f1d1960575..46bf82d39989 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx
@@ -80,29 +80,29 @@ public:
 
     void    SetText(OUString& text);
 
-    void    SetFixed(sal_Bool fixed = sal_True);
+    void    SetFixed(bool fixed = true);
 
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
 private:
-    sal_Bool    m_bFixed;
+    bool    m_bFixed;
     OUString m_strText;
     XFDateTime  m_aDateTime;
     OUString   m_strDate;
-    sal_Bool    m_bValued;
+    bool    m_bValued;
 };
 
 inline  void XFDate::SetDate(XFDateTime& dt)
 {
     m_aDateTime = dt;
     m_strDate = DateTimeToOUString(m_aDateTime);
-    m_bValued = sal_True;
+    m_bValued = true;
 }
 
 inline void XFDate::SetDate(const OUString& date)
 {
     m_strDate = date;
-    m_bValued = sal_True;
+    m_bValued = true;
 }
 
 inline  void XFDate::SetText(OUString& text)
@@ -110,7 +110,7 @@ inline  void XFDate::SetText(OUString& text)
     m_strText = text;
 }
 
-inline  void XFDate::SetFixed(sal_Bool fixed)
+inline  void XFDate::SetFixed(bool fixed)
 {
     m_bFixed = fixed;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
index ae0581c0dc1a..bdd1d15419c0 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
@@ -61,7 +61,7 @@
 
 XFDatePart::XFDatePart()
 {
-    m_bTexture = sal_False;
+    m_bTexture = false;
 }
 
 void    XFDatePart::ToXml(IXFStream *pStrm)
@@ -159,8 +159,8 @@ void    XFDatePart::ToXml(IXFStream *pStrm)
 
 XFDateStyle::XFDateStyle()
 {
-    m_bFixed = sal_False;
-    m_bAutoOrder = sal_False;
+    m_bFixed = false;
+    m_bAutoOrder = false;
 }
 
 XFDateStyle::~XFDateStyle()
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
index c4d1fd1b1a84..c6c01b439134 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
@@ -72,12 +72,12 @@ class XFDatePart : public XFTimePart
 public:
     XFDatePart();
 public:
-    void    SetTexture(sal_Bool bTexture);
+    void    SetTexture(bool bTexture);
 
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
 private:
-    sal_Bool        m_bTexture;
+    bool        m_bTexture;
 };
 
 class XFDateStyle : public XFStyle
@@ -89,35 +89,35 @@ public:
 
 public:
 
-    void    SetFixed(sal_Bool fixed);
+    void    SetFixed(bool fixed);
 
     void    SetLanguage(const OUString& lang);
 
     void    SetCountry(const OUString& country);
 
-    void    SetAutoOrder(sal_Bool bAutoOrder);
+    void    SetAutoOrder(bool bAutoOrder);
 
-    void    AddYear( sal_Bool bLongFmt = sal_True );
+    void    AddYear( bool bLongFmt = true );
 
-    void    AddMonth( sal_Bool bLongFmt = sal_True, sal_Bool bTexture = sal_False  );
+    void    AddMonth( bool bLongFmt = true, bool bTexture = false  );
 
-    void    AddMonthDay( sal_Bool bLongFmt = sal_True );
+    void    AddMonthDay( bool bLongFmt = true );
 
-    void    AddWeekDay( sal_Bool bLongFmt = sal_True );
+    void    AddWeekDay( bool bLongFmt = true );
 
     void    AddYearWeek();
 
-    void    AddEra(sal_Bool bLongFmt = sal_False);
+    void    AddEra(bool bLongFmt = false);
 
-    void    AddQuarter(sal_Bool bLongFmt = sal_False);
+    void    AddQuarter(bool bLongFmt = false);
 
-    void    AddHour( sal_Bool bLongFmt = sal_True );
+    void    AddHour( bool bLongFmt = true );
 
-    void    AddMinute( sal_Bool bLongFmt = sal_True );
+    void    AddMinute( bool bLongFmt = true );
 
-    void    AddSecond( sal_Bool bLongFmt = sal_True, sal_Int16 nDecimalPos = 2);
+    void    AddSecond( bool bLongFmt = true, sal_Int16 nDecimalPos = 2);
 
-    void    AddAmPm(sal_Bool bAmPm);
+    void    AddAmPm(bool bAmPm);
 
     void    AddText( const OUString& part );
 
@@ -126,19 +126,19 @@ public:
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
 private:
-    sal_Bool    m_bFixed;
-    sal_Bool    m_bAutoOrder;
+    bool    m_bFixed;
+    bool    m_bAutoOrder;
     OUString   m_strLanguage;
     OUString   m_strCountry;
     XFStyleContainer    m_aParts;
 };
 
-inline void XFDatePart::SetTexture(sal_Bool bTexture)
+inline void XFDatePart::SetTexture(bool bTexture)
 {
     m_bTexture = bTexture;
 }
 
-inline void XFDateStyle::SetFixed(sal_Bool fixed)
+inline void XFDateStyle::SetFixed(bool fixed)
 {
     m_bFixed = fixed;
 }
@@ -153,12 +153,12 @@ inline void XFDateStyle::SetCountry(const OUString& country)
     m_strCountry = country;
 }
 
-inline void XFDateStyle::SetAutoOrder(sal_Bool bAutoOrder)
+inline void XFDateStyle::SetAutoOrder(bool bAutoOrder)
 {
     m_bAutoOrder = bAutoOrder;
 }
 
-inline void XFDateStyle::AddYear( sal_Bool bLongFmt )
+inline void XFDateStyle::AddYear( bool bLongFmt )
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateYear);
@@ -166,7 +166,7 @@ inline void XFDateStyle::AddYear( sal_Bool bLongFmt )
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddMonth( sal_Bool bLongFmt, sal_Bool bTexture  )
+inline void XFDateStyle::AddMonth( bool bLongFmt, bool bTexture  )
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateMonth);
@@ -175,7 +175,7 @@ inline void XFDateStyle::AddMonth( sal_Bool bLongFmt, sal_Bool bTexture  )
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddMonthDay( sal_Bool bLongFmt )
+inline void XFDateStyle::AddMonthDay( bool bLongFmt )
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateMonthDay);
@@ -183,7 +183,7 @@ inline void XFDateStyle::AddMonthDay( sal_Bool bLongFmt )
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddWeekDay( sal_Bool bLongFmt )
+inline void XFDateStyle::AddWeekDay( bool bLongFmt )
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateWeekDay);
@@ -198,7 +198,7 @@ inline void XFDateStyle::AddYearWeek()
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddEra(sal_Bool bLongFmt)
+inline void XFDateStyle::AddEra(bool bLongFmt)
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateEra);
@@ -206,7 +206,7 @@ inline void XFDateStyle::AddEra(sal_Bool bLongFmt)
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddQuarter(sal_Bool bLongFmt)
+inline void XFDateStyle::AddQuarter(bool bLongFmt)
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateQuarter);
@@ -222,7 +222,7 @@ inline void XFDateStyle::AddText( const OUString& text )
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddHour( sal_Bool bLongFmt )
+inline void XFDateStyle::AddHour( bool bLongFmt )
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateHour);
@@ -230,7 +230,7 @@ inline void XFDateStyle::AddHour( sal_Bool bLongFmt )
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddMinute( sal_Bool bLongFmt )
+inline void XFDateStyle::AddMinute( bool bLongFmt )
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateMinute);
@@ -238,7 +238,7 @@ inline void XFDateStyle::AddMinute( sal_Bool bLongFmt )
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos)
+inline void XFDateStyle::AddSecond( bool bLongFmt, sal_Int16 pos)
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateSecond);
@@ -247,7 +247,7 @@ inline void XFDateStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos)
     m_aParts.AddStyle(part);
 }
 
-inline void XFDateStyle::AddAmPm(sal_Bool /*bAmPm*/)
+inline void XFDateStyle::AddAmPm(bool /*bAmPm*/)
 {
     XFDatePart  *part = new XFDatePart();
     part->SetPartType(enumXFDateAmPm);
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
index 06db32b3b23a..5b3df3f9cf58 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
@@ -121,7 +121,7 @@ public:
     /**
      * @descr   decide whether it's a solid line.
      */
-    sal_Bool    IsSolid();
+    bool    IsSolid();
 
     double  GetWidth();
 
@@ -190,7 +190,7 @@ inline void XFDrawLineStyle::SetSpace(double space)
     m_fSpace = space;
 }
 
-inline sal_Bool XFDrawLineStyle::IsSolid()
+inline bool XFDrawLineStyle::IsSolid()
 {
     return (m_eLineStyle==enumXFLineSolid);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index ca2763b80d10..f125779b775f 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -81,7 +81,7 @@ XFDrawPath::XFDrawPath()
 {
 }
 
-void    XFDrawPath::MoveTo(XFPoint pt, sal_Bool absPosition)
+void    XFDrawPath::MoveTo(XFPoint pt, bool absPosition)
 {
     XFSvgPathEntry  entry;
 
@@ -93,7 +93,7 @@ void    XFDrawPath::MoveTo(XFPoint pt, sal_Bool absPosition)
     m_aPaths.push_back(entry);
 }
 
-void    XFDrawPath::LineTo(XFPoint pt, sal_Bool absPosition)
+void    XFDrawPath::LineTo(XFPoint pt, bool absPosition)
 {
     XFSvgPathEntry  entry;
 
@@ -105,7 +105,7 @@ void    XFDrawPath::LineTo(XFPoint pt, sal_Bool absPosition)
     m_aPaths.push_back(entry);
 }
 
-void    XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, sal_Bool absPosition)
+void    XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition)
 {
     XFSvgPathEntry  entry;
 
@@ -120,7 +120,7 @@ void    XFDrawPath::CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, sal_Bool
     m_aPaths.push_back(entry);
 }
 
-void    XFDrawPath::ClosePath(sal_Bool absPosition)
+void    XFDrawPath::ClosePath(bool absPosition)
 {
     XFSvgPathEntry  entry;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index 51859b952005..f567d902953b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -104,22 +104,22 @@ public:
     /**
      * @descr   Move command.
      */
-    void    MoveTo(XFPoint pt, sal_Bool absPosition = sal_True);
+    void    MoveTo(XFPoint pt, bool absPosition = true);
 
     /**
      * @descr   Line command.
      */
-    void    LineTo(XFPoint pt, sal_Bool absPosition = sal_True);
+    void    LineTo(XFPoint pt, bool absPosition = true);
 
     /**
      * @descr   Curve command.
      */
-    void    CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, sal_Bool absPosition = sal_True);
+    void    CurveTo(XFPoint dest, XFPoint ctrl1, XFPoint ctrl2, bool absPosition = true);
 
     /**
      * @descr   Close path command.
      */
-    void    ClosePath(sal_Bool absPosition = sal_True);
+    void    ClosePath(bool absPosition = true);
 
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index db49645dda35..b23251d50766 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -75,8 +75,8 @@ XFDrawStyle::XFDrawStyle()
 
     m_fArrowStartSize = 0.3;
     m_fArrowEndSize = 0.3;
-    m_bArrowStartCenter = sal_False;
-    m_bArrowEndCenter = sal_False;
+    m_bArrowStartCenter = false;
+    m_bArrowEndCenter = false;
 }
 
 XFDrawStyle::~XFDrawStyle()
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index 1183d7ce51df..d4a921bb6b39 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -111,12 +111,12 @@ public:
     /**
      * @descr   Set drawing object arrow start style,only lines can have arrows.
      */
-    void    SetArrowStart(const OUString& start, double size=0.3, sal_Bool center = sal_False);
+    void    SetArrowStart(const OUString& start, double size=0.3, bool center = false);
 
     /**
      * @descr   Set drawing object arrow end style,only lines can have arrows.
      */
-    void    SetArrowEnd(const OUString& end, double size=0.3, sal_Bool center = sal_False);
+    void    SetArrowEnd(const OUString& end, double size=0.3, bool center = false);
 
     void SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
 
@@ -134,8 +134,8 @@ private:
     OUString   m_strArrowEnd;
     double  m_fArrowStartSize;
     double  m_fArrowEndSize;
-    sal_Bool m_bArrowStartCenter;
-    sal_Bool m_bArrowEndCenter;
+    bool m_bArrowStartCenter;
+    bool m_bArrowEndCenter;
 };
 
 inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs)
@@ -144,7 +144,7 @@ inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs)
     m_nWrapLines = nParagraphs;
 }
 
-inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, sal_Bool center)
+inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, bool center)
 {
     assert(size>0);
     m_strArrowStart = start;
@@ -152,7 +152,7 @@ inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, sal_B
     m_bArrowStartCenter = center;
 }
 
-inline void XFDrawStyle::SetArrowEnd(const OUString& end, double size, sal_Bool center)
+inline void XFDrawStyle::SetArrowEnd(const OUString& end, double size, bool center)
 {
     assert(size>0);
     m_strArrowEnd = end;
diff --git a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx
index 5d7167788df9..d034a9ec6dc5 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx
@@ -67,8 +67,8 @@ class XFEndnoteConfig : public XFFootnoteConfig
 public:
     XFEndnoteConfig() : XFFootnoteConfig()
     {
-        m_bIsFootnote = sal_False;
-        m_bInsertInPage = sal_False;
+        m_bIsFootnote = false;
+        m_bInsertInPage = false;
         m_strDefaultStyle = "Endnote";
         m_strMasterPage = "Endnote";
         m_strCitationStyle = "Endnote Symbol";
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.cxx b/lotuswordpro/source/filter/xfilter/xfentry.cxx
index efb0e8eb046d..6ca70844e7e1 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.cxx
@@ -62,7 +62,7 @@
 XFEntry::XFEntry()
 {
     m_eType = enumXFEntryTOC;
-    m_bMainEntry = sal_False;
+    m_bMainEntry = false;
     m_nOutlineLevel = 1;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx
index 451effb1a5b9..919d1f228014 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx
@@ -100,7 +100,7 @@ public:
     /**
      * @descr   Set whether it's a main entry. This is available only for enumXFEntryAlphabetical.
      */
-    void    SetMainEntry(sal_Bool main);
+    void    SetMainEntry(bool main);
 
     /**
      * @descr   Set outline level. This is available for enumXFEntryTOC and enumXFEntryUserIndex.
@@ -116,7 +116,7 @@ private:
     OUString   m_strKey1;
     OUString   m_strKey2;
     OUString   m_strName;
-    sal_Bool        m_bMainEntry;
+    bool        m_bMainEntry;
     sal_Int32       m_nOutlineLevel;
 };
 
@@ -146,7 +146,7 @@ inline void XFEntry::SetKey(const OUString& key1, const OUString& key2)
     m_strKey2 = key2;
 }
 
-inline void XFEntry::SetMainEntry(sal_Bool main)
+inline void XFEntry::SetMainEntry(bool main)
 {
     m_bMainEntry = main;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
index a244600d0136..031b963ac953 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 #include "xffloatframe.hxx"
 
-XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, sal_Bool all)
+XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all)
 {
     m_nStart = start;
     m_nEnd = end;
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
index 8903f776cfd8..c921c2764dd3 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
@@ -75,7 +75,7 @@ public:
     /**
      * @descr   output range: [start,end], not [start,end).
      */
-    XFFloatFrame(sal_Int32 start, sal_Int32 end, sal_Bool all=sal_False);
+    XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all=false);
 
 public:
     void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
@@ -83,7 +83,7 @@ public:
 private:
     sal_Int32   m_nStart;
     sal_Int32   m_nEnd;
-    sal_Bool    m_bAll;
+    bool    m_bAll;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx
index 31ae98c59a2c..9a37d5f9c85f 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.cxx
@@ -63,28 +63,28 @@ XFFont::XFFont()
     : m_nFontSize(0)
     , m_nFontSizeAsia(0)
     , m_nFontSizeComplex(0)
-    , m_bItalic(sal_False)
-    , m_bItalicAsia(sal_False)
-    , m_bItalicComplex(sal_False)
-    , m_bBold(sal_False)
-    , m_bBoldAsia(sal_False)
-    , m_bBoldComplex(sal_False)
+    , m_bItalic(false)
+    , m_bItalicAsia(false)
+    , m_bItalicComplex(false)
+    , m_bBold(false)
+    , m_bBoldAsia(false)
+    , m_bBoldComplex(false)
     , m_eUnderline(enumXFUnderlineNone)
     , m_eCrossout(enumXFCrossoutNone)
     , m_eRelief(enumXFReliefNone)
     , m_eTransform(enumXFTransformNone)
     , m_eEmphasize(enumXFEmphasizeNone)
-    , m_bWordByWord(sal_False)
-    , m_bEmphasizeTop(sal_True)
-    , m_bOutline(sal_False)
-    , m_bShadow(sal_False)
-    , m_bBlink(sal_False)
+    , m_bWordByWord(false)
+    , m_bEmphasizeTop(true)
+    , m_bOutline(false)
+    , m_bShadow(false)
+    , m_bBlink(false)
     , m_nPosition(33)
     , m_nScale(58)
     , m_fCharSpace(0)
     , m_nWidthScale(100)
     , m_nFlag(0)
-    , m_bTransparent(sal_False)
+    , m_bTransparent(false)
 {
 }
 /*
diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx
index 1dd08ee60c81..999daa236d03 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.hxx
@@ -150,37 +150,37 @@ public:
     /**
      * @descr   Set whether font is italic.
      */
-    void    SetItalic(sal_Bool italic = true);
+    void    SetItalic(bool italic = true);
 
     /**
      * @descr   Set whether font is italic for asia locale.
      */
-    void    SetItalicAsia(sal_Bool italic);
+    void    SetItalicAsia(bool italic);
 
     /**
      * @descr   Set whether font is italic for BIDI locale.
      */
-    void    SetItalicComplex(sal_Bool italic);
+    void    SetItalicComplex(bool italic);
 
     /**
      * @descr   Set font bold.
      */
-    void    SetBold(sal_Bool bold = true);
+    void    SetBold(bool bold = true);
 
     /**
      * @descr   Set font bold for asia locale.
      */
-    void    SetBoldAsia(sal_Bool bold);
+    void    SetBoldAsia(bool bold);
 
     /**
      * @descr   Set font bold for complex locale.
      */
-    void    SetBoldComplex(sal_Bool bold);
+    void    SetBoldComplex(bool bold);
 
     /**
      * @descr   Set underline style.
      */
-    void    SetUnderline(enumXFUnderline underline,sal_Bool wordByWord=sal_False);
+    void    SetUnderline(enumXFUnderline underline,bool wordByWord=false);
 
     /**
      * @descr   Set underline color.
@@ -190,7 +190,7 @@ public:
     /**
      * @descr   Set crossout.
      */
-    void    SetCrossout(enumXFCrossout cross,sal_Bool wordByWord=sal_False);
+    void    SetCrossout(enumXFCrossout cross,bool wordByWord=false);
 
     /**
      * @descr   Set font relief.
@@ -205,27 +205,27 @@ public:
     /**
      * @descr   Set font emphasize effect.
      */
-    void    SetEmphasize(enumXFEmphasize emphasize, sal_Bool top = sal_True);
+    void    SetEmphasize(enumXFEmphasize emphasize, bool top = true);
 
     /**
      * @descr   Set outline effect.
      */
-    void    SetOutline(sal_Bool outline);
+    void    SetOutline(bool outline);
 
     /**
      * @descr   Set font shadow.
      */
-    void    SetShadow(sal_Bool shadow);
+    void    SetShadow(bool shadow);
 
     /**
      * @descr   Set font blink effect.
      */
-    void    SetBlink(sal_Bool blink);
+    void    SetBlink(bool blink);
 
     /**
      * @descr   Set upper script or lower script.
      */
-    void    SetPosition(sal_Bool bUpperScript = sal_True, sal_Int16 pos = 33, sal_Int16 scale = 58);
+    void    SetPosition(bool bUpperScript = true, sal_Int16 pos = 33, sal_Int16 scale = 58);
 
     /**
      * @descr   Set space between chars in percent.
@@ -268,12 +268,12 @@ private:
     sal_Int16   m_nFontSize;
     sal_Int16   m_nFontSizeAsia;
     sal_Int16   m_nFontSizeComplex;
-    sal_Bool    m_bItalic;
-    sal_Bool    m_bItalicAsia;
-    sal_Bool    m_bItalicComplex;
-    sal_Bool    m_bBold;
-    sal_Bool    m_bBoldAsia;
-    sal_Bool    m_bBoldComplex;
+    bool    m_bItalic;
+    bool    m_bItalicAsia;
+    bool    m_bItalicComplex;
+    bool    m_bBold;
+    bool    m_bBoldAsia;
+    bool    m_bBoldComplex;
     XFColor     m_aUnderlineColor;
 
     enumXFUnderline m_eUnderline;
@@ -281,11 +281,11 @@ private:
     enumXFRelief    m_eRelief;
     enumXFTransform m_eTransform;
     enumXFEmphasize m_eEmphasize;
-    sal_Bool    m_bWordByWord;
-    sal_Bool    m_bEmphasizeTop;
-    sal_Bool    m_bOutline;
-    sal_Bool    m_bShadow;
-    sal_Bool    m_bBlink;
+    bool    m_bWordByWord;
+    bool    m_bEmphasizeTop;
+    bool    m_bOutline;
+    bool    m_bShadow;
+    bool    m_bBlink;
     sal_Int16   m_nPosition;
     sal_Int16   m_nScale;
     double      m_fCharSpace;
@@ -294,7 +294,7 @@ private:
     XFColor     m_aBackColor;
     //The flag defines which variable will be funtional.
     sal_uInt32  m_nFlag;
-    sal_Bool    m_bTransparent;
+    bool    m_bTransparent;
 };
 
 inline void XFFont::SetFontName(const OUString& name)
@@ -340,7 +340,7 @@ inline void XFFont::SetFontSizeComplex(sal_Int16 size)
 }
 
 //---------Italic:
-inline void XFFont::SetItalic(sal_Bool italic)
+inline void XFFont::SetItalic(bool italic)
 {
     m_bItalic = italic;
     m_nFlag |= XFFONT_FLAG_ITALIC;
@@ -349,20 +349,20 @@ inline void XFFont::SetItalic(sal_Bool italic)
     SetItalicComplex(italic);
 }
 
-inline void XFFont::SetItalicAsia(sal_Bool italic)
+inline void XFFont::SetItalicAsia(bool italic)
 {
     m_bItalicAsia = italic;
     m_nFlag |= XFFONT_FLAG_ITALIC_ASIA;
 }
 
-inline void XFFont::SetItalicComplex(sal_Bool italic)
+inline void XFFont::SetItalicComplex(bool italic)
 {
     m_bItalicComplex = italic;
     m_nFlag |= XFFONT_FLAG_ITALIC_COMPLEX;
 }
 
 //--------Bold
-inline void XFFont::SetBold(sal_Bool bold)
+inline void XFFont::SetBold(bool bold)
 {
     m_bBold = bold;
     m_nFlag |= XFFONT_FLAG_BOLD;
@@ -370,20 +370,20 @@ inline void XFFont::SetBold(sal_Bool bold)
     SetBoldComplex(bold);
 }
 
-inline void XFFont::SetBoldAsia(sal_Bool bold)
+inline void XFFont::SetBoldAsia(bool bold)
 {
     m_bBoldAsia = bold;
     m_nFlag |= XFFONT_FLAG_BOLD_ASIA;
 }
 
-inline void XFFont::SetBoldComplex(sal_Bool bold)
+inline void XFFont::SetBoldComplex(bool bold)
 {
     m_bBoldComplex = bold;
     m_nFlag |= XFFONT_FLAG_BOLD_COMPLEX;
 }
 
 //--------Underline:
-inline void XFFont::SetUnderline(enumXFUnderline underline, sal_Bool wordByWord)
+inline void XFFont::SetUnderline(enumXFUnderline underline, bool wordByWord)
 {
     m_eUnderline = underline;
     m_bWordByWord = wordByWord;
@@ -396,7 +396,7 @@ inline void XFFont::SetUnderlineColor(XFColor color)
     m_nFlag |= XFFONT_FLAG_UNDERLINECOLOR;
 }
 
-inline void XFFont::SetCrossout(enumXFCrossout cross, sal_Bool wordByWord)
+inline void XFFont::SetCrossout(enumXFCrossout cross, bool wordByWord)
 {
     m_eCrossout = cross;
     m_bWordByWord = wordByWord;
@@ -413,29 +413,29 @@ inline void XFFont::SetTransform(enumXFTransform transform)
     m_nFlag |= XFFONT_FLAG_TRANSFORM;
 }
 
-inline void XFFont::SetEmphasize(enumXFEmphasize emphasize, sal_Bool top)
+inline void XFFont::SetEmphasize(enumXFEmphasize emphasize, bool top)
 {
     m_eEmphasize = emphasize;
     m_bEmphasizeTop = top;
     m_nFlag |= XFFONT_FLAG_EMPHASIZE;
 }
-inline void XFFont::SetOutline(sal_Bool outline)
+inline void XFFont::SetOutline(bool outline)
 {
     m_bOutline = outline;
     m_nFlag |= XFFONT_FLAG_OUTLINE;
 }
-inline void XFFont::SetShadow(sal_Bool shadow)
+inline void XFFont::SetShadow(bool shadow)
 {
     m_bShadow = shadow;
     m_nFlag |= XFFONT_FLAG_SHADOW;
 }
-inline void XFFont::SetBlink(sal_Bool blink)
+inline void XFFont::SetBlink(bool blink)
 {
     m_bBlink = blink;
     m_nFlag |= XFFONT_FLAG_BLINK;
 }
 
-inline void XFFont::SetPosition(sal_Bool bUpperScript, sal_Int16 pos, sal_Int16 scale)
+inline void XFFont::SetPosition(bool bUpperScript, sal_Int16 pos, sal_Int16 scale)
 {
     assert(pos>=0&&pos<=100);
     assert(scale>0&&scale<=100);
@@ -474,14 +474,14 @@ inline void XFFont::SetColor(XFColor& color)
 
 inline void XFFont::SetBackColor(XFColor& color)
 {
-    m_bTransparent = sal_False;
+    m_bTransparent = false;
     m_nFlag |= XFFONT_FLAG_BGCOLOR;
     m_aBackColor = color;
 }
 
 inline void XFFont::SetBackColorTransparent()
 {
-    m_bTransparent = sal_True;
+    m_bTransparent = true;
     m_nFlag |= XFFONT_FLAG_BGCOLOR;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
index c2c64cab501e..4b5115d1da85 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 #include "xffontdecl.hxx"
 
-XFFontDecl::XFFontDecl(const OUString& name, const OUString& family, sal_Bool fixed)
+XFFontDecl::XFFontDecl(const OUString& name, const OUString& family, bool fixed)
 {
     m_strFontName = name;
     m_strFontFamily = family;
@@ -76,7 +76,7 @@ OUString   XFFontDecl::GetFontFamily()
     return m_strFontFamily;
 }
 
-sal_Bool    XFFontDecl::GetFontPitchFixed()
+bool    XFFontDecl::GetFontPitchFixed()
 {
     return m_bPitchFixed;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
index 8b28f65817e2..eb69e138e8de 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
@@ -71,7 +71,7 @@
 class   XFFontDecl
 {
 public:
-    XFFontDecl(const OUString& name, const OUString& family, sal_Bool fixed = false);
+    XFFontDecl(const OUString& name, const OUString& family, bool fixed = false);
 
 public:
     /**
@@ -84,12 +84,12 @@ public:
      */
     OUString   GetFontFamily();
 
-    sal_Bool        GetFontPitchFixed();
+    bool        GetFontPitchFixed();
 
 private:
     OUString   m_strFontName;
     OUString   m_strFontFamily;
-    sal_Bool        m_bPitchFixed;
+    bool        m_bPitchFixed;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
index 5ef92e16c56c..97b97fad4123 100644
--- a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
@@ -67,7 +67,7 @@ class XFFontWorkStyle
 public:
     XFFontWorkStyle() :
         m_nButtonForm(-1),
-        m_bHideForm(sal_True),
+        m_bHideForm(true),
         m_fDistance(-0.10),
         m_eStyleType(enumXFFWOff),
         m_eAdjustType(enumXFFWAdjustAutosize),
@@ -77,7 +77,7 @@ public:
     ~XFFontWorkStyle(){}
 
     inline void SetButtonForm(sal_Int8 nIndex);
-    inline void SetHideForm(sal_Bool bHide);
+    inline void SetHideForm(bool bHide);
     inline void SetFWDistance(double fDist);
     inline void SetFWStyleType(enumXFFWStyle eStyle);
     inline void SetFWAdjustType(enumXFFWAdjust eAdjust);
@@ -91,7 +91,7 @@ public:
 
 private:
     sal_Int8 m_nButtonForm;
-    sal_Bool m_bHideForm;
+    bool m_bHideForm;
     double m_fDistance;
     enumXFFWStyle m_eStyleType;
     enumXFFWAdjust m_eAdjustType;
@@ -103,7 +103,7 @@ inline void XFFontWorkStyle::SetButtonForm(sal_Int8 nIndex)
     m_nButtonForm = nIndex;
 }
 
-inline void XFFontWorkStyle::SetHideForm(sal_Bool bHide)
+inline void XFFontWorkStyle::SetHideForm(bool bHide)
 {
     m_bHideForm = bHide;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
index e9babde27227..c8cb895e13e9 100644
--- a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
@@ -66,7 +66,7 @@
 class XFFooterStyle : public XFHeaderStyle
 {
 public:
-    XFFooterStyle() : XFHeaderStyle(sal_True)
+    XFFooterStyle() : XFHeaderStyle(true)
     {
     }
 
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
index 96b674e47c9c..dfb9cac31fb7 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
@@ -84,7 +84,7 @@ public:
 
     void    SetRestartOnChapter();
 
-    void    SetInsertInPage(sal_Bool page=sal_True);
+    void    SetInsertInPage(bool page=true);
 
     void    SetNumPrefix(const OUString& numprefix);
 
@@ -108,8 +108,8 @@ protected:
     OUString   m_strMessageOn;
     sal_Int32   m_nStartValue;
     sal_Int32   m_nRestartType;
-    sal_Bool    m_bInsertInPage;
-    sal_Bool    m_bIsFootnote;
+    bool    m_bInsertInPage;
+    bool    m_bIsFootnote;
 };
 
 inline XFFootnoteConfig::XFFootnoteConfig()
@@ -117,12 +117,12 @@ inline XFFootnoteConfig::XFFootnoteConfig()
     m_nStartValue = 0;
     m_nRestartType = -1;
     m_strNumFmt = "1";
-    m_bInsertInPage = sal_True;
+    m_bInsertInPage = true;
     m_strDefaultStyle = "Footnote";
     m_strMasterPage = "Footnote";
     m_strCitationStyle = "Footnote Symbol";
     m_strBodyStyle = "Footnote anchor";
-    m_bIsFootnote = sal_True;
+    m_bIsFootnote = true;
 }
 
 inline void XFFootnoteConfig::SetBodyStyle(const OUString& style)
@@ -167,7 +167,7 @@ inline void XFFootnoteConfig::SetRestartOnChapter()
     m_nRestartType = 1;
 }
 
-inline void XFFootnoteConfig::SetInsertInPage(sal_Bool page)
+inline void XFFootnoteConfig::SetInsertInPage(bool page)
 {
     m_bInsertInPage = page;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx
index 3398533641fb..73abd6ce4335 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx
@@ -62,7 +62,7 @@
 #define     ZINDEX_MIN 0
 XFFrame::XFFrame()
 {
-    m_isTextBox = sal_False;
+    m_isTextBox = false;
     m_eAnchor = enumXFAnchorPara;
     m_nAnchorPage = 0;
     m_nZIndex = ZINDEX_MIN;
@@ -73,7 +73,7 @@ XFFrame::XFFrame()
     m_nFlag = 0;
     m_eType = enumXFFrameTextbox;
 }
-XFFrame::XFFrame(sal_Bool isTextBox):m_isTextBox(isTextBox)
+XFFrame::XFFrame(bool isTextBox):m_isTextBox(isTextBox)
 {
     m_eAnchor = enumXFAnchorPara;
     m_nAnchorPage = 0;
@@ -141,7 +141,7 @@ void    XFFrame::StartFrame(IXFStream *pStrm)
         pAttrList->AddAttribute( "draw:style-name", GetStyleName() );
 
     assert(!m_strName.isEmpty());    //name should not be null.
-    if( !m_strName.isEmpty() && m_isTextBox == sal_False)
+    if( !m_strName.isEmpty() && m_isTextBox == false)
         pAttrList->AddAttribute( "draw:name", m_strName );
     //anchor type:
     switch( m_eAnchor )
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx
index 0cae4304cd82..04eed863daf1 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx
@@ -80,7 +80,7 @@ class XFFrame : public XFContentContainer
 {
 public:
     XFFrame();
-    XFFrame(sal_Bool isTextBox);
+    XFFrame(bool isTextBox);
 
     virtual ~XFFrame();
 
@@ -189,7 +189,7 @@ protected:
     OUString   m_strNextLink;
     enumXFFrameType m_eType;
     sal_uInt32      m_nFlag;
-    sal_Bool            m_isTextBox;
+    bool            m_isTextBox;
 };
 
 inline void XFFrame::SetAnchorType(enumXFAnchor anchor)
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
index 61169ef24d9f..a0b485b002f6 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
@@ -72,12 +72,12 @@ XFFrameStyle::XFFrameStyle()
     m_pShadow = NULL;
     m_pBGImage = NULL;
 
-    m_bProtectContent = sal_False;
-    m_bProtectSize = sal_False;
-    m_bProtectPos = sal_False;
-    m_bEditable = sal_False;
-    m_bPrintable = sal_True;
-    m_bBackground = sal_False;
+    m_bProtectContent = false;
+    m_bProtectSize = false;
+    m_bProtectPos = false;
+    m_bEditable = false;
+    m_bPrintable = true;
+    m_bBackground = false;
     m_nTransparency = 0;
 
     m_eTextDir = enumXFTextDirNone;
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
index 9224af8f1141..c7d8c804fc35 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
@@ -124,7 +124,7 @@ public:
     /**
      * @descr   Set whether frame is protected. There are three properties that can be protected, content,size and position.
      */
-    void    SetProtect(sal_Bool content, sal_Bool size, sal_Bool pos);
+    void    SetProtect(bool content, bool size, bool pos);
 
     /**
      * @descr   Set text dir.
@@ -144,7 +144,7 @@ public:
     /**
      * @descr   Set frame background.
      */
-    void    SetBackGround(sal_Bool bBackground);
+    void    SetBackGround(bool bBackground);
 
     void SetTransparency(sal_Int16 nTransparency);
 
@@ -162,12 +162,12 @@ protected:
     XFShadow    *m_pShadow;
     XFBGImage   *m_pBGImage;
     XFColor     m_aBackColor;
-    sal_Bool    m_bProtectContent;
-    sal_Bool    m_bProtectSize;
-    sal_Bool    m_bProtectPos;
-    sal_Bool    m_bEditable;
-    sal_Bool    m_bPrintable;
-    sal_Bool    m_bBackground;
+    bool    m_bProtectContent;
+    bool    m_bProtectSize;
+    bool    m_bProtectPos;
+    bool    m_bEditable;
+    bool    m_bPrintable;
+    bool    m_bBackground;
     sal_Int16 m_nTransparency;
 
     enumXFTextDir   m_eTextDir;
@@ -216,7 +216,7 @@ inline void XFFrameStyle::SetTextDir(enumXFTextDir dir)
     m_eTextDir = dir;
 }
 
-inline void XFFrameStyle::SetProtect(sal_Bool content, sal_Bool size, sal_Bool pos)
+inline void XFFrameStyle::SetProtect(bool content, bool size, bool pos)
 {
     m_bProtectContent = content;
     m_bProtectSize = size;
@@ -235,7 +235,7 @@ inline void XFFrameStyle::SetYPosType(enumXFFrameYPos pos, enumXFFrameYRel rel)
     m_eYRel = rel;
 }
 
-inline void XFFrameStyle::SetBackGround(sal_Bool bBackground)
+inline void XFFrameStyle::SetBackGround(bool bBackground)
 {
     m_bBackground = bBackground;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
index d91159324297..10345c886d83 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
@@ -60,10 +60,10 @@
 #include "xfheaderstyle.hxx"
 #include "xfbgimage.hxx"
 
-XFHeaderStyle::XFHeaderStyle(sal_Bool isFooter)
+XFHeaderStyle::XFHeaderStyle(bool isFooter)
 {
     m_bIsFooter = isFooter;
-    m_bDynamicSpace = sal_True;
+    m_bDynamicSpace = true;
     m_fHeight = -1;
     m_fMinHeight = -1;
     m_pBorders = NULL;
@@ -90,7 +90,7 @@ void    XFHeaderStyle::SetMargins(double left, double right, double bottom)
     if( bottom != -1 )
         m_aMargin.SetBottom(bottom);
 }
-void    XFHeaderStyle::SetDynamicSpace(sal_Bool dynamic)
+void    XFHeaderStyle::SetDynamicSpace(bool dynamic)
 {
     m_bDynamicSpace = dynamic;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
index c6a393fbf978..715afe60aac3 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
@@ -74,7 +74,7 @@ class XFBGImage;
 class XFHeaderStyle : public XFStyle
 {
 public:
-    explicit XFHeaderStyle(sal_Bool isFooter=sal_False);
+    explicit XFHeaderStyle(bool isFooter=false);
 
     virtual ~XFHeaderStyle();
 
@@ -84,7 +84,7 @@ public:
      */
     void    SetMargins(double left = -1, double right = -1, double bottom = -1);
 
-    void    SetDynamicSpace(sal_Bool dynamic);
+    void    SetDynamicSpace(bool dynamic);
 
     /**
      * @descr   Set header fixed height.
@@ -119,8 +119,8 @@ public:
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
 protected:
-    sal_Bool    m_bIsFooter;
-    sal_Bool    m_bDynamicSpace;
+    bool    m_bIsFooter;
+    bool    m_bDynamicSpace;
     double      m_fHeight;
     double      m_fMinHeight;
     XFMargins   m_aMargin;
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx
index d2300bee56d4..6315833c4043 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx
@@ -60,7 +60,7 @@
 #include "xfimage.hxx"
 #include "xfbase64.hxx"
 
-XFImage::XFImage() : m_bUseLink(sal_False)
+XFImage::XFImage() : m_bUseLink(false)
 {
     m_eType = enumXFFrameImage;
     m_strName = XFGlobal::GenImageName();
@@ -69,13 +69,13 @@ XFImage::XFImage() : m_bUseLink(sal_False)
 void XFImage::SetFileURL(const OUString& url)
 {
     m_strImageFile = url;
-    m_bUseLink  = sal_True;
+    m_bUseLink  = true;
 }
 
 void XFImage::SetImageData(sal_uInt8 *buf, int len)
 {
     m_strData = XFBase64::Encode(buf, len);
-    m_bUseLink = sal_False;
+    m_bUseLink = false;
 }
 
 /*
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx
index 060cc10a34e6..841c46243c04 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx
@@ -91,7 +91,7 @@ public:
 private:
     OUString m_strImageFile;
     OUString m_strData;
-    sal_Bool    m_bUseLink;
+    bool    m_bUseLink;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
index 93a64563743f..4cdfd2f7daf5 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -74,8 +74,8 @@ XFImageStyle::XFImageStyle()
     m_fClipRight = 0;
     m_fClipTop = 0;
     m_fClipBottom = 0;
-    m_bHoriFlip = sal_False;
-    m_bVertFlip = sal_False;
+    m_bHoriFlip = false;
+    m_bVertFlip = false;
     m_eColorMode = enumXFColorStandard;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
index 3f3bcb64c21c..8bf18b350678 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
@@ -85,7 +85,7 @@ public:
 
     void    SetClip(double left, double right, double top, double bottom);
 
-    void    SetFlip(sal_Bool hori, sal_Bool vert);
+    void    SetFlip(bool hori, bool vert);
 
     void    SetColorMode(enumXFColorMode mode);
 
@@ -103,8 +103,8 @@ private:
     double      m_fClipRight;
     double      m_fClipTop;
     double      m_fClipBottom;
-    sal_Bool    m_bHoriFlip;
-    sal_Bool    m_bVertFlip;
+    bool    m_bHoriFlip;
+    bool    m_bVertFlip;
     enumXFColorMode m_eColorMode;
 };
 
@@ -151,7 +151,7 @@ inline void XFImageStyle::SetClip(double left, double right, double top, double
     m_fClipBottom = bottom;
 }
 
-inline void XFImageStyle::SetFlip(sal_Bool hori, sal_Bool vert)
+inline void XFImageStyle::SetFlip(bool hori, bool vert)
 {
     m_bHoriFlip = hori;
     m_bVertFlip = vert;
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index a4a369986bf0..40d64feefd9b 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -102,12 +102,12 @@ void    XFIndex::AddTemplate(const OUString& level, const OUString& style, XFInd
     m_aTemplates.push_back( templ );
 }
 
-void    XFIndex::SetProtected(sal_Bool protect)
+void    XFIndex::SetProtected(bool protect)
 {
     m_bProtect = protect;
 }
 
-void    XFIndex::SetSeparator(sal_Bool sep)
+void    XFIndex::SetSeparator(bool sep)
 {
     m_bSeparator = sep;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index 33860e590934..07de00f5145e 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -158,12 +158,12 @@ public:
     /**
      * @descr   Set if protected index to prevent handly-revise.
      */
-    void    SetProtected(sal_Bool protect);
+    void    SetProtected(bool protect);
 
     /**
      * @descr   Set separator.
      */
-    void    SetSeparator(sal_Bool sep);
+    void    SetSeparator(bool sep);
 
     virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
index 6795a90595f7..d81674f67ff0 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
@@ -80,11 +80,11 @@ public:
 
     void    SetTextStyle(const OUString& style);
 
-    void    SetRestartOnPage(sal_Bool restart = sal_True);
+    void    SetRestartOnPage(bool restart = true);
 
-    void    SetCountEmptyLines(sal_Bool empty = sal_True);
+    void    SetCountEmptyLines(bool empty = true);
 
-    void    SetCountFrameLines(sal_Bool frame = sal_True);
+    void    SetCountFrameLines(bool frame = true);
 
     virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
@@ -96,9 +96,9 @@ private:
     OUString   m_strSeparator;
     OUString   m_strNumFmt;
     OUString   m_strTextStyle;
-    sal_Bool    m_bRestartOnPage;
-    sal_Bool    m_bCountEmptyLines;
-    sal_Bool    m_bCountFrameLines;
+    bool    m_bRestartOnPage;
+    bool    m_bCountEmptyLines;
+    bool    m_bCountFrameLines;
 };
 
 inline XFLineNumberConfig::XFLineNumberConfig()
@@ -107,9 +107,9 @@ inline XFLineNumberConfig::XFLineNumberConfig()
     m_fOffset = 0;
     m_nIncrement = 5;
     m_nSepIncrement = 3;
-    m_bRestartOnPage = sal_False;
-    m_bCountEmptyLines = sal_True;
-    m_bCountFrameLines = sal_False;
+    m_bRestartOnPage = false;
+    m_bCountEmptyLines = true;
+    m_bCountFrameLines = false;
 }
 
 inline void XFLineNumberConfig::SetNumberOffset(double offset)
@@ -143,17 +143,17 @@ inline void XFLineNumberConfig::SetTextStyle(const OUString& style)
     m_strTextStyle = style;
 }
 
-inline void XFLineNumberConfig::SetRestartOnPage(sal_Bool restart)
+inline void XFLineNumberConfig::SetRestartOnPage(bool restart)
 {
     m_bRestartOnPage = restart;
 }
 
-inline void XFLineNumberConfig::SetCountEmptyLines(sal_Bool empty)
+inline void XFLineNumberConfig::SetCountEmptyLines(bool empty)
 {
     m_bCountEmptyLines = empty;
 }
 
-inline void XFLineNumberConfig::SetCountFrameLines(sal_Bool frame)
+inline void XFLineNumberConfig::SetCountFrameLines(bool frame)
 {
     m_bCountFrameLines = frame;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx
index d72f8f168286..dde731d27bf7 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -64,8 +64,8 @@
 
 XFList::XFList()
 {
-    m_bOrdered = sal_True;
-    m_bContinueNumber = sal_False;
+    m_bOrdered = true;
+    m_bContinueNumber = false;
     m_pHeader = NULL;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx
index 03501a2ded1f..fc6ecac80a67 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.hxx
@@ -80,12 +80,12 @@ public:
     /**
      * @descr   Set whether it's an ordered list or an unordered list.
      */
-    void    SetOrdered(sal_Bool ordered);
+    void    SetOrdered(bool ordered);
 
     /**
      * @descr   Set whether to continue to number list.
      */
-    void    SetContinueNumber(sal_Bool bContinueNumber=sal_False);
+    void    SetContinueNumber(bool bContinueNumber=false);
 
     /**
      * @descr   Output list object.
@@ -97,8 +97,8 @@ public:
     virtual void    EndList(IXFStream *pStrm);
 
 private:
-    sal_Bool    m_bOrdered;
-    sal_Bool    m_bContinueNumber;
+    bool    m_bOrdered;
+    bool    m_bContinueNumber;
     XFListItem  *m_pHeader;
 
 };
@@ -108,7 +108,7 @@ class XFUnorderedList : public XFList
 public:
     XFUnorderedList()
     {
-        SetOrdered(sal_False);
+        SetOrdered(false);
     }
 };
 
@@ -117,16 +117,16 @@ class XFOrderedList : public XFList
 public:
     XFOrderedList()
     {
-        SetOrdered(sal_True);
+        SetOrdered(true);
     }
 };
 
-inline void XFList::SetOrdered(sal_Bool ordered)
+inline void XFList::SetOrdered(bool ordered)
 {
     m_bOrdered = ordered;
 }
 
-inline void XFList::SetContinueNumber(sal_Bool bContinueNumber)
+inline void XFList::SetContinueNumber(bool bContinueNumber)
 {
     m_bContinueNumber = bContinueNumber;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
index 7bcb17e77959..25b318dfdb64 100644
--- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
@@ -70,20 +70,20 @@ public:
     XFListItem();
 
 public:
-    void    SetIsHeader(sal_Bool isHeader=sal_True);
+    void    SetIsHeader(bool isHeader=true);
 
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
 private:
-    sal_Bool    m_bIsHeader;
+    bool    m_bIsHeader;
 };
 
 inline XFListItem::XFListItem()
 {
-    m_bIsHeader = sal_False;
+    m_bIsHeader = false;
 }
 
-inline void XFListItem::SetIsHeader(sal_Bool isHeader)
+inline void XFListItem::SetIsHeader(bool isHeader)
 {
     m_bIsHeader = isHeader;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
index a3ceea05f230..fd97d5ca918b 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
@@ -65,9 +65,9 @@ XFNumberStyle::XFNumberStyle():m_aColor(0,0,0),m_aNegativeColor(255,0,0)
     m_nDecimalDigits = 0;
     m_nMinInteger = 1;
     m_nMinExponent = 2;
-    m_bGroup = sal_False;
-    m_bRedIfNegative = sal_False;
-    m_bCurrencySymbolPost = sal_False;
+    m_bGroup = false;
+    m_bRedIfNegative = false;
+    m_bCurrencySymbolPost = false;
 }
 
 enumXFStyle XFNumberStyle::GetStyleFamily()
@@ -75,54 +75,54 @@ enumXFStyle XFNumberStyle::GetStyleFamily()
     return enumXFStyleNumber;
 }
 
-sal_Bool XFNumberStyle::Equal(IXFStyle *pStyle)
+bool XFNumberStyle::Equal(IXFStyle *pStyle)
 {
     if( !pStyle || pStyle->GetStyleFamily() != enumXFStyleNumber )
-        return sal_False;
+        return false;
     XFNumberStyle *pOther = (XFNumberStyle*)pStyle;
     if( !pOther )
-        return sal_False;
+        return false;
 
     if( m_eType != pOther->m_eType )
-        return sal_False;
+        return false;
     if( m_nDecimalDigits != pOther->m_nDecimalDigits )
-        return sal_False;
+        return false;
     if( m_nMinInteger != pOther->m_nMinInteger )
-        return sal_False;
+        return false;
     if( m_bRedIfNegative != pOther->m_bRedIfNegative )
-        return sal_False;
+        return false;
     if( m_bGroup != pOther->m_bGroup )
-        return sal_False;
+        return false;
     if( m_aColor != pOther->m_aColor )
-        return sal_False;
+        return false;
     if( m_strPrefix != pOther->m_strPrefix )
-        return sal_False;
+        return false;
     if( m_strSuffix != pOther->m_strSuffix )
-        return sal_False;
+        return false;
 
     //When category of number format is scientific, the number can not be displayed normally in table.
     if ( m_nMinExponent != pOther->m_nMinExponent )
-        return sal_False;
+        return false;
 
     if( m_bRedIfNegative )
     {
         if( m_aNegativeColor != pOther->m_aNegativeColor )
-            return sal_False;
+            return false;
         if( m_strNegativePrefix != pOther->m_strNegativePrefix )
-            return sal_False;
+            return false;
         if( m_strNegativeSuffix != pOther->m_strNegativeSuffix )
-            return sal_False;
+            return false;
     }
 
     if( m_eType == enuMXFNumberCurrency )
     {
         if( m_bCurrencySymbolPost != pOther->m_bCurrencySymbolPost )
-            return sal_False;
+            return false;
         if( m_strCurrencySymbol != pOther->m_strCurrencySymbol )
-            return sal_False;
+            return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 void XFNumberStyle::ToXml(IXFStream *pStrm)
@@ -218,7 +218,7 @@ void XFNumberStyle::ToXml_Normal(IXFStream *pStrm)
 {
     ToXml_StartElement(pStrm);
 
-    ToXml_Content(pStrm,sal_False);
+    ToXml_Content(pStrm,false);
 
     ToXml_EndElement(pStrm);
 }
@@ -237,7 +237,7 @@ void XFNumberStyle::ToXml_Negative(IXFStream *pStrm)
 
     ToXml_StartElement(pStrm);
 
-    ToXml_Content(pStrm,sal_True);
+    ToXml_Content(pStrm,true);
 
     pAttrList->Clear();
     pAttrList->AddAttribute( "style:condition", "value()>=0" );
@@ -248,7 +248,7 @@ void XFNumberStyle::ToXml_Negative(IXFStream *pStrm)
     ToXml_EndElement(pStrm);
 }
 
-void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive)
+void XFNumberStyle::ToXml_Content(IXFStream *pStrm, bool nagetive)
 {
     IXFAttrList *pAttrList = pStrm->GetAttrList();
     pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
index 3176f13491aa..739c1a31036d 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
@@ -77,7 +77,7 @@ public:
 
     void    SetMinExponent(sal_Int32 exponent);
 
-    void    SetGroup(sal_Bool group = sal_True);
+    void    SetGroup(bool group = true);
 
     void    SetColor(const XFColor& color);
     XFColor GetColor(){return m_aColor;}
@@ -90,11 +90,11 @@ public:
 
     void    SetNumberType(enumXFNumberType type);
 
-    void    SetCurrencySymbol(sal_Bool post, const OUString& symbol, sal_Bool bShowSpace=sal_False);
+    void    SetCurrencySymbol(bool post, const OUString& symbol, bool bShowSpace=false);
 
     virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
 
-    virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
 
     virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
@@ -107,21 +107,21 @@ protected:
 
     void    ToXml_Negative(IXFStream *pStrm);
 
-    void    ToXml_Content(IXFStream *pStrm, sal_Bool nagetive);
+    void    ToXml_Content(IXFStream *pStrm, bool nagetive);
 
 protected:
     enumXFNumberType    m_eType;
     sal_Int32   m_nDecimalDigits;
     sal_Int32   m_nMinInteger;
     sal_Int32   m_nMinExponent;
-    sal_Bool    m_bGroup;
+    bool    m_bGroup;
     XFColor     m_aColor;
-    sal_Bool    m_bCurrencySymbolPost;
+    bool    m_bCurrencySymbolPost;
     OUString   m_strCurrencySymbol;
     OUString   m_strPrefix;
     OUString   m_strSuffix;
 
-    sal_Bool    m_bRedIfNegative;
+    bool    m_bRedIfNegative;
     XFColor     m_aNegativeColor;
     OUString   m_strNegativePrefix;
     OUString   m_strNegativeSuffix;
@@ -144,13 +144,13 @@ inline void XFNumberStyle::SetMinExponent(sal_Int32 exponent)
 
 inline void XFNumberStyle::SetNegativeStyle(const OUString& prefix, const OUString& suffix, const XFColor& color)
 {
-    m_bRedIfNegative = sal_True;
+    m_bRedIfNegative = true;
     m_aNegativeColor = color;
     m_strNegativePrefix = prefix;
     m_strNegativeSuffix = suffix;
 }
 
-inline void XFNumberStyle::SetGroup(sal_Bool group)
+inline void XFNumberStyle::SetGroup(bool group)
 {
     m_bGroup = group;
 }
@@ -175,7 +175,7 @@ inline void XFNumberStyle::SetSurfix(const OUString& surfix)
     m_strSuffix = surfix;
 }
 
-inline void XFNumberStyle::SetCurrencySymbol(sal_Bool post, const OUString& symbol, sal_Bool bShowSpace)
+inline void XFNumberStyle::SetCurrencySymbol(bool post, const OUString& symbol, bool bShowSpace)
 {
     m_bCurrencySymbolPost = post;
     m_strCurrencySymbol = symbol;
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
index f37050278ff3..dcf78947de67 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
@@ -69,7 +69,7 @@
 #include "xfbgimage.hxx"
 
 XFPageMaster::XFPageMaster() : m_fPageWidth(0), m_fPageHeight(0), m_eUsage(enumXFPageUsageNone),
-m_eTextDir(enumXFTextDirNone), m_bPrintOrient(sal_True), m_pBorders(NULL), m_pShadow(NULL),
+m_eTextDir(enumXFTextDirNone), m_bPrintOrient(true), m_pBorders(NULL), m_pShadow(NULL),
 m_pColumns(NULL), m_pBGImage(NULL), m_pHeaderStyle(NULL), m_pFooterStyle(NULL),
 m_eSepAlign(enumXFAlignNone), m_fSepWidth(0), m_aSepColor(0), m_fSepSpaceAbove(0),
 m_fSepSpaceBelow(0), m_nSepLengthPercent(0)
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
index d8e8d465b671..3788d08afb27 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
@@ -89,7 +89,7 @@ public:
 
     void    SetPageUsage(enumXFPageUsage usage);
 
-    void    SetPrintOrient(sal_Bool bUseWidth=sal_True);
+    void    SetPrintOrient(bool bUseWidth=true);
 
     void    SetBorders(XFBorders *pBorders);
 
@@ -127,7 +127,7 @@ private:
 
     enumXFPageUsage m_eUsage;
     enumXFTextDir   m_eTextDir;
-    sal_Bool    m_bPrintOrient;
+    bool    m_bPrintOrient;
 
     XFBorders   *m_pBorders;
     XFShadow    *m_pShadow;
@@ -152,7 +152,7 @@ inline void XFPageMaster::SetPageUsage(enumXFPageUsage usage)
     this->m_eUsage = usage;
 }
 
-inline void XFPageMaster::SetPrintOrient(sal_Bool bUseWidth)
+inline void XFPageMaster::SetPrintOrient(bool bUseWidth)
 {
     m_bPrintOrient = bUseWidth;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
index eea2457c42de..cc2856a40ab7 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
@@ -100,7 +100,7 @@ void    XFParagraph::ToXml(IXFStream *pStrm)
     pStrm->EndElement( "text:p" );
 }
 
-sal_Bool XFParagraph::HasContents()
+bool XFParagraph::HasContents()
 {
     return GetCount()>0;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
index 5821c6c5be8f..7c154d34022a 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
@@ -79,7 +79,7 @@ public:
     virtual ~XFParagraph();
 
 public:
-    sal_Bool    HasContents();
+    bool    HasContents();
 
     virtual enumXFContent   GetContentType() SAL_OVERRIDE;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 6b943376e39b..4b6335e66ca5 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -68,17 +68,17 @@
 XFParaStyle::XFParaStyle()
     : m_eAlignType(enumXFAlignNone)
     , m_eLastLineAlign(enumXFAlignNone)
-    , m_bJustSingleWord(sal_False)
-    , m_bKeepWithNext(sal_False)
+    , m_bJustSingleWord(false)
+    , m_bKeepWithNext(false)
     , m_fTextIndent(0)
     , m_pFont(NULL)
     , m_pBorders(NULL)
     , m_pBGImage(NULL)
     , m_nPageNumber(0)
-    , m_bNumberLines(sal_True)
+    , m_bNumberLines(true)
     , m_nLineNumberRestart(0)
     , m_nFlag(0)
-    , m_bNumberRight(sal_False)
+    , m_bNumberRight(false)
 {
 }
 
@@ -302,102 +302,102 @@ void    XFParaStyle::AddTabStyle(enumXFTab type, double len, sal_Unicode leader,
 /**
  *Affirm whether two XFParaStyle objects are equal.
  */
-sal_Bool    XFParaStyle::Equal(IXFStyle *pStyle)
+bool    XFParaStyle::Equal(IXFStyle *pStyle)
 {
     if( this == pStyle )
-        return sal_True;
+        return true;
     if( !pStyle || pStyle->GetStyleFamily() != enumXFStylePara )
-        return sal_False;
+        return false;
 
     XFParaStyle *pOther = (XFParaStyle*)(pStyle);
     if( !pOther )
-        return sal_False;
+        return false;
 
     if( m_nFlag != pOther->m_nFlag )
-        return sal_False;
+        return false;
     if( m_strParentStyleName != pOther->m_strParentStyleName )
-        return sal_False;
+        return false;
     if( m_strMasterPage != pOther->m_strMasterPage )
-        return sal_False;
+        return false;
     if( m_fTextIndent != pOther->m_fTextIndent )
-        return sal_False;
+        return false;
     if( m_bJustSingleWord != pOther->m_bJustSingleWord )
-        return sal_False;
+        return false;
     if( m_bKeepWithNext != pOther->m_bKeepWithNext )
-        return sal_False;
+        return false;
     //line number:
     if( m_bNumberLines != pOther->m_bNumberLines )
-        return sal_False;
+        return false;
     if( m_nLineNumberRestart != pOther->m_nLineNumberRestart )
-        return sal_False;
+        return false;
     //align:
     if( m_eAlignType != pOther->m_eAlignType )
-        return sal_False;
+        return false;
     //last line align:
     if( m_eLastLineAlign != pOther->m_eLastLineAlign )
-        return sal_False;
+        return false;
 
     //shadow:
     if( m_aShadow != pOther->m_aShadow )
-        return sal_False;
+        return false;
     //margin:
     if( m_aMargin != pOther->m_aMargin )
-        return sal_False;
+        return false;
 
     if( m_aPadding != pOther->m_aPadding )
-        return sal_False;
+        return false;
 
     //dropcap:
     if( m_aDropcap != pOther->m_aDropcap )
-        return sal_False;
+        return false;
     //line height:
     if( m_aLineHeight != pOther->m_aLineHeight )
-        return sal_False;
+        return false;
     //breaks:
     if( m_aBreaks != pOther->m_aBreaks )
-        return sal_False;
+        return false;
     if( m_nPageNumber != pOther->m_nPageNumber )
-        return sal_False;
+        return false;
     if( m_aTabs != pOther->m_aTabs )
-        return sal_False;
+        return false;
 
     //font:
     if( m_pFont )
     {
         if( !pOther->m_pFont )
-            return sal_False;
+            return false;
         if(*m_pFont != *pOther->m_pFont )
-            return sal_False;
+            return false;
     }
     else if( pOther->m_pFont )
-        return sal_False;
+        return false;
 
     //border:
     if( m_pBorders )
     {
         if( !pOther->m_pBorders )
-            return sal_False;
+            return false;
         if( *m_pBorders != *pOther->m_pBorders )
-            return sal_False;
+            return false;
     }
     else if( pOther->m_pBorders )
-        return sal_False;
+        return false;
 
     if( m_pBGImage )
     {
         if( !pOther->m_pBGImage )
-            return sal_False;
+            return false;
         if( *m_pBGImage != *pOther->m_pBGImage )
-            return sal_False;
+            return false;
     }
     else if( pOther->m_pBGImage )
-        return sal_False;//add end
+        return false;//add end
 
     //number right
     if (    m_bNumberRight  != pOther->m_bNumberRight)
-        return sal_False;
+        return false;
 
-    return sal_True;
+    return true;
 }
 
 void    XFParaStyle::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index 766f402bd5a3..29a13b38db36 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -127,7 +127,7 @@ public:
     /**
      * @descr   Set line number style.
      */
-    void    SetLineNumber(sal_Bool show, sal_Int32 restart=1);
+    void    SetLineNumber(bool show, sal_Int32 restart=1);
     /**
      * @descr   Set the pading of the paragraph.This is the distance
                 between the border and the top of the text.
@@ -156,7 +156,7 @@ public:
                 eJustSingleWord If chars of the last-line'word should be
                 stretched.
      */
-    void    SetLastLineAlign(enumXFAlignType align,sal_Bool bJustSingleWord = sal_False);
+    void    SetLastLineAlign(enumXFAlignType align,bool bJustSingleWord = false);
 
     /**
      * @descr   Set the shadow of the paragraph.there is 4 postions, you
@@ -225,7 +225,7 @@ public:
      * descr    set the paragraph to be in the same page with the next paragraph.
      *          If that can't be insured,the paragraph will start with a new page.
      */
-    void    SetKeepWithNext(sal_Bool keepWithNext);
+    void    SetKeepWithNext(bool keepWithNext);
 
     sal_uInt32 GetFlag(){ return m_nFlag; }
 
@@ -233,19 +233,19 @@ public:
 
     virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
 
-    virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
 
     virtual void    ToXml(IXFStream *strm) SAL_OVERRIDE;
 
-    void SetNumberRight(sal_Bool bFlag){m_bNumberRight = bFlag;}
-    sal_Bool GetNumberRight(){return m_bNumberRight;}
+    void SetNumberRight(bool bFlag){m_bNumberRight = bFlag;}
+    bool GetNumberRight(){return m_bNumberRight;}
 
 protected:
     OUString   m_strMasterPage;
     enumXFAlignType m_eAlignType;
     enumXFAlignType m_eLastLineAlign;
-    sal_Bool        m_bJustSingleWord;
-    sal_Bool        m_bKeepWithNext;
+    bool        m_bJustSingleWord;
+    bool        m_bKeepWithNext;
 
     double      m_fTextIndent;
     XFColor     m_aBackColor;
@@ -260,11 +260,11 @@ protected:
     XFLineHeight m_aLineHeight;
     XFBreaks    m_aBreaks;
     sal_Int32   m_nPageNumber;
-    sal_Bool    m_bNumberLines;
+    bool    m_bNumberLines;
     sal_Int32   m_nLineNumberRestart;
 
     sal_uInt32  m_nFlag;
-    sal_Bool m_bNumberRight;
+    bool m_bNumberRight;
 };
 
 inline void XFParaStyle::SetMasterPage(const OUString& master)
@@ -283,7 +283,7 @@ inline void XFParaStyle::SetPageNumber(sal_Int32 num)
     m_nPageNumber = num;
 }
 
-inline void XFParaStyle::SetLineNumber(sal_Bool show, sal_Int32 restart)
+inline void XFParaStyle::SetLineNumber(bool show, sal_Int32 restart)
 {
     m_bNumberLines = show;
     m_nLineNumberRestart = restart;
@@ -311,13 +311,13 @@ inline void XFParaStyle::SetAlignType(enumXFAlignType eAlign)
     m_eAlignType = eAlign;
 }
 
-inline void XFParaStyle::SetLastLineAlign(enumXFAlignType align, sal_Bool   bJustSingleWord)
+inline void XFParaStyle::SetLastLineAlign(enumXFAlignType align, bool   bJustSingleWord)
 {
     m_eLastLineAlign = align;
     m_bJustSingleWord = bJustSingleWord;
 }
 
-inline void XFParaStyle::SetKeepWithNext(sal_Bool keep)
+inline void XFParaStyle::SetKeepWithNext(bool keep)
 {
     m_bKeepWithNext = keep;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index 131224f01b49..2b9c7c9b9774 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -61,8 +61,8 @@
 
 XFSection::XFSection()
 {
-    m_bProtected = sal_False;
-    m_bHiden = sal_False;
+    m_bProtected = false;
+    m_bHiden = false;
     m_strSectionName = XFGlobal::GenSectionName();
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index d75047f248f4..09733c65b7d7 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -85,8 +85,8 @@ public:
 
 private:
     OUString   m_strSectionName;
-    sal_Bool    m_bProtected;
-    sal_Bool    m_bHiden;
+    bool    m_bProtected;
+    bool    m_bHiden;
     XFColor     m_aBackColor;
     OUString   m_strSourceLink;
 };
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index daa85c00c5ef..866a433eb349 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -105,17 +105,17 @@ void    XFShadow::ToXml(IXFStream *pStrm)
         pAttrList->AddAttribute( "style:shadow", ToString() );
 }
 
-sal_Bool operator==(XFShadow& s1, XFShadow& s2)
+bool operator==(XFShadow& s1, XFShadow& s2)
 {
     if( (s1.m_ePosition == s2.m_ePosition) &&
         (s1.m_fOffset == s2.m_fOffset) &&
         (s1.m_aColor == s2.m_aColor)
         )
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
-sal_Bool operator!=(XFShadow& s1, XFShadow& s2)
+bool operator!=(XFShadow& s1, XFShadow& s2)
 {
     return !(s1==s2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
index 7300546cf3e2..ac2aa18ea72d 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
@@ -110,8 +110,8 @@ public:
 
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
-    friend sal_Bool operator==(XFShadow& s1, XFShadow& s2);
-    friend sal_Bool operator!=(XFShadow& s1, XFShadow& s2);
+    friend bool operator==(XFShadow& s1, XFShadow& s2);
+    friend bool operator!=(XFShadow& s1, XFShadow& s2);
 private:
     enumXFShadowPos m_ePosition;
     double          m_fOffset;
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
index 92476f89a17e..a9c46e27674b 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
@@ -98,8 +98,8 @@ void    XFStyle::SetStyleFamily(enumXFStyle family)
     m_enumFamily = family;
 }
 
-sal_Bool    XFStyle::Equal(IXFStyle * /*pStyle*/)
+bool    XFStyle::Equal(IXFStyle * /*pStyle*/)
 {
-    return sal_False;
+    return false;
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
index 6c1d28851d12..4ad31970ecc4 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
@@ -107,7 +107,7 @@ public:
     /**
      * @descr   decide whether two style are equal.
      */
-    virtual sal_Bool        Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool             Equal(IXFStyle *pStyle) SAL_OVERRIDE;
 
 protected:
     OUString   m_strStyleName;
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 38a7bd3f5144..9c93b05358d9 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -66,7 +66,7 @@
 XFTable::XFTable()
 {
     m_strName = XFGlobal::GenTableName();
-    m_bSubTable = sal_False;
+    m_bSubTable = false;
     m_pOwnerCell = NULL;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index 7210df3730e7..f44c55ed610a 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -104,7 +104,7 @@ public:
 
     sal_Int32   GetColumnCount();
 
-    sal_Bool    IsSubTable();
+    bool    IsSubTable();
 
     void        Normalize();
 
@@ -119,7 +119,7 @@ public:
 
 private:
     OUString   m_strName;
-    sal_Bool    m_bSubTable;
+    bool    m_bSubTable;
     XFCell      *m_pOwnerCell;
     XFContentContainer  m_aHeaderRows;
     std::map<sal_uInt16, XFRow*>  m_aRows;
@@ -140,7 +140,7 @@ inline void XFTable::SetOwnerCell(XFCell *pCell)
     m_bSubTable = (pCell!=NULL);
 }
 
-inline sal_Bool XFTable::IsSubTable()
+inline bool XFTable::IsSubTable()
 {
     return m_bSubTable;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index e3e592e803f1..aa623b90d248 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -78,30 +78,30 @@ void    XFTextStyle::SetFont(XFFont *font)
     m_pFont = font;
 }
 
-sal_Bool    XFTextStyle::Equal(IXFStyle *pStyle)
+bool    XFTextStyle::Equal(IXFStyle *pStyle)
 {
     if( !pStyle || pStyle->GetStyleFamily() != enumXFStyleText )
     {
-        return sal_False;
+        return false;
     }
 
     XFTextStyle *pOther = (XFTextStyle*)pStyle;
     if( !pOther )
     {
-        return sal_False;
+        return false;
     }
 
     if( m_pFont )
     {
         if( !pOther->m_pFont )
-            return sal_False;
+            return false;
         if( *m_pFont != *pOther->m_pFont )
-            return sal_False;
+            return false;
     }
     else if( pOther->m_pFont )
-        return sal_False;
+        return false;
 
-    return sal_True;
+    return true;
 }
 
 enumXFStyle XFTextStyle::GetStyleFamily()
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
index b7f7312c1655..f047536921f8 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
@@ -84,7 +84,7 @@ public:
 
     virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
 
-    virtual sal_Bool    Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool        Equal(IXFStyle *pStyle) SAL_OVERRIDE;
 
     virtual void        ToXml(IXFStream *strm) SAL_OVERRIDE;
 
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
index 1568e4c51b90..04d12b62c319 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
@@ -108,9 +108,9 @@ void    XFTimePart::ToXml(IXFStream *pStrm)
 
 XFTimeStyle::XFTimeStyle()
 {
-    m_bFixed = sal_True;
-    m_bAmPm = sal_False;
-    m_bTruncate = sal_True;
+    m_bFixed = true;
+    m_bAmPm = false;
+    m_bTruncate = true;
 }
 
 XFTimeStyle::~XFTimeStyle()
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
index 6bbac0c0c78f..09705e0263f8 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
@@ -71,20 +71,20 @@ public:
     XFDateTimePart()
     {
         m_ePart = enumXFDateUnknown;
-        m_bLongFmt = sal_False;
+        m_bLongFmt = false;
     }
 
     virtual ~XFDateTimePart(){}
 public:
     void    SetPartType(enumXFDatePart ePart);
 
-    void    SetLongFmt(sal_Bool bLongFmt);
+    void    SetLongFmt(bool bLongFmt);
 
     void    SetText(const OUString& text);
 
 protected:
     enumXFDatePart  m_ePart;
-    sal_Bool        m_bLongFmt;
+    bool        m_bLongFmt;
     OUString   m_strText;
 };
 
@@ -112,13 +112,13 @@ public:
 
 public:
 
-    void    AddHour( sal_Bool bLongFmt = sal_True );
+    void    AddHour( bool bLongFmt = true );
 
-    void    AddMinute( sal_Bool bLongFmt = sal_True );
+    void    AddMinute( bool bLongFmt = true );
 
-    void    AddSecond( sal_Bool bLongFmt = sal_True, sal_Int16 nDecimalPos = 2);
+    void    AddSecond( bool bLongFmt = true, sal_Int16 nDecimalPos = 2);
 
-    void    SetAmPm(sal_Bool bAmPm);
+    void    SetAmPm(bool bAmPm);
 
     void    AddText( const OUString& part );
 
@@ -126,13 +126,13 @@ public:
 
     virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
 
-    void    SetTruncate(sal_Bool bTrunc);
+    void    SetTruncate(bool bTrunc);
 
 private:
-    sal_Bool    m_bFixed;
-    sal_Bool    m_bAmPm;
+    bool    m_bFixed;
+    bool    m_bAmPm;
     std::vector<XFTimePart> m_aParts;
-    sal_Bool    m_bTruncate;
+    bool    m_bTruncate;
 };
 
 inline void XFDateTimePart::SetPartType(enumXFDatePart ePart)
@@ -140,7 +140,7 @@ inline void XFDateTimePart::SetPartType(enumXFDatePart ePart)
     m_ePart = ePart;
 }
 
-inline void XFDateTimePart::SetLongFmt(sal_Bool bLongFmt)
+inline void XFDateTimePart::SetLongFmt(bool bLongFmt)
 {
     m_bLongFmt = bLongFmt;
 }
@@ -155,7 +155,7 @@ inline void XFTimePart::SetDecimalPos(sal_Int32 pos)
     m_nDecimalPos = pos;
 }
 
-inline void XFTimeStyle::AddHour( sal_Bool bLongFmt )
+inline void XFTimeStyle::AddHour( bool bLongFmt )
 {
     XFTimePart  part;
     part.SetPartType(enumXFDateHour);
@@ -163,7 +163,7 @@ inline void XFTimeStyle::AddHour( sal_Bool bLongFmt )
     m_aParts.push_back(part);
 }
 
-inline void XFTimeStyle::AddMinute( sal_Bool bLongFmt )
+inline void XFTimeStyle::AddMinute( bool bLongFmt )
 {
     XFTimePart  part;
     part.SetPartType(enumXFDateMinute);
@@ -171,7 +171,7 @@ inline void XFTimeStyle::AddMinute( sal_Bool bLongFmt )
     m_aParts.push_back(part);
 }
 
-inline void XFTimeStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos)
+inline void XFTimeStyle::AddSecond( bool bLongFmt, sal_Int16 pos)
 {
     XFTimePart  part;
     part.SetPartType(enumXFDateSecond);
@@ -180,7 +180,7 @@ inline void XFTimeStyle::AddSecond( sal_Bool bLongFmt, sal_Int16 pos)
     m_aParts.push_back(part);
 }
 
-inline void XFTimeStyle::SetAmPm(sal_Bool bAmPm)
+inline void XFTimeStyle::SetAmPm(bool bAmPm)
 {
     m_bAmPm = bAmPm;
 }
@@ -193,7 +193,7 @@ inline void XFTimeStyle::AddText( const OUString& text )
     m_aParts.push_back(part);
 }
 
-inline  void    XFTimeStyle::SetTruncate(sal_Bool bTrunc)
+inline  void    XFTimeStyle::SetTruncate(bool bTrunc)
 {
     m_bTruncate = bTrunc;
 }
author	Noel Grandin <noel@peralex.com>	2014-04-22 14:14:14 +0200
committer	Noel Grandin <noel@peralex.com>	2014-04-23 11:11:50 +0200
commit	2692047aacef7b4288f995ce6ff2db5e16b71014 (patch)
tree	2d43552ad1a01cfb6287d54f35b5ae3ca538393b /lotuswordpro
parent	ca56379f27c53d4fa015d7adbb9494186f506de6 (diff)