sw: sal_Bool->bool

Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8

34 files changed, 136 insertions, 136 deletions

diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index 319dea512e90..2153b5800ca3 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -25,7 +25,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) :
+SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, bool bAutoload ) throw ( uno::RuntimeException ) :
     SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload )
 {
 }
@@ -67,7 +67,7 @@ sal_Bool SAL_CALL SwVbaAddin::getInstalled() throw (uno::RuntimeException, std::
 
 void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed ) throw (uno::RuntimeException, std::exception)
 {
-    if( _installed != mbInstalled )
+    if( _installed != (mbInstalled ? 1 : 0) )
     {
         mbInstalled = _installed;
         // TODO: should call AutoExec and AutoExit etc.
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index 9dd8ad8cd876..2573ee0c583a 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -29,11 +29,11 @@ class SwVbaAddin : public SwVbaAddin_BASE
 {
 private:
     OUString msFileURL;
-    sal_Bool mbAutoload;
-    sal_Bool mbInstalled;
+    bool mbAutoload;
+    bool mbInstalled;
 
 public:
-    SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException );
+    SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, bool bAutoload ) throw ( css::uno::RuntimeException );
     virtual ~SwVbaAddin();
 
     // Attributes
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index cb199e55ae9a..0531edbf8512 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -46,7 +46,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u
             OUString sUrl = sEntries[ index ];
             if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
             {
-                maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, sal_True ) ) );
+                maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, true ) ) );
             }
         }
     }
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index e6bf8707b043..44c0ca61681d 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -50,7 +50,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R
         xTC->goRight( 1, sal_True );
         xTC->setString( OUString("") ); // remove marker
         // remove the blank paragraph if it is a rich text
-        sal_Bool bRich = sal_False;
+        bool bRich = false;
         _richtext >>= bRich;
         if( bRich )
         {
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 9c6bdd2c0165..8e8e65f4f56a 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -200,7 +200,7 @@ SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeEx
 sal_Bool SAL_CALL
 SwVbaBookmarks::Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bExist = m_xNameAccess->hasByName( rName );
+    bool bExist = m_xNameAccess->hasByName( rName );
     return bExist;
 }
 
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 75d0aa6cd2cd..35ea653e51e0 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -77,7 +77,7 @@ SwVbaDocument::getContent() throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
     uno::Reference< text::XTextRange > xEnd;
-    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, sal_True ) );
+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, true ) );
 }
 
 uno::Reference< word::XRange > SAL_CALL
