sw: sal_Bool->bool

Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8

15 files changed, 64 insertions, 64 deletions

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index da7a93b1e42e..5a25c86a5fe4 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -628,7 +628,7 @@ public:
     void OutputItem( const SfxPoolItem& rHt );
 
     /// Use OutputItem() on an item set - for styles.
-    void OutputStyleItemSet( const SfxItemSet& rSet, sal_Bool bDeep, sal_Bool bTestForDefault );
+    void OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault );
 
     /// Output frames.
     void OutputFlyFrame( const sw::Frame& rFmt );
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 33219995f8da..1bc6305d33c3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7100,10 +7100,10 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
     const std::map< OUString, com::sun::star::uno::Any >& rMap = rItem.GetGrabBag();
 
     // get original values of theme-derived properties to check if they have changed during the edition
-    sal_Bool bWriteCSTheme = sal_True;
-    sal_Bool bWriteAsciiTheme = sal_True;
-    sal_Bool bWriteEastAsiaTheme = sal_True;
-    sal_Bool bWriteThemeFontColor = sal_True;
+    bool bWriteCSTheme = true;
+    bool bWriteAsciiTheme = true;
+    bool bWriteEastAsiaTheme = true;
+    bool bWriteThemeFontColor = true;
     OUString sOriginalValue;
     for ( std::map< OUString, com::sun::star::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i )
     {
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 862b1283e458..c6572c4a888d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -360,7 +360,7 @@ void RtfAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
         const SwTxtNode* pTxtNode = static_cast< SwTxtNode* >( &aNextIndex.GetNode() );
         m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode );
         // Save the current page description for now, so later we will be able to access the previous one.
