diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-02-20 10:48:55 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-20 10:48:55 +0100 |
commit | 4137f39d7b13c0ad2e649d7efb02ecfc14a31a25 (patch) | |
tree | c648feebc267f58186c467955ebc76f24854dc5e /sw/inc/index.hxx | |
parent | Don't bother mentioning the Tru64 'setld' package format (diff) | |
download | core-4137f39d7b13c0ad2e649d7efb02ecfc14a31a25.tar.gz core-4137f39d7b13c0ad2e649d7efb02ecfc14a31a25.zip |
Revert "fdo#63154 Remove unused solar.h reference in sw."
sal_uIntPtr should only be used to represent pointers cast to integers.
This reverts commit 067d08029384af6e620f0fc48e31ff2a740e1fc8.
Diffstat (limited to 'sw/inc/index.hxx')
-rw-r--r-- | sw/inc/index.hxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index bd8d94bcc607..fc2caa527aba 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -22,6 +22,7 @@ #include <limits.h> #include "rtl/instance.hxx" +#include <tools/solar.h> #include <tools/rtti.hxx> #include <swdllapi.h> @@ -139,19 +140,16 @@ inline sal_Int32 SwIndex::operator++() { return ChgValue( *this, m_nIndex+1 ).m_nIndex; } - inline sal_Int32 SwIndex::operator--() { return ChgValue( *this, m_nIndex-1 ).m_nIndex; } - inline sal_Int32 SwIndex::operator++(int) { sal_Int32 const nOldIndex = m_nIndex; ChgValue( *this, m_nIndex+1 ); return nOldIndex; } - inline sal_Int32 SwIndex::operator--(int) { sal_Int32 const nOldIndex = m_nIndex; @@ -163,17 +161,14 @@ inline sal_Int32 SwIndex::operator+=( sal_Int32 const nVal ) { return ChgValue( *this, m_nIndex + nVal ).m_nIndex; } - inline sal_Int32 SwIndex::operator-=( sal_Int32 const nVal ) { return ChgValue( *this, m_nIndex - nVal ).m_nIndex; } - inline sal_Int32 SwIndex::operator+=( const SwIndex& rIndex ) { return ChgValue( *this, m_nIndex + rIndex.m_nIndex ).m_nIndex; } - inline sal_Int32 SwIndex::operator-=( const SwIndex& rIndex ) { return ChgValue( *this, m_nIndex - rIndex.m_nIndex ).m_nIndex; @@ -183,22 +178,18 @@ inline bool SwIndex::operator< ( const SwIndex& rIndex ) const { return m_nIndex < rIndex.m_nIndex; } - inline bool SwIndex::operator<=( const SwIndex& rIndex ) const { return m_nIndex <= rIndex.m_nIndex; } - inline bool SwIndex::operator> ( const SwIndex& rIndex ) const { return m_nIndex > rIndex.m_nIndex; } - inline bool SwIndex::operator>=( const SwIndex& rIndex ) const { return m_nIndex >= rIndex.m_nIndex; } - inline SwIndex& SwIndex::operator= ( sal_Int32 const nVal ) { if (m_nIndex != nVal) |