Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 28 insertions, 28 deletions

diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index e4392944abdc..705d118178cf 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -53,10 +53,10 @@ struct ScHTMLStyle
 {   // Defaults aus StyleSheet
     Color               aBackgroundColor;
     String              aFontFamilyName;
-    UINT32              nFontHeight;        // Item-Value
-    USHORT              nFontSizeNumber;    // HTML value 1-7
-    BYTE                nDefaultScriptType; // Font values are valid for the default script type
-    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
+    sal_Bool                bInitialized;
 
     ScHTMLStyle() : nFontHeight(0), nFontSizeNumber(2), nDefaultScriptType(0),
         bInitialized(0) {}
@@ -79,13 +79,13 @@ struct ScHTMLGraphEntry
     Size                aSize;          // Groesse in Pixeln
     Size                aSpace;         // Spacing in Pixeln
     SdrObject*          pObject;
-    BOOL                bInCell;        // ob in Zelle ausgegeben wird
-    BOOL                bWritten;
+    sal_Bool                bInCell;        // ob in Zelle ausgegeben wird
+    sal_Bool                bWritten;
 
     ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange,
-        const Size& rSize,  BOOL bIn, const Size& rSpace ) :
+        const Size& rSize,  sal_Bool bIn, const Size& rSpace ) :
         aRange( rRange ), aSize( rSize ), aSpace( rSpace ),
-        pObject( pObj ), bInCell( bIn ), bWritten( FALSE ) {}
+        pObject( pObj ), bInCell( bIn ), bWritten( false ) {}
 };
 
 
@@ -95,11 +95,11 @@ const short nIndentMax = 23;
 class ScHTMLExport : public ScExportBase
 {
     // default HtmlFontSz[1-7]
-    static const USHORT nDefaultFontSize[SC_HTML_FONTSIZES];
+    static const sal_uInt16 nDefaultFontSize[SC_HTML_FONTSIZES];
     // HtmlFontSz[1-7] in s*3.ini [user]
-    static USHORT       nFontSize[SC_HTML_FONTSIZES];
+    static sal_uInt16       nFontSize[SC_HTML_FONTSIZES];
     static const char*  pFontSizeCss[SC_HTML_FONTSIZES];
-    static const USHORT nCellSpacing;
+    static const sal_uInt16 nCellSpacing;
     static const sal_Char sIndentSource[];
 
     boost::ptr_vector< ScHTMLGraphEntry > aGraphList;
@@ -115,13 +115,13 @@ class ScHTMLExport : public ScExportBase
     SCTAB               nUsedTables;
     short               nIndent;
     sal_Char            sIndent[nIndentMax+1];
-    BOOL                bAll;           // ganzes Dokument
-    BOOL                bTabHasGraphics;
-    BOOL                bTabAlignedLeft;
-    BOOL                bCalcAsShown;
-    BOOL                bCopyLocalFileToINet;
-    BOOL                bTableDataWidth;
-    BOOL                bTableDataHeight;
+    sal_Bool                bAll;           // ganzes Dokument
+    sal_Bool                bTabHasGraphics;
+    sal_Bool                bTabAlignedLeft;
+    sal_Bool                bCalcAsShown;
+    sal_Bool                bCopyLocalFileToINet;
+    sal_Bool                bTableDataWidth;
+    sal_Bool                bTableDataHeight;
 
     const SfxItemSet&   PageDefaults( SCTAB nTab );
 
@@ -133,16 +133,16 @@ class ScHTMLExport : public ScExportBase
     void                WriteGraphEntry( ScHTMLGraphEntry* );
     void                WriteImage( String& rLinkName,
                                     const Graphic&, const ByteString& rImgOptions,
-                                    ULONG nXOutFlags = 0 );
+                                    sal_uLong nXOutFlags = 0 );
                             // nXOutFlags fuer XOutBitmap::WriteGraphic
 
                         // write to stream if and only if URL fields in edit cell
-    BOOL                WriteFieldText( const ScEditCell* pCell );
+    sal_Bool                WriteFieldText( const ScEditCell* pCell );
 
                         // kopiere ggfs. eine lokale Datei ins Internet
-    BOOL                CopyLocalFileToINet( String& rFileNm,
-                            const String& rTargetNm, BOOL bFileToFile = FALSE );
-    BOOL                HasCId() { return aCId.Len() > 0; }
+    sal_Bool                CopyLocalFileToINet( String& rFileNm,
+                            const String& rTargetNm, sal_Bool bFileToFile = false );
+    sal_Bool                HasCId() { return aCId.Len() > 0; }
     void                MakeCIdURL( String& rURL );
 
     void                PrepareGraphics( ScDrawLayer*, SCTAB nTab,
@@ -155,18 +155,18 @@ class ScHTMLExport : public ScExportBase
     void                BorderToStyle( ByteString& rOut, const char* pBorderName,
                                        const SvxBorderLine* pLine, bool& bInsertSemicolon );
 
-    USHORT              GetFontSizeNumber( USHORT nHeight );
-    const char*         GetFontSizeCss( USHORT nHeight );
-    USHORT              ToPixel( USHORT nTwips );
+    sal_uInt16              GetFontSizeNumber( sal_uInt16 nHeight );
+    const char*         GetFontSizeCss( sal_uInt16 nHeight );
+    sal_uInt16              ToPixel( sal_uInt16 nTwips );
     Size                MMToPixel( const Size& r100thMMSize );
     void                IncIndent( short nVal );
     const sal_Char*         GetIndentStr() { return sIndent; }
 
 public:
                         ScHTMLExport( SvStream&, const String&, ScDocument*, const ScRange&,
-                                        BOOL bAll, const String& aStreamPath );
+                                        sal_Bool bAll, const String& aStreamPath );
     virtual             ~ScHTMLExport();
-    ULONG               Write();
+    sal_uLong               Write();
     const String&       GetNonConvertibleChars() const
                             { return aNonConvertibleChars; }
 };