-        m_pPrevPageDesc = pTxtNode->FindPageDesc(sal_False);
+        m_pPrevPageDesc = pTxtNode->FindPageDesc(false);
     }
     else if ( aNextIndex.GetNode().IsTableNode() )
     {
@@ -2941,7 +2941,7 @@ void RtfAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
     if ( m_rExport.bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax )
     {
         SwSurround eSurround = rSurround.GetSurround();
-        sal_Bool bGold = SURROUND_IDEAL == eSurround;
+        bool bGold = SURROUND_IDEAL == eSurround;
         if( bGold )
             eSurround = SURROUND_PARALLEL;
         RTFSurround aMC( bGold, static_cast< sal_uInt8 >(eSurround) );
@@ -3191,7 +3191,7 @@ void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& r
     if( bEven )
     {
         m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLSX );
-        m_rExport.OutLong( rCol.GetGutterWidth( sal_True ) );
+        m_rExport.OutLong( rCol.GetGutterWidth( true ) );
     }
     else
     {
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index c02dbea45904..ceea59d6b7ef 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -970,11 +970,11 @@ namespace sw
             return nKey;
         }
 
-        sal_Bool IsPreviousAM(OUString& rParams, sal_Int32 nPos)
+        bool IsPreviousAM(OUString& rParams, sal_Int32 nPos)
         {
             return nPos>=2 && rParams.matchIgnoreAsciiCase("am", nPos-2);
         }
-        sal_Bool IsNextPM(OUString& rParams, sal_Int32 nPos)
+        bool IsNextPM(OUString& rParams, sal_Int32 nPos)
         {
             return nPos+2<rParams.getLength() && rParams.matchIgnoreAsciiCase("pm", nPos+1);
         }
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 505b80cb262b..db1655836c0f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -3135,12 +3135,12 @@ sal_uInt32 SwMSConvertControls::GenerateObjectID()
 
 // in transitioning away old filter for ole/ocx controls, ReadOCXStream has been made pure virtual in
 // filter/source/msocximex.cxx, so.. we need an implementation here
-sal_Bool  SwMSConvertControls::ReadOCXStream( SotStorageRef& rSrc1,
+bool  SwMSConvertControls::ReadOCXStream( SotStorageRef& rSrc1,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef,
-        sal_Bool bFloatingCtrl )
+        bool bFloatingCtrl )
 {
     uno::Reference< form::XFormComponent > xFComp;
-    sal_Bool bRes = oox::ole::MSConvertOCXControls::ReadOCXStorage( rSrc1, xFComp );
+    bool bRes = oox::ole::MSConvertOCXControls::ReadOCXStorage( rSrc1, xFComp );
     if ( bRes && xFComp.is() )
     {
         com::sun::star::awt::Size aSz;  // not used in import
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 50243332ae98..a2c5083d53a0 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -402,7 +402,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
     //The hard formatting properties that affect the entire paragraph
     if (rNd.HasSwAttrSet())
     {
-        sal_Bool bDeep = sal_False;
+        bool bDeep = false;
         // only copy hard attributes - bDeep = false
         aExportSet.Set(rNd.GetSwAttrSet(), bDeep);
         // get the current font item. Use rNd.GetSwAttrSet instead of aExportSet:
@@ -2846,7 +2846,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
             {
                 /* Munge flys in fly into absolutely positioned elements for word 6 */
                 const SwTxtNode* pParTxtNode = rAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
-                const SwRect aPageRect = pParTxtNode->FindPageFrmRect( sal_False, 0, sal_False );
+                const SwRect aPageRect = pParTxtNode->FindPageFrmRect( false, 0, false );
 
                 aOffset = rFrmFmt.FindLayoutRect().Pos();
                 aOffset -= aPageRect.Pos();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 0d1e9c8aac2b..718761ae5bc5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2552,7 +2552,7 @@ void MSWordExportBase::WriteText()
         {
             SwCntntNode* pCNd = (SwCntntNode*)pNd;
 
-            const SwPageDesc* pTemp = pNd->FindPageDesc(sal_False);
+            const SwPageDesc* pTemp = pNd->FindPageDesc(false);
             if ( pTemp )
                 pAktPageDesc = pTemp;
 
@@ -2582,7 +2582,7 @@ void MSWordExportBase::WriteText()
                 && (rSect.GetType() != TOX_CONTENT_SECTION && rSect.GetType() != TOX_HEADER_SECTION )) //No sections in table
             {
                 //#120140# Do not need to insert a page/section break after a section end. Check this case first
-                sal_Bool bNeedExportBreakHere = sal_True;
+                bool bNeedExportBreakHere = true;
                 if ( aIdx.GetNode().IsTxtNode() )
                 {
                     SwTxtNode *pTempNext = aIdx.GetNode().GetTxtNode();
@@ -2593,7 +2593,7 @@ void MSWordExportBase::WriteText()
                             && pTempItem && ((SwFmtPageDesc*)pTempItem)->GetRegisteredIn())
                         {
                             //Next node has a new page style which means this node is a section end. Do not insert another page/section break here
-                            bNeedExportBreakHere = sal_False;
+                            bNeedExportBreakHere = false;
                         }
                     }
                 }
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b82ea5c7285d..f2df0f1314b3 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -417,7 +417,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     //section.
     bool bBreakSet = false;
 
-    const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False);
+    const SwPageDesc * pPageDesc = rNd.FindPageDesc(false);
 
     // Even if pAktPageDesc != pPageDesc ,it might be because of the different header & footer types.
     if (pAktPageDesc != pPageDesc)
@@ -5461,7 +5461,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
     }
 }
 
-void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, sal_Bool bDeep, sal_Bool bTestForDefault )
+void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault )
 {
     // based on OutputItemSet() from wrt_fn.cxx
 
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 6879a57ec187..4f1b98ca1cd2 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2092,7 +2092,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
     OSL_ENSURE(pRecord || pFSPA, "give me something! to work with for anchoring");
     if (!pRecord && !pFSPA)
         return FLY_AT_PAGE;
-    sal_Bool bCurSectionVertical = maSectionManager.CurrentSectionIsVertical();
+    bool bCurSectionVertical = maSectionManager.CurrentSectionIsVertical();
 
     SvxMSDffImportRec aRecordFromFSPA;
     if (!pRecord)
@@ -2540,7 +2540,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     // inside table cell and its wrapping isn't 'SURROUND_THROUGH'
     if (bLayoutInTableCell && eSurround != SURROUND_THROUGHT)
     {
-        SwFmtFollowTextFlow aFollowTextFlow( sal_True );
+        SwFmtFollowTextFlow aFollowTextFlow( true );
         aFlySet.Put( aFollowTextFlow );
     }
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4ebfff78891f..a8c01e9efecb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -145,7 +145,7 @@ using namespace nsHdFtFlags;
 /** Expands to the size of a STATIC data array. */
 //#define STATIC_TABLE_SIZE( array )  (sizeof(array)/sizeof(*(array)))
 
-SwMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate )             // static
+SwMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate )             // static
 {
     if ( pObj )
     {
@@ -1204,7 +1204,7 @@ void SwWW8FltControlStack::NewAttr(const SwPosition& rPos,
 }
 
 SwFltStackEntry* SwWW8FltControlStack::SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId,
-    sal_Bool bTstEnde, long nHand, sal_Bool )
+    bool bTstEnde, long nHand, bool )
 {
     SwFltStackEntry *pRet = NULL;
     // Doing a textbox, and using the control stack only as a temporary
@@ -1940,7 +1940,7 @@ void SwWW8ImplReader::ImportDop()
         {
             uno::Reference<beans::XPropertySetInfo> xInfo =
                 xDocProps->getPropertySetInfo();
-            sal_Bool bValue = false;
+            bool bValue = false;
             if (xInfo.is())
             {
                 if (xInfo->hasPropertyByName("ApplyFormDesignMode"))
@@ -4355,7 +4355,7 @@ bool wwSectionManager::IsNewDoc() const
 void wwSectionManager::InsertSegments()
 {
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    bool bUseEnhFields = rOpt.IsUseEnhancedFields();
     mySegIter aEnd = maSegments.end();
     mySegIter aStart = maSegments.begin();
     for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
@@ -6156,12 +6156,12 @@ int WW8Reader::GetReaderType()
     return SW_STORAGE_READER | SW_STREAM_READER;
 }
 
-sal_Bool WW8Reader::HasGlossaries() const
+bool WW8Reader::HasGlossaries() const
 {
     return true;
 }
 
-sal_Bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, sal_Bool bSaveRelFiles) const
+bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const
 {
     bool bRet=false;
 
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 275d43c8b9ab..0fc5859bec1d 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -145,8 +145,8 @@ class WW8Reader : public StgReader
 public:
     virtual int GetReaderType() SAL_OVERRIDE;
 
-    virtual sal_Bool HasGlossaries() const SAL_OVERRIDE;
-    virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const SAL_OVERRIDE;
+    virtual bool HasGlossaries() const SAL_OVERRIDE;
+    virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const SAL_OVERRIDE;
 };
 
 class SwWW8ImplReader;
@@ -349,7 +349,7 @@ public:
 
     void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr);
 
-    virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand=LONG_MAX, sal_Bool consumedByField=sal_False) SAL_OVERRIDE;
+    virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) SAL_OVERRIDE;
 
     void SetToggleAttr(sal_uInt8 nId, bool bOn)
     {
@@ -641,7 +641,7 @@ public:
     std::vector<OUString> maListEntries;
     virtual ~WW8FormulaControl() {}
     void FormulaRead(SwWw8ControlType nWhich,SvStream *pD);
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> &rFComp,
@@ -659,7 +659,7 @@ private:
 public:
     WW8FormulaCheckBox(SwWW8ImplReader &rR);
 
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> &rFComp,
@@ -676,7 +676,7 @@ private:
 public:
     WW8FormulaListBox(SwWW8ImplReader &rR);
 
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> &rFComp,
@@ -692,28 +692,28 @@ private:
 public:
     WW8FormulaEditBox(SwWW8ImplReader &rR);
     //no real implementation, return false
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> & /* rFComp */,
-        com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return sal_False; }
+        com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return false; }
 };
 
 class SwMSConvertControls: public oox::ole::MSConvertOCXControls
 {
 public:
     SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP );
