starmath: sal_Bool->bool

Change-Id: I09e833765294937a75feb5cdd92cce4aa8373c24

16 files changed, 87 insertions, 88 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index eba196d161e1..6da42996121b 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -125,7 +125,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
                                   sal_Int32 nFileFormat,
                                   bool bTemplate = false ) const SAL_OVERRIDE;
 
-    virtual sal_Bool        SetData( const OUString& rData );
+    virtual bool        SetData( const OUString& rData );
     virtual sal_uLong       GetMiscStatus() const SAL_OVERRIDE;
     virtual void        OnDocumentPrinterChanged( Printer * ) SAL_OVERRIDE;
     virtual bool        InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE;
@@ -183,7 +183,7 @@ public:
     const OUString GetComment() const;
 
     // to replace chars that can not be saved with the document...
-    sal_Bool    ReplaceBadChars();
+    bool    ReplaceBadChars();
 
     void        UpdateText();
     void        SetText(const OUString& rBuffer);
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index b15fd46cee5b..7ab5b07cd849 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -29,10 +29,10 @@ enum SmPrintSize { PRINT_SIZE_NORMAL, PRINT_SIZE_SCALED, PRINT_SIZE_ZOOMED };
 
 
 
-inline sal_Bool IsInPrivateUseArea( sal_Unicode cChar ) { return 0xE000 <= cChar  &&  cChar <= 0xF8FF; }
+inline bool IsInPrivateUseArea( sal_Unicode cChar ) { return 0xE000 <= cChar  &&  cChar <= 0xF8FF; }
 
 // Greek char range as seen in svx/.../charmap.cxx RID_SUBSETSTR_BASIC_GREEK
-inline sal_Bool IsGreekChar( sal_Unicode cChar ) { return 0x0370 <= cChar  &&  cChar <= 0x03FF; }
+inline bool IsGreekChar( sal_Unicode cChar ) { return 0x0370 <= cChar  &&  cChar <= 0x03FF; }
 
 sal_Unicode ConvertMathToMathML( sal_Unicode cChar );
 
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 0e76d68482c8..31d53f2a882c 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -758,7 +758,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText(
     throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     if (!pWin)
         throw RuntimeException();
@@ -779,7 +779,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText(
 
             Application::AcquireSolarMutex( nRef );
 
-            bReturn = sal_True;
+            bReturn = true;
         }
     }
 
