1 files changed, 32 insertions, 32 deletions

diff --git a/editeng/inc/editeng/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index 7921c3cd83..f5ef746005 100644..100755
--- a/editeng/inc/editeng/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -110,7 +110,7 @@ class SfxStyleSheet;
 
 struct EPosition
 {
-    USHORT		nPara;
+    sal_uInt16		nPara;
     xub_StrLen	nIndex;
 
     EPosition() :
@@ -119,7 +119,7 @@ struct EPosition
     {
     }
 
-    EPosition( USHORT nPara_, xub_StrLen nPos_ ) :
+    EPosition( sal_uInt16 nPara_, xub_StrLen nPos_ ) :
         nPara( nPara_ ),
         nIndex( nPos_ )
     {
@@ -128,14 +128,14 @@ struct EPosition
 
 struct ESelection
 {
-    USHORT		nStartPara;
+    sal_uInt16		nStartPara;
     xub_StrLen	nStartPos;
-    USHORT		nEndPara;
+    sal_uInt16		nEndPara;
     xub_StrLen	nEndPos;
 
     ESelection() : nStartPara( 0 ), nStartPos( 0 ), nEndPara( 0 ), nEndPos( 0 ) {}
 
-    ESelection( USHORT nStPara, xub_StrLen nStPos, USHORT nEPara, xub_StrLen nEPos ) :
+    ESelection( sal_uInt16 nStPara, xub_StrLen nStPos, sal_uInt16 nEPara, xub_StrLen nEPos ) :
         nStartPara( nStPara ),
         nStartPos( nStPos ),
         nEndPara( nEPara ),
@@ -143,7 +143,7 @@ struct ESelection
     {
     }
 
-    ESelection( USHORT nPara, xub_StrLen nPos ) :
+    ESelection( sal_uInt16 nPara, xub_StrLen nPos ) :
         nStartPara( nPara ),
         nStartPos( nPos ),
         nEndPara( nPara ),
@@ -152,14 +152,14 @@ struct ESelection
     }
 
     void	Adjust();
-    BOOL    IsEqual( const ESelection& rS ) const;
-    BOOL    IsLess( const ESelection& rS ) const;
-    BOOL    IsGreater( const ESelection& rS ) const;
-    BOOL    IsZero() const;
-    BOOL	HasRange() const;
+    sal_Bool    IsEqual( const ESelection& rS ) const;
+    sal_Bool    IsLess( const ESelection& rS ) const;
+    sal_Bool    IsGreater( const ESelection& rS ) const;
+    sal_Bool    IsZero() const;
+    sal_Bool	HasRange() const;
 };
 
-inline BOOL ESelection::HasRange() const
+inline sal_Bool ESelection::HasRange() const
 {
     return ( nStartPara != nEndPara ) || ( nStartPos != nEndPos );
 }
@@ -225,7 +225,7 @@ struct EDITENG_DLLPUBLIC EFieldInfo
     EPosition       aPosition;
 
     EFieldInfo();
-    EFieldInfo( const SvxFieldItem& rFieldItem, USHORT nPara, USHORT nPos );
+    EFieldInfo( const SvxFieldItem& rFieldItem, sal_uInt16 nPara, sal_uInt16 nPos );
     ~EFieldInfo();
 
     EFieldInfo( const EFieldInfo& );
@@ -283,24 +283,24 @@ struct ParagraphInfos
         , nFirstLineMaxAscent( 0 )
         , bValid( 0 )
         {}
-    USHORT	nParaHeight;
-    USHORT	nLines;
+    sal_uInt16	nParaHeight;
+    sal_uInt16	nLines;
 
-    USHORT	nFirstLineStartX;
+    sal_uInt16	nFirstLineStartX;
 
-    USHORT	nFirstLineOffset;
-    USHORT	nFirstLineHeight;
-    USHORT	nFirstLineTextHeight;
-    USHORT	nFirstLineMaxAscent;
+    sal_uInt16	nFirstLineOffset;
+    sal_uInt16	nFirstLineHeight;
+    sal_uInt16	nFirstLineTextHeight;
+    sal_uInt16	nFirstLineMaxAscent;
 
-    BOOL	bValid;	// A query during formatting is not valid!
+    sal_Bool	bValid;	// A query during formatting is not valid!
 };
 
 struct EECharAttrib
 {
     const SfxPoolItem*	pAttr;
 
-    USHORT				nPara;
+    sal_uInt16				nPara;
     xub_StrLen			nStart;
     xub_StrLen			nEnd;
 };
@@ -309,11 +309,11 @@ SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, EDITENG_DLLPUB
 
 struct MoveParagraphsInfo
 {
-    USHORT  nStartPara;
-    USHORT  nEndPara;
-    USHORT  nDestPara;
+    sal_uInt16  nStartPara;
+    sal_uInt16  nEndPara;
+    sal_uInt16  nDestPara;
 
-    MoveParagraphsInfo( USHORT nS, USHORT nE, USHORT nD )
+    MoveParagraphsInfo( sal_uInt16 nS, sal_uInt16 nE, sal_uInt16 nD )
         { nStartPara = nS; nEndPara = nE; nDestPara = nD; }
 };
 
@@ -322,9 +322,9 @@ struct MoveParagraphsInfo
 
 struct PasteOrDropInfos
 {
-    USHORT  nAction;
-    USHORT  nStartPara;
-    USHORT  nEndPara;
+    sal_uInt16  nAction;
+    sal_uInt16  nStartPara;
+    sal_uInt16  nEndPara;
 
     PasteOrDropInfos() : nAction(0), nStartPara(0xFFFF), nEndPara(0xFFFF)  {}
 };
@@ -377,10 +377,10 @@ struct EENotify
     EditEngine*     pEditEngine;
     EditView*       pEditView;
 
-    USHORT          nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED
+    sal_uInt16          nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED
 
-    USHORT          nParam1;
-    USHORT          nParam2;
+    sal_uInt16          nParam1;
+    sal_uInt16          nParam2;
 
     EENotify( EENotifyType eType )
         { eNotificationType = eType; pEditEngine = NULL; pEditView = NULL; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; }