-    virtual sal_Bool InsertFormula( WW8FormulaControl &rFormula);
+    virtual bool InsertFormula( WW8FormulaControl &rFormula);
     virtual bool InsertControl(const com::sun::star::uno::Reference<
         com::sun::star::form::XFormComponent >& rFComp,
         const ::com::sun::star::awt::Size& rSize,
         com::sun::star::uno::Reference <
         com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE;
     bool ExportControl(WW8Export &rWrt, const SdrObject *pObj);
-    virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1,
+    virtual bool ReadOCXStream( SotStorageRef& rSrc1,
         com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > *pShapeRef=0,
-        sal_Bool bFloatingCtrl=false );
+        bool bFloatingCtrl=false );
 private:
     sal_uInt32 GenerateObjectID();
     SwPaM *pPaM;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6b3cd27efa3e..e017515a259d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2326,7 +2326,7 @@ void WW8TabDesc::CreateSwTable()
     // rows of a band can be duplicated easy.
     pTable = pIo->rDoc.InsertTable(
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
-            *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, sal_False, sal_True );
+            *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, false, true );
 
     OSL_ENSURE(pTable && pTable->GetFrmFmt(), "insert table failed");
     if (!pTable || !pTable->GetFrmFmt())
@@ -3363,7 +3363,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
             }
             // #i33818# - The nested table doesn't have to leave
             // the table cell. Thus, the Writer fly frame has to follow the text flow.
