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/porfly.hxx | |
| parent | SwpHintsArray/SwpHints to size_t: fixes after failed local merge (diff) | |
| download | core-2a6b9c93af295a6746372bc6ce462a02492f616d.tar.gz core-2a6b9c93af295a6746372bc6ce462a02492f616d.zip | |
Massive KSHORT/MSHORT to sal_uInt16
Change-Id: I82a899ef0cad19d62c41753ffdce07d8e33d6c9d
Diffstat (limited to 'sw/source/core/text/porfly.hxx')
| -rw-r--r-- | sw/source/core/text/porfly.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index 3508258f752b..1921c1b2dd68 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -30,12 +30,12 @@ struct SwCrsrMoveState; class SwFlyPortion : public SwFixPortion { - KSHORT nBlankWidth; + sal_uInt16 nBlankWidth; public: inline SwFlyPortion( const SwRect &rFlyRect ) : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); } - inline KSHORT GetBlankWidth( ) const { return nBlankWidth; } - inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } + inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; } + inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; } virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; OUTPUT_OPERATOR_OVERRIDE @@ -49,7 +49,7 @@ class SwFlyCntPortion : public SwLinePortion bool bDraw : 1; // DrawContact? bool bMax : 1; // Line adjustment and height == line height sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom - virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; public: // OD 29.07.2003 #110978# - use new datatype for parameter <nFlags> @@ -79,7 +79,7 @@ public: long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, objectpositioning::AsCharFlags nFlags ); - sal_Int32 GetFlyCrsrOfst( const KSHORT nOfst, const Point &rPoint, + sal_Int32 GetFlyCrsrOfst( const sal_uInt16 nOfst, const Point &rPoint, SwPosition *pPos, SwCrsrMoveState* pCMS ) const; virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; |