@@ -1156,7 +1156,7 @@ static sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESel
         {
             OSL_ENSURE( i->pAttr, "GetCharAttribs gives corrupt data" );
 
-            const sal_Bool bEmptyPortion = (i->nStart == i->nEnd);
+            const bool bEmptyPortion = (i->nStart == i->nEnd);
             if( (!bEmptyPortion && (i->nStart >= nEndPos)) || (bEmptyPortion && (i->nStart > nEndPos)) )
                 break;  // break if we are already behind our selection
 
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 182000635371..12f03e73e038 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -611,7 +611,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
         // Predefined
         pVal->Name  = aNodeNameDelim;
         pVal->Name += *pName++;
-        pVal->Value <<= (sal_Bool) rSymbol.IsPredefined();
+        pVal->Value <<= rSymbol.IsPredefined();
         pVal++;
         // FontFormatId
         SmFontFormat aFntFmt( rSymbol.GetFace() );
@@ -917,25 +917,25 @@ void SmMathConfig::SaveOther()
     Any *pValue  = pValues;
 
     // Print/Title
-    *pValue++ <<= (sal_Bool) pOther->bPrintTitle;
+    *pValue++ <<= pOther->bPrintTitle;
     // Print/FormulaText
-    *pValue++ <<= (sal_Bool) pOther->bPrintFormulaText;
+    *pValue++ <<= pOther->bPrintFormulaText;
     // Print/Frame
-    *pValue++ <<= (sal_Bool) pOther->bPrintFrame;
+    *pValue++ <<= pOther->bPrintFrame;
     // Print/Size
     *pValue++ <<= (sal_Int16) pOther->ePrintSize;
     // Print/ZoomFactor
     *pValue++ <<= (sal_Int16) pOther->nPrintZoomFactor;
     // LoadSave/IsSaveOnlyUsedSymbols
-    *pValue++ <<= (sal_Bool) pOther->bIsSaveOnlyUsedSymbols;
+    *pValue++ <<= pOther->bIsSaveOnlyUsedSymbols;
     // Misc/IgnoreSpacesRight
-    *pValue++ <<= (sal_Bool) pOther->bIgnoreSpacesRight;
+    *pValue++ <<= pOther->bIgnoreSpacesRight;
     // View/ToolboxVisible
-    *pValue++ <<= (sal_Bool) pOther->bToolboxVisible;
+    *pValue++ <<= pOther->bToolboxVisible;
     // View/AutoRedraw
-    *pValue++ <<= (sal_Bool) pOther->bAutoRedraw;
+    *pValue++ <<= pOther->bAutoRedraw;
     // View/FormulaCursor
-    *pValue++ <<= (sal_Bool) pOther->bFormulaCursor;
+    *pValue++ <<= pOther->bFormulaCursor;
 
     OSL_ENSURE( pValue - pValues == nProps, "property mismatch" );
     PutProperties( aNames , aValues );
@@ -1044,11 +1044,11 @@ void SmMathConfig::SaveFormat()
     Any *pValue  = pValues;
 
     // StandardFormat/Textmode
-    *pValue++ <<= (sal_Bool) pFormat->IsTextmode();
+    *pValue++ <<= pFormat->IsTextmode();
     // StandardFormat/GreekCharStyle
     *pValue++ <<= (sal_Int16) pFormat->GetGreekCharStyle();
     // StandardFormat/ScaleNormalBracket
-    *pValue++ <<= (sal_Bool) pFormat->IsScaleNormalBrackets();
+    *pValue++ <<= pFormat->IsScaleNormalBrackets();
     // StandardFormat/HorizontalAlignment
     *pValue++ <<= (sal_Int16) pFormat->GetHorAlign();
     // StandardFormat/BaseSize
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 1213d31c7e1a..09201bf5c60a 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -167,7 +167,7 @@ public:
     void            SetPrintFrame( bool bVal );
     SmPrintSize     GetPrintSize() const;
     void            SetPrintSize( SmPrintSize eSize );
-    sal_uInt16          GetPrintZoomFactor() const;
+    sal_uInt16      GetPrintZoomFactor() const;
     void            SetPrintZoomFactor( sal_uInt16 nVal );
 
     bool            IsSaveOnlyUsedSymbols() const;
@@ -178,7 +178,6 @@ public:
     void            SetAutoRedraw( bool bVal );
     bool            IsShowFormulaCursor() const;
     void            SetShowFormulaCursor( bool bVal );
-    void            SetAutoRedraw( sal_Bool bVal );
 };
 
 #endif
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 1b8307b9864e..2de7bc4eafc6 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -730,7 +730,7 @@ SmDocShell::~SmDocShell()
 }
 
 
-sal_Bool SmDocShell::SetData( const OUString& rData )
+bool SmDocShell::SetData( const OUString& rData )
 {
     SAL_INFO( "starmath", "SmDocShell::SetData" );
 
@@ -861,7 +861,7 @@ bool SmDocShell::Save()
 
         Reference<com::sun::star::frame::XModel> xModel(GetModel());
         SmXMLExportWrapper aEquation(xModel);
-        aEquation.SetFlat(sal_False);
+        aEquation.SetFlat(false);
         return aEquation.Export(*GetMedium());
     }
 
@@ -871,9 +871,9 @@ bool SmDocShell::Save()
 /*
  * replace bad characters that can not be saved. (#i74144)
  * */