-            pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( sal_True ) );
+            pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( true ) );
         }
         else
             pTableDesc->SetSizePosition(0);
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 50d23948ab8f..a838b6d87801 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -118,7 +118,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
     */
 
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    const sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    const bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     if (!bUseEnhFields)
     {
@@ -179,7 +179,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr )
     if (rStr[pF->nLCode-1]==0x01)
         ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_CHECKBOX);
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    const sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    const bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     if (!bUseEnhFields)
     {
@@ -236,7 +236,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
         ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_DROPDOWN);
 
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     if (!bUseEnhFields)
     {
@@ -2123,23 +2123,23 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
     return(bRet);
 }
 
-sal_Bool SwMSConvertControls::InsertFormula(WW8FormulaControl &rFormula)
+bool SwMSConvertControls::InsertFormula(WW8FormulaControl &rFormula)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     const uno::Reference< lang::XMultiServiceFactory > & rServiceFactory =
         GetServiceFactory();
 
     if(!rServiceFactory.is())
-        return sal_False;
+        return false;
 
     awt::Size aSz;
     uno::Reference< form::XFormComponent> xFComp;
 
-    if (sal_True == (bRet = rFormula.Import(rServiceFactory, xFComp, aSz)))
+    if ((bRet = rFormula.Import(rServiceFactory, xFComp, aSz)))
     {
         uno::Reference <drawing::XShape> xShapeRef;
-        if (sal_True == (bRet = InsertControl(xFComp, aSz, &xShapeRef, false)))
+        if ((bRet = InsertControl(xFComp, aSz, &xShapeRef, false)))
             GetShapes()->add(xShapeRef);
     }
     return bRet;
@@ -2395,17 +2395,17 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString,
     return aRet;
 }
 
-sal_Bool WW8FormulaListBox::Import(const uno::Reference <
+bool WW8FormulaListBox::Import(const uno::Reference <
     lang::XMultiServiceFactory> &rServiceFactory,
     uno::Reference <form::XFormComponent> &rFComp,awt::Size &rSz )
 {
     uno::Reference<uno::XInterface> xCreate = rServiceFactory->createInstance("com.sun.star.form.component.ComboBox");
     if( !xCreate.is() )
-        return sal_False;
+        return false;
 
     rFComp = uno::Reference<form::XFormComponent>(xCreate, uno::UNO_QUERY);
     if( !rFComp.is() )
-        return sal_False;
+        return false;
 
     uno::Reference<beans::XPropertySet> xPropSet(xCreate, uno::UNO_QUERY);
 
@@ -2422,7 +2422,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
         xPropSet->setPropertyValue("HelpText", aTmp );
     }
 
-    sal_Bool bDropDown(sal_True);
+    bool bDropDown(true);
     xPropSet->setPropertyValue("Dropdown", css::uno::makeAny(bDropDown));
 
     if (!maListEntries.empty())
@@ -2456,7 +2456,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
         rSz = rRdr.MiserableDropDownFormHack(OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet);
     }
 
