sal_Bool->bool

Change-Id: I7009519bdf68459f53423720d411c3e6d0ac3d73

sc/source/filter/html/htmlexp.cxx

@@ -210,7 +210,7 @@ static OString lcl_makeHTMLColorTriplet(const Color& rColor)
 
 ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocument* pDocP,
                             const ScRange& rRangeP,
-                            sal_Bool bAllP, const OUString& rStreamPathP ) :
+                            bool bAllP, const OUString& rStreamPathP ) :
     ScExportBase( rStrmP, pDocP, rRangeP ),
     aBaseURL( rBaseURL ),
     aStreamPath( rStreamPathP ),
@@ -221,8 +221,8 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocume
     bTabHasGraphics( false ),
     bTabAlignedLeft( false ),
     bCalcAsShown( pDocP->GetDocOptions().IsCalcAsShown() ),
-    bTableDataWidth( sal_True ),
-    bTableDataHeight( sal_True )
+    bTableDataWidth( true ),
+    bTableDataHeight( true )
 {
     strcpy( sIndent, sIndentSource );
     sIndent[0] = 0;
@@ -478,7 +478,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
     {
         const SvxBrushItem* pBrushItem = (const SvxBrushItem*)&rSet.Get( ATTR_BACKGROUND );
         aHTMLStyle.aBackgroundColor = pBrushItem->GetColor();
-        aHTMLStyle.bInitialized = sal_True;
+        aHTMLStyle.bInitialized = true;
     }
     return rSet;
 }
@@ -770,7 +770,7 @@ void ScHTMLExport::WriteTables()
         // IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody );
         // At least old (3.x, 4.x?) Netscape doesn't follow <TABLE COLS=n> and
         // <COL WIDTH=x> specified, but needs a width at every column.
-        bTableDataWidth = sal_True;     // widths in first row
+        bTableDataWidth = true;     // widths in first row
         bool bHasHiddenRows = pDoc->HasHiddenRows(nStartRow, nEndRow, nTab);
         for ( SCROW nRow=nStartRow; nRow<=nEndRow; nRow++ )
         {
@@ -782,7 +782,7 @@ void ScHTMLExport::WriteTables()
             }
 
             IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tablerow );
-            bTableDataHeight = sal_True;  // height at every first cell of each row
+            bTableDataHeight = true;  // height at every first cell of each row
             for ( SCCOL nCol2=nStartCol; nCol2<=nEndCol; nCol2++ )
             {
                 if ( pDoc->ColHidden(nCol2, nTab) )
@@ -1235,10 +1235,10 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
 }
 
 
-sal_Bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
-        const OUString& rTargetNm, sal_Bool bFileToFile )
+bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
+        const OUString& rTargetNm, bool bFileToFile )
 {
-    sal_Bool bRet = false;
+    bool bRet = false;
     INetURLObject aFileUrl, aTargetUrl;
     aFileUrl.SetSmartURL( rFileNm );
     aTargetUrl.SetSmartURL( rTargetNm );
@@ -1255,7 +1255,7 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
             if( it != pFileNameMap->end() )
             {
                 rFileNm = it->second;
-                return sal_True;
+                return true;
             }
         }
         else

sc/source/filter/html/htmlexp2.cxx

@@ -58,7 +58,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
                 ScHTMLGraphEntry* pE = &aGraphList[ i ];
                 if ( !pE->bInCell )
                 {   // not all cells: table next to some
-                    bTabAlignedLeft = sal_True;
+                    bTabAlignedLeft = true;
                     break;
                 }
             }
@@ -155,7 +155,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
             if ( pSGO->IsLinkedGraphic() )
                 aLinkName = pSGO->GetFileName();
             WriteImage( aLinkName, pSGO->GetGraphic(), aOpt, nXOutFlags );
-            pE->bWritten = sal_True;
+            pE->bWritten = true;
         }
         break;
         case OBJ_OLE2:
@@ -165,7 +165,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
             {
                 OUString aLinkName;
                 WriteImage( aLinkName, *pGraphic, aOpt );
-                pE->bWritten = sal_True;
+                pE->bWritten = true;
             }
         }
         break;