-sal_Bool SmDocShell::ReplaceBadChars()
+bool SmDocShell::ReplaceBadChars()
 {
-    sal_Bool bReplace = sal_False;
+    bool bReplace = false;
 
     if (pEditEngine)
     {
@@ -884,7 +884,7 @@ sal_Bool SmDocShell::ReplaceBadChars()
             if (aBuf[i] < ' ' && aBuf[i] != '\r' && aBuf[i] != '\n' && aBuf[i] != '\t')
             {
                 aBuf[i] = ' ';
-                bReplace = sal_True;
+                bReplace = true;
             }
         }
 
@@ -927,7 +927,7 @@ bool SmDocShell::SaveAs( SfxMedium& rMedium )
 
         Reference<com::sun::star::frame::XModel> xModel(GetModel());
         SmXMLExportWrapper aEquation(xModel);
-        aEquation.SetFlat(sal_False);
+        aEquation.SetFlat(false);
         bRet = aEquation.Export(rMedium);
     }
     return bRet;
@@ -951,14 +951,14 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
         {
             Reference<com::sun::star::frame::XModel> xModel(GetModel());
             SmXMLExportWrapper aEquation(xModel);
-            aEquation.SetFlat(sal_False);
+            aEquation.SetFlat(false);
             bRet = aEquation.Export(rMedium);
         }
         else if(rFltName.equals( MATHML_XML ))
         {
             Reference<com::sun::star::frame::XModel> xModel(GetModel());
             SmXMLExportWrapper aEquation(xModel);
-            aEquation.SetFlat(sal_True);
+            aEquation.SetFlat(true);
             bRet = aEquation.Export(rMedium);
         }
         else if (pFlt->GetFilterName().equalsAscii("MathType 3.x"))
diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx
index 32dd3d57aeaa..75d180f1587b 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -24,10 +24,10 @@
 
 
 
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
+bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
 {
     sal_uInt8 nVer = 0;
-    sal_Bool bSuccess = sal_False;
+    bool bSuccess = false;
 
 
     // code snippet copied from MathType::Parse
@@ -47,7 +47,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
     if (!pS->GetError())
     {
         nVersion = nVer;
-        bSuccess = sal_True;
+        bSuccess = true;
     }
     return bSuccess;
 }
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index 2c0e6143c091..3a066a6982ab 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -71,7 +71,7 @@ public:
     }
 };
 
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
+bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
 
 #endif
 
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 9fe179a485dc..9a8170546dad 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -93,15 +93,15 @@ sal_Unicode ConvertMathToMathML( sal_Unicode cChar )
     return cRes;
 }
 
-sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
+bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
 {
-    sal_Bool bRet=sal_True;
+    bool bRet=true;
     uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext());
 
     //Get model
     uno::Reference< lang::XComponent > xModelComp(xModel, uno::UNO_QUERY );
 
-    sal_Bool bEmbedded = sal_False;
+    bool bEmbedded = false;
     uno::Reference <lang::XUnoTunnel> xTunnel;
     xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
     SmModel *pModel = reinterpret_cast<SmModel *>
@@ -111,7 +111,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
             static_cast<SmDocShell*>(pModel->GetObjectShell()) : 0;
     if ( pDocShell &&
         SFX_CREATE_MODE_EMBEDDED == pDocShell->GetCreateMode() )
-        bEmbedded = sal_True;
+        bEmbedded = true;
 
     uno::Reference<task::XStatusIndicator> xStatusIndicator;
     if (!bEmbedded)
