diff options
Diffstat (limited to 'sw/source/filter/inc/rtf.hxx')
-rw-r--r-- | sw/source/filter/inc/rtf.hxx | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx index 9f7578fd5f71..4ca97a99648e 100644 --- a/sw/source/filter/inc/rtf.hxx +++ b/sw/source/filter/inc/rtf.hxx @@ -34,23 +34,23 @@ class RTFVertOrient { union { struct { - USHORT nOrient : 4; - USHORT nRelOrient : 1; + sal_uInt16 nOrient : 4; + sal_uInt16 nRelOrient : 1; } Flags; - USHORT nVal; + sal_uInt16 nVal; } Value; public: - RTFVertOrient( USHORT nValue ) { Value.nVal = nValue; } + RTFVertOrient( sal_uInt16 nValue ) { Value.nVal = nValue; } - RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) { + RTFVertOrient( sal_uInt16 nOrient, sal_uInt16 nRelOrient ) { Value.Flags.nOrient = nOrient; Value.Flags.nRelOrient = nRelOrient; } - USHORT GetOrient() const { return Value.Flags.nOrient; } - USHORT GetRelation() const { return Value.Flags.nRelOrient; } - USHORT GetValue() const { return Value.nVal; } + sal_uInt16 GetOrient() const { return Value.Flags.nOrient; } + sal_uInt16 GetRelation() const { return Value.Flags.nRelOrient; } + sal_uInt16 GetValue() const { return Value.nVal; } }; @@ -58,50 +58,50 @@ class RTFHoriOrient { union { struct { - USHORT nOrient : 4; - USHORT nRelAnchor : 4; - USHORT nRelOrient : 1; + sal_uInt16 nOrient : 4; + sal_uInt16 nRelAnchor : 4; + sal_uInt16 nRelOrient : 1; } Flags; - USHORT nVal; + sal_uInt16 nVal; } Value; public: - RTFHoriOrient( USHORT nValue ) { Value.nVal = nValue; } + RTFHoriOrient( sal_uInt16 nValue ) { Value.nVal = nValue; } - RTFHoriOrient( USHORT nOrient, USHORT nRelOrient ) { + RTFHoriOrient( sal_uInt16 nOrient, sal_uInt16 nRelOrient ) { Value.Flags.nOrient = nOrient; Value.Flags.nRelOrient = nRelOrient; Value.Flags.nRelAnchor = 0; } - USHORT GetOrient() const { return Value.Flags.nOrient; } - USHORT GetRelation() const { return Value.Flags.nRelOrient; } - USHORT GetValue() const { return Value.nVal; } + sal_uInt16 GetOrient() const { return Value.Flags.nOrient; } + sal_uInt16 GetRelation() const { return Value.Flags.nRelOrient; } + sal_uInt16 GetValue() const { return Value.nVal; } }; class RTFProtect { union { struct { - BOOL bCntnt : 1; - BOOL bSize : 1; - BOOL bPos : 1; + sal_Bool bCntnt : 1; + sal_Bool bSize : 1; + sal_Bool bPos : 1; } Flags; - BYTE nVal; + sal_uInt8 nVal; } Value; public: - RTFProtect( BYTE nValue ) { Value.nVal = nValue; } + RTFProtect( sal_uInt8 nValue ) { Value.nVal = nValue; } - RTFProtect( BOOL bCntnt, BOOL bSize, BOOL bPos ) { + RTFProtect( sal_Bool bCntnt, sal_Bool bSize, sal_Bool bPos ) { Value.Flags.bCntnt = bCntnt; Value.Flags.bSize = bSize; Value.Flags.bPos = bPos; } - BOOL GetCntnt() const { return Value.Flags.bCntnt; } - BOOL GetSize() const { return Value.Flags.bSize; } - BOOL GetPos() const { return Value.Flags.bPos; } - USHORT GetValue() const { return Value.nVal; } + sal_Bool GetCntnt() const { return Value.Flags.bCntnt; } + sal_Bool GetSize() const { return Value.Flags.bSize; } + sal_Bool GetPos() const { return Value.Flags.bPos; } + sal_uInt16 GetValue() const { return Value.nVal; } }; @@ -109,22 +109,22 @@ class RTFSurround { union { struct { - USHORT nGoldCut : 1; - USHORT nOrder : 4; + sal_uInt16 nGoldCut : 1; + sal_uInt16 nOrder : 4; } Flags; - BYTE nVal; + sal_uInt8 nVal; } Value; public: - RTFSurround( BYTE nValue ) { Value.nVal = nValue; } + RTFSurround( sal_uInt8 nValue ) { Value.nVal = nValue; } - RTFSurround( BOOL bGoldCut, BYTE nOrder ) { + RTFSurround( sal_Bool bGoldCut, sal_uInt8 nOrder ) { Value.Flags.nOrder = nOrder; Value.Flags.nGoldCut = bGoldCut; } - BYTE GetOrder() const { return (BYTE)Value.Flags.nOrder; } - BOOL GetGoldCut() const { return (BOOL)Value.Flags.nGoldCut; } - USHORT GetValue() const { return Value.nVal; } + sal_uInt8 GetOrder() const { return (sal_uInt8)Value.Flags.nOrder; } + sal_Bool GetGoldCut() const { return (sal_Bool)Value.Flags.nGoldCut; } + sal_uInt16 GetValue() const { return Value.nVal; } }; #endif // _RTF_HXX |