-    return sal_True;
+    return true;
 }
 
 WW8FormulaCheckBox::WW8FormulaCheckBox(SwWW8ImplReader &rR)
@@ -2487,17 +2487,17 @@ static void lcl_AddToPropertyContainer
     xPropSet->setPropertyValue(rPropertyName, aAnyValue );
 }
 
-sal_Bool WW8FormulaCheckBox::Import(const uno::Reference <
+bool WW8FormulaCheckBox::Import(const uno::Reference <
     lang::XMultiServiceFactory> &rServiceFactory,
     uno::Reference <form::XFormComponent> &rFComp,awt::Size &rSz )
 {
     uno::Reference< uno::XInterface > xCreate = rServiceFactory->createInstance("com.sun.star.form.component.CheckBox");
     if( !xCreate.is() )
-        return sal_False;
+        return false;
 
     rFComp = uno::Reference< form::XFormComponent >( xCreate, uno::UNO_QUERY );
     if( !rFComp.is() )
-        return sal_False;
+        return false;
 
     uno::Reference< beans::XPropertySet > xPropSet( xCreate, uno::UNO_QUERY );
 
@@ -2520,7 +2520,7 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference <
     if (!sHelp.isEmpty())
         lcl_AddToPropertyContainer(xPropSet, "HelpF1Text", sHelp);
 
-    return sal_True;
+    return true;
 
 }
 
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a5ecce5d0882..45c877105e26 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -468,7 +468,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
         return nRet;
 
     const SvtFilterOptions &rOpt = SvtFilterOptions::Get();
-    sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     OSL_ENSURE(!maFieldStack.empty(), "Empty field stack\n");
     if (!maFieldStack.empty())
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3293e75181e8..90dbe058d59d 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -239,11 +239,11 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
             //fall-through
         case 3:
             eType = GRID_LINES_CHARS;
-            aGrid.SetSnapToChars(sal_True);
+            aGrid.SetSnapToChars(true);
             break;
         case 1:
             eType = GRID_LINES_CHARS;
-            aGrid.SetSnapToChars(sal_False);
+            aGrid.SetSnapToChars(false);
             break;
         case 2:
             eType = GRID_LINES_ONLY;
@@ -258,7 +258,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
         rDoc.set(IDocumentSettingAccess::ADD_EXT_LEADING, false);
 
     //force to set document as standard page mode
-    sal_Bool bSquaredMode = sal_False;
+    bool bSquaredMode = false;
     rDoc.SetDefaultPageMode( bSquaredMode );
     aGrid.SetSquaredMode( bSquaredMode );
 
@@ -2017,7 +2017,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
     //we no longer need to hack around the header/footer problems
     SwFmtSurround aSurround(pFS->eSurround);
     if ( pFS->eSurround == SURROUND_IDEAL )
-        aSurround.SetAnchorOnly( sal_True );
+        aSurround.SetAnchorOnly( true );
     Put( aSurround );
 
     short aSizeArray[5]={0};
@@ -3306,7 +3306,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh
     {
         if ( pAktColl ) //importing style
         {
-            if( SFX_ITEM_SET == pAktColl->GetItemState( RES_CHRATR_UNDERLINE, sal_False ) )
+            if( SFX_ITEM_SET == pAktColl->GetItemState( RES_CHRATR_UNDERLINE, false ) )
             {
                 const SwAttrSet& aSet = pAktColl->GetAttrSet();
                 SvxUnderlineItem *pUnderline