1 files changed, 18 insertions, 18 deletions

diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 43bc12419f84..6c766ed19fe3 100755
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -78,7 +78,7 @@ class View;
 class HtmlErrorContext : public ErrorContext
 {
 private:
-    USHORT  mnResId;
+    sal_uInt16  mnResId;
     String  maURL1;
     String  maURL2;
 
@@ -86,10 +86,10 @@ public:
                     HtmlErrorContext(Window *pWin=0);
                     ~HtmlErrorContext() {};
 
-    virtual BOOL    GetString( ULONG nErrId, String& rCtxStr );
+    virtual sal_Bool    GetString( sal_uLong nErrId, String& rCtxStr );
 
-    void            SetContext( USHORT nResId, const String& rURL );
-    void            SetContext( USHORT nResId, const String& rURL1, const String& rURL2 );
+    void            SetContext( sal_uInt16 nResId, const String& rURL );
+    void            SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 );
 };
 
 // =====================================================================
@@ -110,12 +110,12 @@ class HtmlExport
     HtmlPublishMode meMode;
     SfxProgress* mpProgress;
     bool mbImpress;
-    USHORT mnSdPageCount;
-    USHORT mnPagesWritten;
+    sal_uInt16 mnSdPageCount;
+    sal_uInt16 mnPagesWritten;
     bool mbContentsPage;
-    INT16 mnButtonThema;
-    UINT16 mnWidthPixel;
-    UINT16 mnHeightPixel;
+    sal_Int16 mnButtonThema;
+    sal_uInt16 mnWidthPixel;
+    sal_uInt16 mnHeightPixel;
     PublishingFormat meFormat;
     bool mbHeader;
     bool mbNotes;
@@ -126,14 +126,14 @@ class HtmlExport
     String maAuthor;
     String maHomePage;
     String maInfo;
-    INT16 mnCompression;
+    sal_Int16 mnCompression;
     String maDocFileName;
     String maFramePage;
     String mDocTitle;
     bool mbDownload;
 
     bool mbAutoSlide;
-    UINT32  mnSlideDuration;
+    sal_uInt32  mnSlideDuration;
     bool mbSlideSound;
     bool mbHiddenSlides;
     bool mbEndless;
@@ -191,30 +191,30 @@ class HtmlExport
 
     String  CreateLink( const String& aLink, const String& aText,
                         const String& aTarget = String()) const;
-    String  CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const;
-    String  CreateNavBar( USHORT nSdPage, bool bIsText ) const;
+    String  CreateImage( const String& aImage, const String& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 ) const;
+    String  CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
     String  CreateBodyTag() const;
 
-    String  ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor );
+    String  ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPara, const Color& rBackgroundColor );
     String  TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor );
 
     String  CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
     String  CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor );
     String  CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor );
 
-    String  CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX,
-                                  ULONG nCenterY, const String& rHRef ) const;
+    String  CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX,
+                                  sal_uLong nCenterY, const String& rHRef ) const;
     String  CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const;
     String  CreateHTMLRectArea( const Rectangle& rRect,
                                 const String& rHRef ) const;
 
-    String  CreatePageURL( USHORT nPgNum );
+    String  CreatePageURL( sal_uInt16 nPgNum );
 
     String InsertSound( const String& rSoundFile );
     bool CopyFile( const String& rSourceFile, const String& rDestPath );
     bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false );
 
-    void InitProgress( USHORT nProgrCount );
+    void InitProgress( sal_uInt16 nProgrCount );
     void ResetProgress();
 
     String WriteMetaCharset() const;