1 files changed, 29 insertions, 29 deletions

diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index bf88111742b3..8e487a21fc85 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -42,10 +42,10 @@ class SwImpBlocks;
 class SwXMLTextBlocks : public SwImpBlocks
 {
 protected:
-    BOOL         bAutocorrBlock;
-    BOOL         bBlock;
+    sal_Bool         bAutocorrBlock;
+    sal_Bool         bBlock;
     SfxObjectShellRef xDocShellRef;
-    USHORT       nFlags;
+    sal_uInt16       nFlags;
     String       aPackageName;
     SfxMediumRef xMedium;
 
@@ -60,50 +60,50 @@ public:
     short               nCurBlk;
     SwXMLTextBlocks( const String& rFile );
     SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFile );
-    void   AddName( const String&, const String&, const String&, BOOL bOnlyTxt = FALSE );
-    virtual void   AddName( const String&, const String&, BOOL bOnlyTxt = FALSE );
+    void   AddName( const String&, const String&, const String&, sal_Bool bOnlyTxt = sal_False );
+    virtual void   AddName( const String&, const String&, sal_Bool bOnlyTxt = sal_False );
     void GeneratePackageName ( const String& rShort, String& rPackageName );
     virtual ~SwXMLTextBlocks();
-    //virtual BOOL   IsOld() const;
-    virtual ULONG Delete( USHORT );
-    virtual ULONG Rename( USHORT, const String&, const String& );
-    virtual ULONG CopyBlock( SwImpBlocks& rImp, String& rShort, const String& rLong);
+    //virtual sal_Bool   IsOld() const;
+    virtual sal_uLong Delete( sal_uInt16 );
+    virtual sal_uLong Rename( sal_uInt16, const String&, const String& );
+    virtual sal_uLong CopyBlock( SwImpBlocks& rImp, String& rShort, const String& rLong);
     virtual void  ClearDoc();
-    virtual ULONG GetDoc( USHORT );
-    virtual ULONG BeginPutDoc( const String&, const String& );
-    virtual ULONG PutDoc();
-    virtual ULONG GetText( USHORT, String& );
-    virtual ULONG PutText( const String&, const String&, const String& );
-    virtual ULONG MakeBlockList();
+    virtual sal_uLong GetDoc( sal_uInt16 );
+    virtual sal_uLong BeginPutDoc( const String&, const String& );
+    virtual sal_uLong PutDoc();
+    virtual sal_uLong GetText( sal_uInt16, String& );
+    virtual sal_uLong PutText( const String&, const String&, const String& );
+    virtual sal_uLong MakeBlockList();
 
     virtual short GetFileType ( void ) const;
-    virtual ULONG OpenFile( BOOL bReadOnly = TRUE );
+    virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True );
     virtual void  CloseFile();
 
-    static BOOL IsFileUCBStorage( const String & rFileName);
+    static sal_Bool IsFileUCBStorage( const String & rFileName);
 
     // Methods for the new Autocorrecter
-    ULONG GetText( const String& rShort, String& );
+    sal_uLong GetText( const String& rShort, String& );
 
-    virtual BOOL IsOnlyTextBlock( const String& rShort ) const;
-    virtual BOOL IsOnlyTextBlock( USHORT nIdx ) const;
-    virtual void SetIsTextOnly( const String& rShort, BOOL bNewValue );
-    virtual void SetIsTextOnly( USHORT nIdx, BOOL bNewValue );
+    virtual sal_Bool IsOnlyTextBlock( const String& rShort ) const;
+    virtual sal_Bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
+    virtual void SetIsTextOnly( const String& rShort, sal_Bool bNewValue );
+    virtual void SetIsTextOnly( sal_uInt16 nIdx, sal_Bool bNewValue );
 
-    virtual ULONG GetMacroTable( USHORT, SvxMacroTableDtor& rMacroTbl,
+    virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl,
                                  sal_Bool bFileAlreadyOpen = sal_False );
-    virtual ULONG SetMacroTable( USHORT nIdx,
+    virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
                                  const SvxMacroTableDtor& rMacroTable,
                                  sal_Bool bFileAlreadyOpen = sal_False );
-    virtual BOOL PutMuchEntries( BOOL bOn );
+    virtual sal_Bool PutMuchEntries( sal_Bool bOn );
 
 public:
     SwDoc* GetDoc() const { return pDoc; }
     //void  SetDoc( SwDoc * pNewDoc);
-    ULONG StartPutBlock( const String& rShort, const String& rPackageName );
-    ULONG PutBlock( SwPaM& rPaM, const String& rLong );
-    ULONG GetBlockText( const String& rShort, String& rText );
-    ULONG PutBlockText( const String& rShort, const String& rName, const String& rText,  const String& rPackageName );
+    sal_uLong StartPutBlock( const String& rShort, const String& rPackageName );
+    sal_uLong PutBlock( SwPaM& rPaM, const String& rLong );
+    sal_uLong GetBlockText( const String& rShort, String& rText );
+    sal_uLong PutBlockText( const String& rShort, const String& rName, const String& rText,  const String& rPackageName );
     void MakeBlockText( const String& rText );
 
 };