@@ -179,7 +179,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
     if (!bFlat) //Storage (Package) of Stream
     {
         uno::Reference < embed::XStorage > xStg = rMedium.GetOutputStorage();
-        sal_Bool bOASIS = ( SotStorage::GetVersion( xStg ) > SOFFICE_FILEFORMAT_60 );
+        bool bOASIS = ( SotStorage::GetVersion( xStg ) > SOFFICE_FILEFORMAT_60 );
 
         // TODO/LATER: handle the case of embedded links gracefully
         if ( bEmbedded ) //&& !pStg->IsRoot() )
@@ -253,7 +253,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
 
 
 /// export through an XML exporter component (output stream version)
-sal_Bool SmXMLExportWrapper::WriteThroughComponent(
+bool SmXMLExportWrapper::WriteThroughComponent(
     Reference<io::XOutputStream> xOutputStream,
     Reference<XComponent> xComponent,
     Reference<uno::XComponentContext> & rxContext,
@@ -284,7 +284,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
     OSL_ENSURE( xExporter.is(),
             "can't instantiate export filter component" );
     if ( !xExporter.is() )
-        return sal_False;
+        return false;
 
 
     // connect model and filter
@@ -306,7 +306,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
 
 
 /// export through an XML exporter component (storage version)
-sal_Bool SmXMLExportWrapper::WriteThroughComponent(
+bool SmXMLExportWrapper::WriteThroughComponent(
     const Reference < embed::XStorage >& xStorage,
     Reference<XComponent> xComponent,
     const sal_Char* pStreamName,
@@ -329,7 +329,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
     catch ( uno::Exception& rEx )
     {
         SAL_WARN("starmath", "Can't create output stream in package: " << rEx.Message );
-        return sal_False;
+        return false;
     }
 
     OUString aPropName( "MediaType" );
@@ -354,7 +354,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
     }
 
     // write the stuff
-    sal_Bool bRet = WriteThroughComponent( xStream->getOutputStream(), xComponent, rxContext,
+    bool bRet = WriteThroughComponent( xStream->getOutputStream(), xComponent, rxContext,
         rPropSet, pComponentName );
 
     return bRet;
@@ -366,7 +366,7 @@ SmXMLExport::SmXMLExport(
 :   SvXMLExport(util::MeasureUnit::INCH, xContext, implementationName, XML_MATH,
                 nExportFlags)
 ,   pTree(0) ,
-    bSuccess(sal_False)
+    bSuccess(false)
 {
 }
 
@@ -558,7 +558,7 @@ sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
         GetDocHandler()->endDocument();
     }
 
-    bSuccess=sal_True;
+    bSuccess=true;
     return 0;
 }
 
@@ -936,7 +936,7 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/)
         {
             //Note that we change the fontstyle to italic for strings that
             //are italic and longer than a single character.
-            sal_Bool bIsItalic = IsItalic( pTemp->GetFont() );
+            bool bIsItalic = IsItalic( pTemp->GetFont() );
             if ((pTemp->GetText().getLength() > 1) && bIsItalic)
                 AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, XML_ITALIC);
             else if ((pTemp->GetText().getLength() == 1) && !bIsItalic)
@@ -1555,7 +1555,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
                     //operator dictionary, we will generate MathML with explicit
                     //stretchiness for now.
                     sal_Int16 nLength = GetAttrList().getLength();
-                    sal_Bool bAddStretch=sal_True;
+                    bool bAddStretch=true;
                     for ( sal_Int16 i = 0; i < nLength; i++ )
                     {
                         OUString sLocalName;
@@ -1565,7 +1565,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
                         if ( ( XML_NAMESPACE_MATH == nPrefix ) &&
                             IsXMLToken(sLocalName, XML_STRETCHY) )
                         {
-                            bAddStretch = sal_False;
+                            bAddStretch = false;
                             break;
                         }
                     }
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 371bf9877253..e547840d2e16 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -41,16 +41,16 @@ namespace com { namespace sun { namespace star {
 class SmXMLExportWrapper
 {
     com::sun::star::uno::Reference<com::sun::star::frame::XModel> xModel;
-    sal_Bool bFlat;     //set true for export to flat .mml, set false for
+    bool bFlat;     //set true for export to flat .mml, set false for
                         //export to a .sxm (or whatever) package
 public:
     SmXMLExportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef)
-        : xModel(rRef), bFlat(sal_True) {}
+        : xModel(rRef), bFlat(true) {}
 
-    sal_Bool Export(SfxMedium &rMedium);
-    void SetFlat(sal_Bool bIn) {bFlat = bIn;}
+    bool Export(SfxMedium &rMedium);
+    void SetFlat(bool bIn) {bFlat = bIn;}
 
-    sal_Bool WriteThroughComponent(
+    bool WriteThroughComponent(
         ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
             xOutputStream,
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
@@ -61,7 +61,7 @@ public:
             ::com::sun::star::beans::XPropertySet > & rPropSet,
         const sal_Char* pComponentName );
 
-    sal_Bool WriteThroughComponent(
+    bool WriteThroughComponent(
         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor,
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent,
         const sal_Char* pStreamName,
@@ -78,7 +78,7 @@ class SmXMLExport : public SvXMLExport
 {
     const SmNode *  pTree;
     OUString        aText;
-    sal_Bool        bSuccess;
+    bool        bSuccess;
 
 protected:
     void ExportNodes(const SmNode *pNode, int nLevel);
@@ -121,7 +121,7 @@ public:
     virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE;
     virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE;
 
-    sal_Bool GetSuccess() {return bSuccess;}
+    bool GetSuccess() {return bSuccess;}
 };
 
 
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index dcc29f2e70f0..5d01bc5b013b 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -253,7 +253,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
     Reference<uno::XComponentContext> & rxContext,
     Reference<beans::XPropertySet> & rPropSet,
     const sal_Char* pFilterName,
-    sal_Bool bEncrypted )
+    bool bEncrypted )
 {
     sal_uLong nError = ERRCODE_SFX_DOLOADFAILED;
     OSL_ENSURE(xInputStream.is(), "input stream missing");
@@ -376,7 +376,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
         // determine if stream is encrypted or not
         uno::Reference < beans::XPropertySet > xProps( xEventsStream, uno::UNO_QUERY );
         Any aAny = xProps->getPropertyValue( "Encrypted" );
-        sal_Bool bEncrypted = sal_False;
+        bool bEncrypted = false;
         if ( aAny.getValueType() == ::getBooleanCppuType() )
             aAny >>= bEncrypted;
 
@@ -421,7 +421,7 @@ SmXMLImport::SmXMLImport(
     pPresScriptEmptyElemTokenMap(0),
     pPresTableElemTokenMap(0),
     pColorTokenMap(0),
-    bSuccess(sal_False)
+    bSuccess(false)
 {
 }
 
@@ -549,7 +549,7 @@ void SmXMLImport::endDocument(void)
         }
         OSL_ENSURE(pModel,"So there *was* a uno problem after all");
 
-        bSuccess = sal_True;
+        bSuccess = true;
     }
 
     SvXMLImport::endDocument();
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 5b2d2476ffcf..44e4ce1a2c34 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -54,7 +54,7 @@ public:
         ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & rPropSet,
         const sal_Char* pFilterName,
-        sal_Bool bEncrypted );
+        bool bEncrypted );
 
     sal_uLong ReadThroughComponent(
          const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
@@ -82,7 +82,7 @@ class SmXMLImport : public SvXMLImport
         SvXMLTokenMap *pColorTokenMap;
 
         SmNodeStack aNodeStack;
-        sal_Bool bSuccess;
+        bool bSuccess;
         OUString aText;
 
 public:
@@ -252,7 +252,7 @@ public:
         return result;
     }
 
-    sal_Bool GetSuccess()              { return bSuccess; }
+    bool GetSuccess()              { return bSuccess; }
     SAL_WARN_UNUSED_RESULT OUString GetText() { return aText; }
     void SetText(const OUString &rStr) { aText = rStr; }
 
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 82124212ccea..35f190145a81 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -73,7 +73,7 @@ void MathType::Init()
  between math symbols and ordinary text e.g. 1=2 rather
  than 1 = 2
  */
-sal_Bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
+bool MathType::LookupChar(sal_Unicode nChar,OUString &rRet,sal_uInt8 nVersion,
     sal_uInt8 nTypeFace)
 {
     bool bRet=false;
@@ -1830,7 +1830,7 @@ void MathType::HandleAlign(sal_uInt8 nHorAlign, sal_uInt8 /*nVAlign*/, int &rSet
 
 /* set size of text, complexity due to overuse of signedness as a flag
  * indicator by mathtype file format*/
-sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSize)
+bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSize)
 {
     bool bRet=false;
     if (nLstSize < 0)
@@ -2175,7 +2175,7 @@ void MathType::HandleRoot(SmNode *pNode,int nLevel)
 }
 
 sal_uInt8 MathType::HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel,
-    sal_uLong *pPos,sal_Bool bTest)
+    sal_uLong *pPos,bool bTest)
 {
     sal_uInt8 nVariation2=0xff;
 
@@ -2362,7 +2362,7 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
     SmNode *pRight=pNode->GetSubNode(2);
 
     pS->WriteUChar( sal_uInt8(TMPL) ); //Template
-    bIsReInterpBrace=0;
+    bIsReInterpBrace=false;
     sal_uInt8 nBSpec=0x10;
     sal_uLong nLoc = pS->Tell();
     if (pLeft)
@@ -2429,7 +2429,7 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
         pS->WriteUChar( sal_uInt8(CHAR) );
         pS->WriteUChar( sal_uInt8(0x96) );
         pS->WriteUInt16( sal_uInt16(0xEC07) );
-        bIsReInterpBrace=0;
+        bIsReInterpBrace=false;
     }
     if (pRight)
         HandleNodes(pRight,nLevel+1);
@@ -2481,7 +2481,7 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel)
         case TLLINT:
         case TLLLINT:
             nVariation=HandleCScript(pNode->GetSubNode(0),
-                pNode->GetSubNode(1),nLevel,&nPos,0);
+                pNode->GetSubNode(1),nLevel,&nPos,false);
             break;
         default:
             nVariation=HandleCScript(pNode->GetSubNode(0),
@@ -2857,7 +2857,7 @@ void MathType::HandleSetSize()
 }
 
 int MathType::HandleChar(sal_Int32 &rTextStart,int &rSetSize,int nLevel,
-    sal_uInt8 nTag,sal_uInt8 nSelector,sal_uInt8 nVariation, sal_Bool bSilent)
+    sal_uInt8 nTag,sal_uInt8 nSelector,sal_uInt8 nVariation, bool bSilent)
 {
     sal_Unicode nChar;
     int nRet=1;
@@ -2964,7 +2964,7 @@ int MathType::HandleChar(sal_Int32 &rTextStart,int &rSetSize,int nLevel,
     return nRet;
 }
 
-sal_Bool MathType::HandleLim(SmNode *pNode,int nLevel)
+bool MathType::HandleLim(SmNode *pNode,int nLevel)
 {
     bool bRet=false;
     //Special case for the "lim" option in StarMath
@@ -3069,7 +3069,7 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/)
     {
         pS->WriteUChar( sal_uInt8(END) );
         pS->WriteUChar( sal_uInt8(LINE) );
-        bIsReInterpBrace=1;
+        bIsReInterpBrace=true;
         return;
     }
     SmMathSymbolNode *pTemp=(SmMathSymbolNode *)pNode;
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index 402e017b0301..9876710c5041 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -41,7 +41,7 @@ public:
 
 struct LessMathTypeFont
 {
-    sal_Bool operator() (const MathTypeFont &rValue1,
+    bool operator() (const MathTypeFont &rValue1,
         const MathTypeFont &rValue2) const
     {
         return rValue1.nTface < rValue2.nTface;
@@ -72,8 +72,8 @@ public:
         , nCurSize(0)
         , nLastSize(0)
         , nSpec(0)
-        , bIsSilent(sal_False)
-        , bIsReInterpBrace(sal_False)
+        , bIsSilent(false)
+        , bIsReInterpBrace(false)
         , nPostSup(0)
         , nPostlSup(0)
         , nTypeFace(0)
@@ -100,8 +100,8 @@ public:
         , nCurSize(0)
         , nLastSize(0)
         , nSpec(0)
-        , bIsSilent(sal_False)
-        , bIsReInterpBrace(sal_False)
+        , bIsSilent(false)
+        , bIsReInterpBrace(false)
         , nPostSup(0)
         , nPostlSup(0)
         , nTypeFace(0)
@@ -126,7 +126,7 @@ private:
 
     int HandleRecords(int nLevel=0,sal_uInt8 nSelector=0xFF,
         sal_uInt8 nVariation=0xFF,int nRows=0,int nCols=0);
-    sal_Bool HandleSize(sal_Int16 nLSize,sal_Int16 nDSize, int &rSetSize);
+    bool HandleSize(sal_Int16 nLSize,sal_Int16 nDSize, int &rSetSize);
     void HandleAlign(sal_uInt8 nHAlign,sal_uInt8 nVAlign, int &rSetAlign);
     int HandlePile(int &rSetAlign,int nLevel,sal_uInt8 nSelector,
         sal_uInt8 nVariation);
@@ -139,7 +139,7 @@ private:
     void HandleSetSize();
     int HandleChar(sal_Int32 &rTextStart,int &rSetSize,int nLevel,
         sal_uInt8 nTag,sal_uInt8 nSelector,sal_uInt8 nVariation,
-        sal_Bool bSilent);
+        bool bSilent);
     void HandleNudge();
     int xfLMOVE(sal_uInt8 nTest) const {return nTest&0x80;}
     int xfAUTO(sal_uInt8 nTest) const {return nTest&0x10;}
@@ -156,12 +156,12 @@ private:
     void HandleRoot(SmNode *pNode,int nLevel);
     void HandleSubSupScript(SmNode *pNode,int nLevel);
     sal_uInt8 HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel,
-        sal_uLong *pPos=NULL,sal_Bool bTest=sal_True);
+        sal_uLong *pPos=NULL,bool bTest=true);
     void HandleFractions(SmNode *pNode,int nLevel);
     void HandleBrace(SmNode *pNode,int nLevel);
     void HandleVerticalBrace(SmNode *pNode,int nLevel);
     void HandleOperator(SmNode *pNode,int nLevel);
-    sal_Bool HandleLim(SmNode *pNode,int nLevel);
+    bool HandleLim(SmNode *pNode,int nLevel);
     void HandleMAlign(SmNode *pNode,int nLevel);
     void HandleMath(SmNode *pNode,int nLevel);
     void HandleText(SmNode *pNode,int nLevel);
@@ -184,7 +184,7 @@ private:
     sal_Int16 nCurSize;
     sal_Int16 nLastSize;
     sal_uInt8 nSpec;
-    sal_Bool  bIsSilent, bIsReInterpBrace;
+    bool  bIsSilent, bIsReInterpBrace;
     OUString  sPost;
     sal_Int32 nPostSup;
     sal_Int32 nPostlSup;
@@ -200,7 +200,7 @@ private:
         tmDSINT,tmTSINT,tmUHBRACE,tmLHBRACE,tmSUM,tmTINTD
     };
 public:
