diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
| commit | 2b9ee96b5d07cff557ea25deb6d6fbd908a08f24 (patch) | |
| tree | 1c918787691e9d69e1f952768a08406931cd34e9 /sw/inc/ndhints.hxx | |
| parent | a3c0c3a8762e47be72de05ac3ae1fc5032f2a1a9 (diff) | |
| parent | c50e8a2df2e04d9d2c225df0ea648f0501acc250 (diff) | |
sw34bf03: merge to-be-m100 DEV300_next
Diffstat (limited to 'sw/inc/ndhints.hxx')
| -rw-r--r-- | sw/inc/ndhints.hxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index 34224539e22b..d549368d90f2 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -94,31 +94,31 @@ protected: //FIXME: why are the non-const methods public? public: void Insert( const SwTxtAttr *pHt ); - void DeleteAtPos( const USHORT nPosInStart ); + void DeleteAtPos( const sal_uInt16 nPosInStart ); bool Resort(); - SwTxtAttr * Cut( const USHORT nPosInStart ); + SwTxtAttr * Cut( const sal_uInt16 nPosInStart ); - inline const SwTxtAttr * GetStart( const USHORT nPos ) const + inline const SwTxtAttr * GetStart( const sal_uInt16 nPos ) const { return m_HintStarts[nPos]; } - inline const SwTxtAttr * GetEnd ( const USHORT nPos ) const + inline const SwTxtAttr * GetEnd ( const sal_uInt16 nPos ) const { return m_HintEnds [nPos]; } - inline SwTxtAttr * GetStart( const USHORT nPos ) + inline SwTxtAttr * GetStart( const sal_uInt16 nPos ) { return m_HintStarts[nPos]; } - inline SwTxtAttr * GetEnd ( const USHORT nPos ) + inline SwTxtAttr * GetEnd ( const sal_uInt16 nPos ) { return m_HintEnds [nPos]; } - inline USHORT GetEndCount() const { return m_HintEnds .Count(); } - inline USHORT GetStartCount() const { return m_HintStarts.Count(); } + inline sal_uInt16 GetEndCount() const { return m_HintEnds .Count(); } + inline sal_uInt16 GetStartCount() const { return m_HintStarts.Count(); } - inline USHORT GetStartOf( const SwTxtAttr *pHt ) const; - inline USHORT GetPos( const SwTxtAttr *pHt ) const + inline sal_uInt16 GetStartOf( const SwTxtAttr *pHt ) const; + inline sal_uInt16 GetPos( const SwTxtAttr *pHt ) const { return m_HintStarts.GetPos( pHt ); } - inline SwTxtAttr * GetTextHint( const USHORT nIdx ) + inline SwTxtAttr * GetTextHint( const sal_uInt16 nIdx ) { return GetStart(nIdx); } - inline const SwTxtAttr * operator[]( const USHORT nIdx ) const + inline const SwTxtAttr * operator[]( const sal_uInt16 nIdx ) const { return m_HintStarts[nIdx]; } - inline USHORT Count() const { return m_HintStarts.Count(); } + inline sal_uInt16 Count() const { return m_HintStarts.Count(); } #ifdef DBG_UTIL bool Check() const; @@ -153,7 +153,7 @@ private: // Because the TextNode also guarantees removal of the Character for // attributes without an end. friend class SwTxtNode; - void DeleteAtPos( const USHORT nPos ); + void DeleteAtPos( const sal_uInt16 nPos ); // Delete the given Hint. The Hint must actually be in the array! void Delete( SwTxtAttr* pTxtHt ); @@ -208,9 +208,9 @@ SvStream &operator<<(SvStream &aS, const SwpHints &rHints); //$ ostream * Inline Implementations *************************************************************************/ -inline USHORT SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const +inline sal_uInt16 SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const { - USHORT nPos; + sal_uInt16 nPos; if ( !m_HintStarts.Seek_Entry( pHt, &nPos ) ) { nPos = USHRT_MAX; @@ -218,7 +218,7 @@ inline USHORT SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const return nPos; } -inline SwTxtAttr *SwpHintsArray::Cut( const USHORT nPosInStart ) +inline SwTxtAttr *SwpHintsArray::Cut( const sal_uInt16 nPosInStart ) { SwTxtAttr *pHt = GetTextHint(nPosInStart); DeleteAtPos( nPosInStart ); |