bool improvements

Change-Id: I7b149b16a362473179a383ff1bb16f428f755f31

7 files changed, 26 insertions, 26 deletions

diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx
index 72544255a35f..cc8f34cc3d7f 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -153,7 +153,7 @@ Decompression::Decompression(SvStream * pInStream, SvStream * pOutStream)
 {
     if (!m_pInStream || !m_pOutStream )
     {
-        assert(sal_False);
+        assert(false);
     }
     ConstructTree1();
     ConstructTree2();
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index c7cb6a06d1a8..75e5816a78cb 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -193,7 +193,7 @@ void LwpCellLayout::ApplyBorders(XFCellStyle *pCellStyle)
     case enumWholeBorder:
         break;
     default:
-        assert(sal_False);
+        assert(false);
     }
     pCellStyle->SetBorders(pBorders);
 }
@@ -314,7 +314,7 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uI
     LwpTable * pTable = dynamic_cast<LwpTable *>(aTableID.obj());
     if (!pTable)
     {
-        assert(sal_False);
+        assert(false);
         return NULL;
     }
     XFCell * pXFCell = new XFCell();
@@ -363,7 +363,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
     LwpTable *pTable = GetTable();
     if (!pTable)
     {
-        assert(sal_False);
+        assert(false);
         return NULL;
     }
     sal_uInt16 nRow = crowid;
@@ -403,7 +403,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
     LwpTableLayout * pTableLayout = GetTableLayout();
     if (!pTableLayout)
     {
-        assert(sal_False);
+        assert(false);
         return NULL;
     }
     return pTableLayout->SearchCellStoryMap(nRow, nCol);
@@ -420,7 +420,7 @@ LwpCellBorderType LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 n
 {
     if (!pTableLayout)
     {
-        assert(sal_False);
+        assert(false);
         return enumWholeBorder;
     }
 
@@ -552,7 +552,7 @@ void LwpCellLayout::RegisterDefaultCell()
                 pBorders->SetWidth(enumXFBorderLeft, 0);
                 break;
             default:
-                assert(sal_False);
+                assert(false);
             }
             pCellStyle->SetBorders(pBorders);
         }
@@ -616,7 +616,7 @@ void LwpCellLayout::Read()
     // before the layout hierarchy rework
     if (LwpFileHeader::m_nFileRevision  < 0x000b)
     {
-        assert(sal_False);
+        assert(false);
     }
     else
     {
@@ -711,7 +711,7 @@ LwpCellBorderType LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
 {
     if (!pTableLayout)
     {
-        assert(sal_False);
+        assert(false);
         return enumWholeBorder;
     }
 
@@ -895,7 +895,7 @@ XFCell* LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow,
     }
     else
     {
-        assert(sal_False);
+        assert(false);
     }
     return pXFCell;
 }
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 0818f3f3bc8b..d9128f15a863 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1020,11 +1020,11 @@ sal_Int32 LwpMiddleLayout::DetermineWidth()
 {
     if (IsSizeRightToContent())
     {
-        assert(sal_False);
+        assert(false);
     }
     else if (IsSizeRightToContainer())
     {
-        assert(sal_False);
+        assert(false);
     }
     else
     {
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 3ea1ab3b571f..c40c37606b0b 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -218,13 +218,13 @@ double LwpSuperTableLayout::GetTableWidth()
         LwpTableLayout* pTableLayout = GetTableLayout();
         if(!pTableLayout)
         {
-            assert(sal_False);
+            assert(false);
             return 0;
         }
         LwpTable *pTable = pTableLayout->GetTable();
         if(!pTable)
         {
-            assert(sal_False);
+            assert(false);
             return 0;
         }
         double dDefaultWidth = pTable->GetWidth();
@@ -533,7 +533,7 @@ OUString LwpTableLayout::GetColumnWidth(sal_uInt16 nCol)
 {
     if (nCol >= m_nCols)
     {
-        assert(sal_False);
+        assert(false);
         return m_DefaultColumnStyleName;
     }
 
@@ -601,7 +601,7 @@ void LwpTableLayout::RegisterColumns()
         {
             // this can't happen
             dTableWidth = dDefaultColumn;
-            assert(sal_False);
+            assert(false);
         }
     }
 
@@ -645,7 +645,7 @@ void LwpTableLayout::RegisterRows()
     LwpTable * pTable = GetTable();
     if (pTable == NULL)
     {
-        assert(sal_False);
+        assert(false);
         return;
     }
 
@@ -684,7 +684,7 @@ void LwpTableLayout::RegisterStyle()
     LwpSuperTableLayout * pSuper = GetSuperTableLayout();
     if(!pSuper)
     {
-        assert(sal_False);
+        assert(false);
         return;
     }
 
@@ -692,7 +692,7 @@ void LwpTableLayout::RegisterStyle()
     LwpTable * pTable = GetTable();
     if (pTable == NULL)
     {
-        assert(sal_False);
+        assert(false);
         return;
     }
 
@@ -767,7 +767,7 @@ void LwpTableLayout::ParseTable()
     LwpSuperTableLayout * pSuper = GetSuperTableLayout();
     if(!pSuper)
     {
-        assert(sal_False);
+        assert(false);
         return;
     }
 
@@ -812,7 +812,7 @@ void LwpTableLayout::Read()
     // before layout hierarchy rework!
     if(LwpFileHeader::m_nFileRevision < 0x000b)
     {
-        assert(sal_False);
+        assert(false);
     }
     m_ColumnLayout.ReadIndexed(m_pObjStrm);
 
@@ -1241,7 +1241,7 @@ void LwpTableLayout::ConvertColumn(XFTable *pXFTable,sal_uInt8 nStartCol,sal_uIn
     LwpTable * pTable = GetTable();
     if (!pTable)
     {
-        assert(sal_False);
+        assert(false);
         return;
     }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index 308dbea736ad..091955328b75 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -137,7 +137,7 @@ bool operator==(XFBGImage& img1, XFBGImage& img2)
     else
     {
         //I'll not compare the content of the two buffer,it's time comsuming.
-        return sal_False;
+        return false;
     }
     if( img1.m_bPosition != img2.m_bPosition )
         return false;
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 228cbbb0f62a..975429ba9491 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -176,7 +176,7 @@ bool operator==(XFBorder& b1, XFBorder& b2)
             return false;
     }
     if( b1.m_aColor != b2.m_aColor )
-        return sal_False;
+        return false;
     return true;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index bb6a972f6988..0ebaf489e18c 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -64,8 +64,8 @@ XFIndex::XFIndex()
 {
     m_pTitle = NULL;
     m_eType = enumXFIndexTOC;
-    m_bProtect = sal_True;
-    m_bSeparator = sal_False;
+    m_bProtect = true;
+    m_bSeparator = false;
     m_nMaxLevel = 0;
 
     for(sal_uInt16 i=1;i<MAX_TOC_LEVEL+1;i++)