@@ -325,7 +325,7 @@ void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( sal_Bool /*_updatestylesonop
 sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation() throw (uno::RuntimeException, std::exception)
 {
     // check this property only in default paragraph style
-    sal_Bool IsAutoHyphenation = sal_False;
+    bool IsAutoHyphenation = false;
     uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
     xParaProps->getPropertyValue("ParaIsHyphenation") >>= IsAutoHyphenation;
     return IsAutoHyphenation;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 9dddd9467a98..4c931e5e24c7 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -310,7 +310,7 @@ public:
                 SwFEShell* pFEShell = mpDocShell->GetFEShell();
                 if(pFEShell)
                 {
-                    aReturn <<= pFEShell->GetLineCount(sal_False);
+                    aReturn <<= pFEShell->GetLineCount(false);
                 }
             }
         }
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 62f41724d97a..aa3e5df97c99 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -117,9 +117,9 @@ uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::Runt
     return xFoundOne;
 }
 
-sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
+bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
 {
-    sal_Bool result = sal_False;
+    bool result = false;
 
     // TODO: map wildcards in area to OOo wildcards
 
@@ -129,7 +129,7 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
         {
             case word::WdReplace::wdReplaceNone:
             {
-                result = sal_True;
+                result = true;
                 break;
             }
             case word::WdReplace::wdReplaceOne:
@@ -153,7 +153,7 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
                         if( mnWrap == word::WdFindWrap::wdFindContinue || mnWrap == word::WdFindWrap::wdFindAsk || InRange( xTextRange ) )
                         {
                             xTextRange->setString( GetReplaceWith() );
-                            result = sal_True;
+                            result = true;
                         }
                     }
                 }
@@ -161,7 +161,7 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
             }
             default:
             {
-                result = sal_False;
+                result = false;
             }
         }
     }
@@ -197,14 +197,14 @@ void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) thr
 
 sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bBackward = sal_False;
+    bool bBackward = false;
     mxPropertyReplace->getPropertyValue("SearchBackwards") >>= bBackward;
     return !bBackward;
 }
 
 void SAL_CALL SwVbaFind::setForward( sal_Bool _forward ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bBackward = !_forward;
+    bool bBackward = !_forward;
     mxPropertyReplace->setPropertyValue("SearchBackwards", uno::makeAny( bBackward ) );
 }
 
@@ -232,7 +232,7 @@ void SAL_CALL SwVbaFind::setFormat( sal_Bool _format ) throw (uno::RuntimeExcept
 
 sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchCaseSensitive") >>= value;
     return value;
 }
@@ -244,7 +244,7 @@ void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase ) throw (uno::Runtime
 
 sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchWords") >>= value;
     return value;
 }
@@ -256,7 +256,7 @@ void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword ) throw (un
 
 sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchRegularExpression") >>= value;
     return value;
 }
@@ -268,7 +268,7 @@ void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards ) throw (un
 
 sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
     return value;
 }
@@ -281,7 +281,7 @@ void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (
 
 sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
     if( value )
         mxPropertyReplace->getPropertyValue("SearchSimilarityRelax") >>= value;
@@ -308,7 +308,7 @@ void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::Run
 sal_Bool SAL_CALL
 SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool result = sal_False;
+    bool result = false;
     if( FindText.hasValue() )
     {
         OUString sText;
@@ -316,7 +316,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u
         setText( sText );
     }
 
-    sal_Bool bValue = sal_False;
+    bool bValue = false;
     if( MatchCase.hasValue() )
     {
         MatchCase >>= bValue;
diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx
index d2b69ce35a06..f2ff6bbbc141 100644
--- a/sw/source/ui/vba/vbafind.hxx
+++ b/sw/source/ui/vba/vbafind.hxx
@@ -51,7 +51,7 @@ private:
     void SetReplaceWith( const OUString& rText ) throw ( css::uno::RuntimeException );
     OUString GetReplaceWith() throw ( css::uno::RuntimeException );
     css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException );
-    sal_Bool SearchReplace() throw ( css::uno::RuntimeException );
+    bool SearchReplace() throw ( css::uno::RuntimeException );
 
 public:
     SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index fd2922f44ba5..d75b5226c4f8 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -163,7 +163,7 @@ SwVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception )
 uno::Any SAL_CALL
 SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getSubscript() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -173,7 +173,7 @@ SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
 uno::Any SAL_CALL
 SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getSuperscript() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -183,7 +183,7 @@ SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
 uno::Any SAL_CALL
 SwVbaFont::getBold() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getBold() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -193,7 +193,7 @@ SwVbaFont::getBold() throw (uno::RuntimeException, std::exception)
 uno::Any SAL_CALL
 SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getItalic() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -203,7 +203,7 @@ SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception)
 uno::Any SAL_CALL
 SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getStrikethrough() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -213,7 +213,7 @@ SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception)
 uno::Any SAL_CALL
 SwVbaFont::getShadow() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getShadow() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index 66d0e3afae0d..f12ce3d9f7bf 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -29,7 +29,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, sal_Bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
+SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
 {
 }
 
diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx
index eef807ee25a6..382f7bfb31d1 100644
--- a/sw/source/ui/vba/vbaheaderfooter.hxx
+++ b/sw/source/ui/vba/vbaheaderfooter.hxx
@@ -31,11 +31,11 @@ class SwVbaHeaderFooter : public SwVbaHeaderFooter_BASE
 private:
     css::uno::Reference< css::frame::XModel > mxModel;
     css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
-    sal_Bool mbHeader;
+    bool mbHeader;
     sal_Int32 mnIndex;
 
 public:
-    SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
+    SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
     virtual ~SwVbaHeaderFooter(){}
 
     // Attributes
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index d68162cdf5f7..271334503b75 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -34,31 +34,31 @@ using namespace ::ooo::vba;
 #define FIRST_PAGE 1
 
 // Class HeaderFooterHelper
-sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     return isHeaderFooter( word::getCurrentXText( xModel ) );
 }
 
-sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW );
     OUString aImplName = xServiceInfo->getImplementationName();
     if ( aImplName == "SwXHeadFootText" )
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel );
     if( !isHeaderFooter( xCurrentText ) )
-        return sal_False;
+        return false;
 
     OUString aPropIsShared = "HeaderIsShared";
     OUString aPropText = "HeaderText";
     uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel );
     uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW );
-    sal_Bool isShared = sal_True;
+    bool isShared = true;
     xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
     if( !isShared )
     {
@@ -76,17 +76,17 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM
     try
     {
         if( xTRC->compareRegionStarts( xTR1, xTR2 ) == 0 )
-            return sal_True;
+            return true;
     }
     catch (const lang::IllegalArgumentException&)
     {
-        return sal_False;
+        return false;
     }
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isHeader( xModel ) )
     {
@@ -95,15 +95,15 @@ sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XMo
         sal_Int32 nPage = xPageCursor->getPage();
         return nPage == FIRST_PAGE;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isHeader( xModel ) )
     {
         uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-        sal_Bool isShared = sal_False;
+        bool isShared = false;
         xStyleProps->getPropertyValue("HeaderIsShared") >>= isShared;
         if( !isShared )
         {
@@ -111,20 +111,20 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo
             return ( 0 == xPageCursor->getPage() % 2 );
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel );
     if( !isHeaderFooter( xCurrentText ) )
-        return sal_False;
+        return false;
 
     OUString aPropIsShared = "FooterIsShared";
     OUString aPropText = "FooterText";
     uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel );
     uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW );
-    sal_Bool isShared = sal_True;
+    bool isShared = true;
     xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
     if( !isShared )
     {
@@ -142,17 +142,17 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM
     try
     {
         if( xTRC->compareRegionStarts( xTR1, xTR2 ) == 0 )
-            return sal_True;
+            return true;
     }
     catch (const lang::IllegalArgumentException&)
     {
-        return sal_False;
+        return false;
     }
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isFooter( xModel ) )
     {
@@ -160,15 +160,15 @@ sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XMo
         sal_Int32 nPage = xPageCursor->getPage();
         return nPage == FIRST_PAGE;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isFooter( xModel ) )
     {
         uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-        sal_Bool isShared = sal_False;
+        bool isShared = false;
         xStyleProps->getPropertyValue("FooterIsShared") >>= isShared;
         if( !isShared )
         {
@@ -176,7 +176,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo
             return ( 0 == xPageCursor->getPage() % 2 );
         }
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
index dbcdbe3da8cc..28a12b4d4b71 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
@@ -28,16 +28,16 @@
 class HeaderFooterHelper
 {
 public:
-    static sal_Bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
-    static sal_Bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isPrimaryHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isPrimaryFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
+    static bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isPrimaryHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isPrimaryFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
 };
 
 #endif
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 613e31050e88..d46b91407bad 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -32,10 +32,10 @@ private:
     uno::Reference< uno::XComponentContext > mxContext;
     uno::Reference< frame::XModel > mxModel;
     uno::Reference< beans::XPropertySet > mxPageStyleProps;
-    sal_Bool mbHeader;
+    bool mbHeader;
 
 public:
-    HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, sal_Bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {}
+    HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {}
     virtual ~HeadersFootersIndexAccess(){}
 
     // XIndexAccess
@@ -79,7 +79,7 @@ public:
     }
 };
 
-SwVbaHeadersFooters::SwVbaHeadersFooters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, sal_Bool isHeader ): SwVbaHeadersFooters_BASE( xParent, xContext, new HeadersFootersIndexAccess( xParent, xContext, xModel, xPageStyleProps, isHeader ) ),  mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( isHeader )
+SwVbaHeadersFooters::SwVbaHeadersFooters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool isHeader ): SwVbaHeadersFooters_BASE( xParent, xContext, new HeadersFootersIndexAccess( xParent, xContext, xModel, xPageStyleProps, isHeader ) ),  mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( isHeader )
 {
 }
 
diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx
index 8d8253dfa2b2..7e62f1ab3b39 100644
--- a/sw/source/ui/vba/vbaheadersfooters.hxx
+++ b/sw/source/ui/vba/vbaheadersfooters.hxx
@@ -30,10 +30,10 @@ class SwVbaHeadersFooters : public SwVbaHeadersFooters_BASE
 private:
     css::uno::Reference< css::frame::XModel > mxModel;
     css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
-    sal_Bool mbHeader;
+    bool mbHeader;
 
 public:
-    SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader );
+    SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader );
     virtual ~SwVbaHeadersFooters() {}
 
     virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index 8121296a7e8e..e749b78f29e3 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -39,7 +39,7 @@ SwVbaListFormat::~SwVbaListFormat()
 
 void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bContinuePreviousList = sal_True;
+    bool bContinuePreviousList = true;
     if( ContinuePreviousList.hasValue() )
         ContinuePreviousList >>= bContinuePreviousList;
 
@@ -61,20 +61,20 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
 
     uno::Reference< container::XEnumerationAccess > xEnumAccess( mxTextRange, uno::UNO_QUERY_THROW );
     uno::Reference< container::XEnumeration > xEnum = xEnumAccess->createEnumeration();
-    sal_Bool isFirstElement = sal_True;
+    bool isFirstElement = true;
     while( xEnum->hasMoreElements() )
     {
         uno::Reference< beans::XPropertySet > xProps( xEnum->nextElement(), uno::UNO_QUERY_THROW );
         if( isFirstElement )
         {
-            sal_Bool isNumberingRestart = !bContinuePreviousList;
+            bool isNumberingRestart = !bContinuePreviousList;
             xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( isNumberingRestart ) );
             if( isNumberingRestart )
             {
                 sal_Int16 nStartValue = 1;
                 xProps->setPropertyValue("NumberingStartValue", uno::makeAny( nStartValue ) );
             }
-            isFirstElement = sal_False;
+            isFirstElement = false;
         }
         else
         {
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 9654618de899..8c75691e9509 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -58,7 +58,7 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc
 
 double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool isHeaderOn = sal_False;
+    bool isHeaderOn = false;
     mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
     if( !isHeaderOn )
         mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_True ) );
@@ -77,7 +77,7 @@ double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException
 void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( _headerdistance );
-    sal_Bool isHeaderOn = sal_False;
+    bool isHeaderOn = false;
     sal_Int32 aktTopMargin = 0;
     sal_Int32 aktSpacing = 0;
     sal_Int32 aktHeaderHeight = 0;
@@ -101,7 +101,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw
 
 double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool isFooterOn = sal_False;
+    bool isFooterOn = false;
     mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn;
     if( !isFooterOn )
         mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_True ) );
@@ -111,7 +111,7 @@ double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException
 void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( _footerdistance );
-    sal_Bool isFooterOn = sal_False;
+    bool isFooterOn = false;
     sal_Int32 aktBottomMargin = 0;
     sal_Int32 aktSpacing = 0;
     sal_Int32 aktFooterHeight = 0;
@@ -167,7 +167,7 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status
     sal_Int32 nFooterHeight = 0;
     xStyleProps->getPropertyValue("FooterHeight") >>= nFooterHeight;
 
-    sal_Bool isHeaderOn = sal_False;
+    bool isHeaderOn = false;
     xStyleProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
     if( isHeaderOn )
     {
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 4ade338a7328..8ae1ef4b5b51 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -37,7 +37,7 @@ SwVbaParagraph::~SwVbaParagraph()
 uno::Reference< word::XRange > SAL_CALL
 SwVbaParagraph::getRange( ) throw ( uno::RuntimeException, std::exception )
 {
-    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), sal_True ) );
+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), true ) );
 }
 
 uno::Any SAL_CALL
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index aa5d0c9b12ba..60ac894f6399 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -72,14 +72,14 @@ void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent )
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     mxParaProps->getPropertyValue("ParaKeepTogether") >>= bKeep;
     return uno::makeAny ( bKeep );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     if( _keeptogether >>= bKeep )
     {
         mxParaProps->setPropertyValue("ParaKeepTogether", uno::makeAny( bKeep ) );
@@ -92,14 +92,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     mxParaProps->getPropertyValue("ParaSplit") >>= bKeep;
     return uno::makeAny ( bKeep );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     if( _keepwithnext >>= bKeep )
     {
         mxParaProps->setPropertyValue("ParaSplit", uno::makeAny( bKeep ) );
@@ -112,14 +112,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bHypn = sal_False;
+    bool bHypn = false;
     mxParaProps->getPropertyValue("ParaIsHyphenation") >>= bHypn;
     return uno::makeAny ( bHypn );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bHypn = sal_False;
+    bool bHypn = false;
     if( _hyphenation >>= bHypn )
     {
         mxParaProps->setPropertyValue("ParaIsHyphenation", uno::makeAny( bHypn ) );
@@ -160,14 +160,14 @@ void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingru
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool noLineNum = sal_False;
+    bool noLineNum = false;
     mxParaProps->getPropertyValue("ParaLineNumberCount") >>= noLineNum;
     return uno::makeAny ( noLineNum );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool noLineNum = sal_False;
+    bool noLineNum = false;
     if( _nolinenumber >>= noLineNum )
     {
         mxParaProps->setPropertyValue("ParaLineNumberCount", uno::makeAny( noLineNum ) );
@@ -204,13 +204,13 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::Runtime
 {
     style::BreakType aBreakType;
     mxParaProps->getPropertyValue("BreakType") >>= aBreakType;
-    sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH );
+    bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH );
     return uno::makeAny( bBreakBefore );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bBreakBefore = sal_False;
+    bool bBreakBefore = false;
     if( _breakbefore >>= bBreakBefore )
     {
         style::BreakType aBreakType;
@@ -307,7 +307,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeExc
     mxParaProps->getPropertyValue("ParaOrphans") >>= nOrphan;
     // if the amount of single lines on one page > 1 and the same of start and end of the paragraph,
     // true is retured.
-    sal_Bool bWidow = ( nWidow > 1 && nOrphan == nWidow );
+    bool bWidow = ( nWidow > 1 && nOrphan == nWidow );
     return uno::makeAny( bWidow );
 }
 
@@ -315,7 +315,7 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr
 {
     // if we get true, the part of the paragraph on one page has to be
     // at least two lines
-    sal_Bool bWidow = sal_False;
+    bool bWidow = false;
     if( _widowcontrol >>= bWidow )
     {
         sal_Int8 nControl = bWidow? 2:1;
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index 7457d0dc6f6f..3bd95e21ad08 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -43,18 +43,18 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
 {
     uno::Reference< text::XTextRange > xEnd;
     initialize( rStart, xEnd );
 }
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
 {
     initialize( rStart, rEnd );
 }
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
 {
     initialize( rStart, rEnd );
 }
@@ -147,7 +147,7 @@ SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException, std:
     {
         mxTextCursor->setString( OUString() );
         // process CR in strings
-        SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True );
+        SwVbaRangeHelper::insertString( xRange, mxText, rText, true );
     }
     else
     {
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index 7d695bbd5153..408c47cd2ed1 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -38,15 +38,15 @@ private:
     css::uno::Reference< css::text::XTextDocument > mxTextDocument;
     css::uno::Reference< css::text::XTextCursor > mxTextCursor;
     css::uno::Reference< css::text::XText > mxText;
-    sal_Bool mbMaySpanEndOfDocument;
+    bool mbMaySpanEndOfDocument;
 
 private:
     void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException);
     void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException );
 public:
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException);
     virtual ~SwVbaRange();
    css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; }
 
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index 57cb19602cde..78ef5fec9ba7 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -43,7 +43,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
         sal_Int32 nPos = 0;
         uno::Reference< text::XTextCursor > xCursor = rText->createTextCursor();
         xCursor->collapseToStart();
-        sal_Bool bCanGo = sal_True;
+        bool bCanGo = true;
         while( !xRange.is() && bCanGo )
         {
             if( _position == nPos )
@@ -60,7 +60,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
     return xRange;
 }
 
-void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException )
+void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( uno::RuntimeException )
 {
     sal_Int32 nlastIndex = 0;
     sal_Int32 nIndex = 0;
@@ -143,7 +143,7 @@ sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rT
         uno::Reference< text::XTextRangeCompare > xCompare( rText, uno::UNO_QUERY_THROW );
         // compareValue is 0 if the ranges are equal
         sal_Int32 nCompareValue = xCompare->compareRegionStarts( xCursor->getStart(), rTextRange );
-        sal_Bool canGo = sal_True;
+        bool canGo = true;
 
         while( nCompareValue !=0 && canGo )
         {
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index 85f7b067a8f5..417f9c7c93a6 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -29,7 +29,7 @@ class SwVbaRangeHelper
 {
 public:
     static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
-    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
+    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( css::uno::RuntimeException );
     static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
     static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException );
     static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index f764c4d0ceec..27db78bd8cfd 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -62,14 +62,14 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru
 
 ::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool isAutoHeight = sal_False;
+    bool isAutoHeight = false;
     mxRowProps->getPropertyValue("IsAutoHeight") >>= isAutoHeight;
     return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly;
 }
 
 void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto );
+    bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto );
     mxRowProps->setPropertyValue("IsAutoHeight", uno::makeAny( isAutoHeight ) );
 }
 
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 96dc412c246a..b21b64b90c08 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -127,12 +127,12 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt
 
 uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bAllowBreak = sal_False;
+    bool bAllowBreak = false;
     uno::Reference< container::XIndexAccess > xRowsAccess( mxTableRows, uno::UNO_QUERY_THROW );
     for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index )
     {
         uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
-        sal_Bool bSplit = sal_False;
+        bool bSplit = false;
         xRowProps->getPropertyValue("IsSplitAllowed") >>= bSplit;
         if( index == 0 )
         {
@@ -149,7 +149,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep
 
 void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakacrosspages ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bAllowBreak = sal_False;
+    bool bAllowBreak = false;
     _allowbreakacrosspages >>= bAllowBreak;
     uno::Reference< container::XIndexAccess > xRowsAccess( mxTableRows, uno::UNO_QUERY_THROW );
     for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index )
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index 3a09874a6f76..3995c5f705a0 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -45,7 +45,7 @@ void SAL_CALL SwVbaSection::setProtectedForForms( sal_Bool /*_protectedforforms*
 
 uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
 {
-    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, sal_True ) );
+    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, true ) );
     if ( index.hasValue() )
         return xCol->Item( index, uno::Any() );
     return uno::makeAny( xCol );
@@ -53,7 +53,7 @@ uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::Run
 
 uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
 {
-    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, sal_False ) );
+    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, false ) );
     if ( index.hasValue() )
         return xCol->Item( index, uno::Any() );
     return uno::makeAny( xCol );
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index bba8cf7f06c5..ef5ad0622cbd 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -131,7 +131,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw
     sal_Int32 nExtend = word::WdMovementType::wdMove;
     _unit >>= nUnit;
     _extend >>= nExtend;
-    sal_Bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
+    bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
 
     switch( nUnit )
     {
@@ -166,7 +166,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw (
     sal_Int32 nExtend = word::WdMovementType::wdMove;
     _unit >>= nUnit;
     _extend >>= nExtend;
-    sal_Bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
+    bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
 
     switch( nUnit )
     {
@@ -240,7 +240,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
     if( nCount == 0 )
         return;
 
-    sal_Bool bExpand = ( nExtend == word::WdMovementType::wdMove ) ? sal_False : sal_True;
+    bool bExpand = ( nExtend == word::WdMovementType::wdMove ) ? sal_False : sal_True;
 
     switch( nUnit )
     {
@@ -482,7 +482,7 @@ SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException, std::exception )
 {
     // #FIXME: if the selection is an entire paragraph, it's replaced
     // by the new paragraph
-    sal_Bool isCollapsed = mxTextViewCursor->isCollapsed();
+    bool isCollapsed = mxTextViewCursor->isCollapsed();
     InsertParagraph();
     if( isCollapsed )
         mxTextViewCursor->collapseToStart();
@@ -840,7 +840,7 @@ SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException, std::exception
     {
         uno::Reference< beans::XPropertySet > xPageStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
         sal_Int32 nIndex = word::WdHeaderFooterIndex::wdHeaderFooterPrimary;
-        sal_Bool isHeader = HeaderFooterHelper::isHeader( mxModel );
+        bool isHeader = HeaderFooterHelper::isHeader( mxModel );
         if( HeaderFooterHelper::isEvenPagesHeader( mxModel ) || HeaderFooterHelper::isEvenPagesFooter( mxModel ) )
             nIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages;
         else if( HeaderFooterHelper::isFirstPageHeader( mxModel ) || HeaderFooterHelper::isFirstPageFooter( mxModel ) )
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index 7b889ea2044d..8ca495d78805 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -139,7 +139,7 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat
 
 sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool isAutoUpdate = sal_False;
+    bool isAutoUpdate = false;
     mxStyleProps->getPropertyValue("IsAutoUpdate") >>= isAutoUpdate;
     return isAutoUpdate;
 }
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 9f659b1757b0..8dda034c0f7d 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -123,7 +123,7 @@ OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol )
 sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException)
 {
     sal_Int32 nWidth = 0;
-    sal_Bool isWidthRelatvie = sal_False;
+    bool isWidthRelatvie = false;
     uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
     xTableProps->getPropertyValue("IsWidthRelative") >>= isWidthRelatvie;
     if( isWidthRelatvie )
@@ -163,7 +163,7 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart,
     rCols.SetLeft    ( 0 );
     rCols.SetRight   ( UNO_TABLE_COLUMN_SUM );
     rCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
-    pTable->GetTabCols( rCols, pStart, sal_False, sal_False );
+    pTable->GetTabCols( rCols, pStart, false, false );
 }
 
 sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols ) const
diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx
index 0c6ab3cf781d..2f0c69e35d6c 100644
--- a/sw/source/ui/vba/vbatableofcontents.cxx
+++ b/sw/source/ui/vba/vbatableofcontents.cxx
@@ -59,7 +59,7 @@ void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) t
 
 sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bUseFields = sal_False;
+    bool bUseFields = false;
     mxTocProps->getPropertyValue("CreateFromMarks") >>= bUseFields;
     return bUseFields;
 }
@@ -71,7 +71,7 @@ void SAL_CALL SwVbaTableOfContents::setUseFields( sal_Bool _useFields ) throw (c
 
 sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bUseOutlineLevels = sal_False;
+    bool bUseOutlineLevels = false;
     mxTocProps->getPropertyValue("CreateFromOutline") >>= bUseOutlineLevels;
     return bUseOutlineLevels;
 }
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 0fd9c8efe5cb..9827666d7566 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -115,7 +115,7 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u
     uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance("com.sun.star.text.ContentIndex"), uno::UNO_QUERY_THROW );
 
     uno::Reference< beans::XPropertySet > xTocProps( xDocumentIndex, uno::UNO_QUERY_THROW );
-    sal_Bool isProtected = sal_False;
+    bool isProtected = false;
     xTocProps->setPropertyValue("IsProtected", uno::makeAny( isProtected ) );
 
     uno::Reference< word::XTableOfContents > xToc( new SwVbaTableOfContents( this, mxContext, mxTextDocument, xDocumentIndex ) );
@@ -125,12 +125,12 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u
         LowerHeadingLevel >>= nLowerHeadingLevel;
     xToc->setLowerHeadingLevel( nLowerHeadingLevel );
 
-    sal_Bool bUseFields = sal_False;
+    bool bUseFields = false;
     if( UseFields.hasValue() )
         UseFields >>= bUseFields;
     xToc->setUseFields( bUseFields );
 
-    sal_Bool bUseOutlineLevels = sal_True;
+    bool bUseOutlineLevels = true;
     xToc->setUseOutlineLevels( bUseOutlineLevels );
 
     SwVbaRange* pVbaRange = dynamic_cast<SwVbaRange*>( Range.get() );
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 666d2aab65a3..af40d8ea7870 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -192,7 +192,7 @@ SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::Run
 sal_Bool SAL_CALL
 SwVbaView::getTableGridLines() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bShowTableGridLine = sal_False;
+    bool bShowTableGridLine = false;
     mxViewSettings->getPropertyValue("ShowTableBoundaries") >>= bShowTableGridLine;
     return bShowTableGridLine;
 }
@@ -207,7 +207,7 @@ SwVbaView::setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::Runtim
 SwVbaView::getType() throw (css::uno::RuntimeException, std::exception)
 {
     // FIXME: handle wdPrintPreview type
-    sal_Bool bOnlineLayout = sal_False;
+    bool bOnlineLayout = false;
     mxViewSettings->getPropertyValue("ShowOnlineLayout") >>= bOnlineLayout;
     return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView;
 }
@@ -307,7 +307,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
             if ( aPageStyleName == "First Page" )
             {
                 // go to the beginning of where the next style is used
-                sal_Bool hasNextPage = sal_False;
+                bool hasNextPage = false;
                 xStyle = word::getCurrentPageStyle( mxModel );
                 do
                 {
@@ -328,9 +328,9 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
 
     xStyle = word::getCurrentPageStyle( mxModel );
     uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
-    sal_Bool isOn = sal_False;
+    bool isOn = false;
     xPageProps->getPropertyValue( aPropIsOn ) >>= isOn;
-    sal_Bool isShared =  sal_False;
+    bool isShared =  false;
     xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
     if( !isOn )
     {
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index cc9ffec06050..a08cf9c6359b 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -99,7 +99,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
         }
         case text::WrapTextMode_PARALLEL:
         {
-            sal_Bool bContour = sal_False;
+            bool bContour = false;
             m_xPropertySet->getPropertyValue("SurroundContour") >>= bContour;
             if( bContour )
                 nType = word::WdWrapType::wdWrapTight;