@@ -175,7 +175,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
                 pDoc->GetDrawLayer(), pObject ) );
             OUString aLinkName;
             WriteImage( aLinkName, aGraph, aOpt );
-            pE->bWritten = sal_True;
+            pE->bWritten = true;
         }
     }
 }

sc/source/filter/inc/htmlexp.hxx

@@ -45,13 +45,13 @@ struct ScHTMLStyle
 {   // Defaults aus StyleSheet
     Color               aBackgroundColor;
     OUString            aFontFamilyName;
-    sal_uInt32              nFontHeight;        // Item-Value
-    sal_uInt16              nFontSizeNumber;    // HTML value 1-7
-    sal_uInt8                nDefaultScriptType; // Font values are valid for the default script type
-    sal_Bool                bInitialized;
+    sal_uInt32          nFontHeight;        // Item-Value
+    sal_uInt16          nFontSizeNumber;    // HTML value 1-7
+    sal_uInt8           nDefaultScriptType; // Font values are valid for the default script type
+    bool                bInitialized;
 
     ScHTMLStyle() : nFontHeight(0), nFontSizeNumber(2), nDefaultScriptType(0),
-        bInitialized(0) {}
+        bInitialized(false) {}
 
     const ScHTMLStyle& operator=( const ScHTMLStyle& r )
         {
@@ -71,11 +71,11 @@ struct ScHTMLGraphEntry
     Size                aSize;          // Groesse in Pixeln
     Size                aSpace;         // Spacing in Pixeln
     SdrObject*          pObject;
-    sal_Bool                bInCell;        // ob in Zelle ausgegeben wird
-    sal_Bool                bWritten;
+    bool                bInCell;        // ob in Zelle ausgegeben wird
+    bool                bWritten;
 
     ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange,
-        const Size& rSize,  sal_Bool bIn, const Size& rSpace ) :
+        const Size& rSize,  bool bIn, const Size& rSpace ) :
         aRange( rRange ), aSize( rSize ), aSpace( rSpace ),
         pObject( pObj ), bInCell( bIn ), bWritten( false ) {}
 };
@@ -106,13 +106,13 @@ class ScHTMLExport : public ScExportBase
     SCTAB               nUsedTables;
     short               nIndent;
     sal_Char            sIndent[nIndentMax+1];
-    sal_Bool                bAll;           // ganzes Dokument
-    sal_Bool                bTabHasGraphics;
-    sal_Bool                bTabAlignedLeft;
-    sal_Bool                bCalcAsShown;
-    sal_Bool                bCopyLocalFileToINet;
-    sal_Bool                bTableDataWidth;
-    sal_Bool                bTableDataHeight;
+    bool                bAll;           // ganzes Dokument
+    bool                bTabHasGraphics;
+    bool                bTabAlignedLeft;
+    bool                bCalcAsShown;
+    bool                bCopyLocalFileToINet;
+    bool                bTableDataWidth;
+    bool                bTableDataHeight;
 
     const SfxItemSet&   PageDefaults( SCTAB nTab );
 
@@ -131,9 +131,9 @@ class ScHTMLExport : public ScExportBase
     bool WriteFieldText( const EditTextObject* pData );
 
                         // kopiere ggfs. eine lokale Datei ins Internet
-    sal_Bool            CopyLocalFileToINet( OUString& rFileNm,
-                            const OUString& rTargetNm, sal_Bool bFileToFile = false );
-    sal_Bool            HasCId() { return !aCId.isEmpty(); }
+    bool            CopyLocalFileToINet( OUString& rFileNm,
+                            const OUString& rTargetNm, bool bFileToFile = false );
+    bool            HasCId() { return !aCId.isEmpty(); }
     void                MakeCIdURL( OUString& rURL );
 
     void                PrepareGraphics( ScDrawLayer*, SCTAB nTab,
@@ -155,7 +155,7 @@ class ScHTMLExport : public ScExportBase
 
 public:
                         ScHTMLExport( SvStream&, const OUString&, ScDocument*, const ScRange&,
-                                        sal_Bool bAll, const OUString& aStreamPath );
+                                        bool bAll, const OUString& aStreamPath );
     virtual             ~ScHTMLExport();
     sal_uLong               Write();
     const OUString&     GetNonConvertibleChars() const