diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-22 17:14:17 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-22 23:50:43 +0200 |
| commit | 2a6b9c93af295a6746372bc6ce462a02492f616d (patch) | |
| tree | 743607c6395ab97935c5110a137521c5f734c8c5 /sw/source/core/text/porfld.hxx | |
| parent | 1a6bc665eb727763265483132db43aee87288deb (diff) | |
Massive KSHORT/MSHORT to sal_uInt16
Change-Id: I82a899ef0cad19d62c41753ffdce07d8e33d6c9d
Diffstat (limited to 'sw/source/core/text/porfld.hxx')
| -rw-r--r-- | sw/source/core/text/porfld.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index 25adb3602a01..ec74bb2e5b87 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -36,7 +36,7 @@ protected: SwFont *pFnt; // For multi-line fields sal_Int32 nNextOffset; // Offset of the follow in the original string sal_Int32 nNextScriptChg; - KSHORT nViewWidth; // Screen width for empty fields + sal_uInt16 nViewWidth; // Screen width for empty fields bool bFollow : 1; // 2nd or later part of a field bool bLeft : 1; // Used by SwNumberPortion bool bHide : 1; // Used by SwNumberPortion @@ -72,7 +72,7 @@ public: // Empty fields are also allowed virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; inline bool IsFollow() const { return bFollow; } inline void SetFollow( bool bNew ) { bFollow = bNew; } @@ -126,8 +126,8 @@ public: class SwNumberPortion : public SwFldPortion { protected: - KSHORT nFixWidth; // See Glues - KSHORT nMinDist; // Minimal distance to the text + sal_uInt16 nFixWidth; // See Glues + sal_uInt16 nMinDist; // Minimal distance to the text bool mbLabelAlignmentPosAndSpaceModeActive; public: @@ -135,10 +135,10 @@ public: SwFont *pFnt, const bool bLeft, const bool bCenter, - const KSHORT nMinDst, + const sal_uInt16 nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; - virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; // Field cloner for SplitGlue @@ -156,7 +156,7 @@ public: SwFont *pFnt, const bool bLeft, const bool bCenter, - const KSHORT nMinDst, + const sal_uInt16 nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); OUTPUT_OPERATOR_OVERRIDE }; @@ -176,7 +176,7 @@ public: const Size& rGrfSize, const bool bLeft, const bool bCenter, - const KSHORT nMinDst, + const sal_uInt16 nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); virtual ~SwGrfNumPortion(); virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; @@ -220,7 +220,7 @@ public: SwCombinedPortion( const OUString &rExpand ); virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; OUTPUT_OPERATOR_OVERRIDE }; |