-    static sal_Bool LookupChar(sal_Unicode nChar,OUString &rRet,
+    static bool LookupChar(sal_Unicode nChar,OUString &rRet,
         sal_uInt8 nVersion=3,sal_uInt8 nTypeFace=0);
 };
 
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 14e0a39a595b..c3c3d6f8c320 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -91,11 +91,11 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
     // opening as template is done when a parameter tells to do so and a template filter can be detected
     // (otherwise no valid filter would be found) or if the detected filter is a template filter and
     // there is no parameter that forbids to open as template
-    sal_Bool bOpenAsTemplate = sal_False;
-    sal_Bool bWasReadOnly = sal_False, bReadOnly = sal_False;
+    bool bOpenAsTemplate = false;
+    bool bWasReadOnly = false, bReadOnly = false;
 
-    sal_Bool bRepairPackage = sal_False;
-    sal_Bool bRepairAllowed = sal_False;
+    bool bRepairPackage = false;
+    bool bRepairAllowed = false;
     bool bDeepDetection = false;
 
     // now some parameters that can already be in the array, but may be overwritten or new inserted here
@@ -404,7 +404,7 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
         lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
         nPropertyCount++;
 
-        bOpenAsTemplate = sal_True;
+        bOpenAsTemplate = true;
 
         // TODO/LATER: set progress bar that should be used
     }
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index fb29c1459e78..b5948a6c9cea 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -699,7 +699,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
             {
                 if ( (*pValues).getValueType() != ::getBooleanCppuType() )
                     throw IllegalArgumentException();
-                sal_Bool bReadonly = sal_False;
+                bool bReadonly = false;
                 if ( *pValues >>= bReadonly )
                     pDocSh->SetLoadReadonly( bReadonly );
                 break;