1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index a23f6ae784ae..225a1df48c74 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -48,13 +48,13 @@
 // OPT: inline
 
 
-USHORT SwEditShell::GetCharFmtCount() const
+sal_uInt16 SwEditShell::GetCharFmtCount() const
 {
     return GetDoc()->GetCharFmts()->Count();
 }
 
 
-SwCharFmt& SwEditShell::GetCharFmt(USHORT nFmt) const
+SwCharFmt& SwEditShell::GetCharFmt(sal_uInt16 nFmt) const
 {
     return *((*(GetDoc()->GetCharFmts()))[nFmt]);
 }
@@ -67,14 +67,14 @@ SwCharFmt* SwEditShell::GetCurCharFmt() const
                                                 RES_TXTATR_CHARFMT );
     const SfxPoolItem* pItem;
     if( GetCurAttr( aSet ) && SFX_ITEM_SET ==
-        aSet.GetItemState( RES_TXTATR_CHARFMT, FALSE, &pItem ) )
+        aSet.GetItemState( RES_TXTATR_CHARFMT, sal_False, &pItem ) )
         pFmt = ((SwFmtCharFmt*)pItem)->GetCharFmt();
 
     return pFmt;
 }
 
 
-void SwEditShell::FillByEx(SwCharFmt* pCharFmt, BOOL bReset)
+void SwEditShell::FillByEx(SwCharFmt* pCharFmt, sal_Bool bReset)
 {
     if ( bReset )
     {
@@ -128,12 +128,12 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, BOOL bReset)
 }
 
 // Frm
-USHORT SwEditShell::GetTblFrmFmtCount(BOOL bUsed) const
+sal_uInt16 SwEditShell::GetTblFrmFmtCount(sal_Bool bUsed) const
 {
     return GetDoc()->GetTblFrmFmtCount(bUsed);
 }
 
-SwFrmFmt& SwEditShell::GetTblFrmFmt(USHORT nFmt, BOOL bUsed ) const
+SwFrmFmt& SwEditShell::GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const
 {
     return GetDoc()->GetTblFrmFmt(nFmt, bUsed );
 }
@@ -157,31 +157,31 @@ SwCharFmt* SwEditShell::MakeCharFmt( const String& rName,
 // inlines im Product
 
 
-SwTxtFmtColl* SwEditShell::GetTxtCollFromPool( USHORT nId )
+SwTxtFmtColl* SwEditShell::GetTxtCollFromPool( sal_uInt16 nId )
 {
     return GetDoc()->GetTxtCollFromPool( nId );
 }
 
 
     // return das geforderte automatische  Format - Basis-Klasse !
-SwFmt* SwEditShell::GetFmtFromPool( USHORT nId )
+SwFmt* SwEditShell::GetFmtFromPool( sal_uInt16 nId )
 {
     return GetDoc()->GetFmtFromPool( nId );
 }
 
 
-SwPageDesc* SwEditShell::GetPageDescFromPool( USHORT nId )
+SwPageDesc* SwEditShell::GetPageDescFromPool( sal_uInt16 nId )
 {
     return GetDoc()->GetPageDescFromPool( nId );
 }
 
 
-BOOL SwEditShell::IsUsed( const SwModify& rModify ) const
+sal_Bool SwEditShell::IsUsed( const SwModify& rModify ) const
 {
     return pDoc->IsUsed( rModify );
 }
 
-const SwFlyFrmFmt* SwEditShell::FindFlyByName( const String& rName, BYTE nNdTyp ) const
+const SwFlyFrmFmt* SwEditShell::FindFlyByName( const String& rName, sal_uInt8 nNdTyp ) const
 {
     return pDoc->FindFlyByName(rName, nNdTyp);
 }