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/porexp.hxx | |
| parent | 1a6bc665eb727763265483132db43aee87288deb (diff) | |
Massive KSHORT/MSHORT to sal_uInt16
Change-Id: I82a899ef0cad19d62c41753ffdce07d8e33d6c9d
Diffstat (limited to 'sw/source/core/text/porexp.hxx')
| -rw-r--r-- | sw/source/core/text/porexp.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx index 6a2e99d56ecc..4e637ed9a0db 100644 --- a/sw/source/core/text/porexp.hxx +++ b/sw/source/core/text/porexp.hxx @@ -27,7 +27,7 @@ class SwExpandPortion : public SwTxtPortion public: inline SwExpandPortion() { SetWhichPor( POR_EXP ); } virtual bool Format( SwTxtFormatInfo &rInf ) 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 GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; @@ -55,7 +55,7 @@ public: virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; - MSHORT MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx, + sal_uInt16 MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx, bool bUnderflow ) const; // Accessibility: pass information about this portion to the PortionHandler @@ -71,7 +71,7 @@ public: SwPostItsPortion( bool bScrpt ); 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; virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; bool IsScript() const { return bScript; } OUTPUT_OPERATOR_OVERRIDE |