diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2014-10-16 16:02:23 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2014-11-05 13:58:08 +0100 |
commit | 12637c634cfaebb4213f32cc83dcd0a2028c3d55 (patch) | |
tree | d455bc88518fdbac9f6f0a982e30fa285cb1f42d /sw | |
parent | 988477e2cef162c28eb5e8e91a6c40497a18f19c (diff) |
operator<< for SwPosition/SwPaM/etc. for use with SAL_DEBUG
Change-Id: I99ffa87afa6dbdbd20042a882af428d166546af3
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/index.hxx | 4 | ||||
-rw-r--r-- | sw/inc/ndindex.hxx | 3 | ||||
-rw-r--r-- | sw/inc/pam.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/bastyp/index.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/crsr/pam.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/docnode/ndindex.cxx | 5 |
6 files changed, 37 insertions, 0 deletions
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index e3648533d27d..333086186116 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -23,6 +23,8 @@ #include <tools/rtti.hxx> #include <swdllapi.h> +#include <iostream> + class SwIndexReg; struct SwPosition; @@ -107,6 +109,8 @@ public: void SetMark(const sw::mark::IMark* pMark); }; +std::ostream& operator <<(std::ostream& s, const SwIndex& index); + class SwIndexReg { friend class SwIndex; diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 028ce54db912..c8221c269c81 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_INC_NDINDEX_HXX #include <limits.h> +#include <iostream> #include <tools/solar.h> @@ -92,6 +93,8 @@ public: SwNode& GetNode() const { return *pNd; } }; +std::ostream &operator <<(std::ostream& s, const SwNodeIndex& index); + // SwRange class SW_DLLPUBLIC SwNodeRange diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index dd95d13492f7..86144536dbec 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -28,6 +28,8 @@ #include <ndindex.hxx> #include "swdllapi.h" +#include <iostream> + class SwFmt; class SfxPoolItem; class SfxItemSet; @@ -74,6 +76,8 @@ struct SW_DLLPUBLIC SwPosition bool operator !=(const SwPosition &) const; }; +std::ostream &operator <<(std::ostream& s, const SwPosition& position); + // Result of comparing positions. enum SwComparePosition { POS_BEFORE, ///< Pos1 before Pos2. @@ -301,6 +305,8 @@ public: void InvalidatePaM(); }; +std::ostream &operator <<(std::ostream& s, const SwPaM& pam); + bool CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, bool bChkSection ); #endif // INCLUDED_SW_INC_PAM_HXX diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx index b6f7632a06a5..d77e23961d6a 100644 --- a/sw/source/core/bastyp/index.cxx +++ b/sw/source/core/bastyp/index.cxx @@ -392,4 +392,9 @@ SwIndex& SwIndex::operator= ( sal_Int32 const nVal ) #endif +std::ostream& operator <<(std::ostream& s, const SwIndex& index) +{ + return s << "SwIndex offset (" << index.GetIndex() << ")"; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 5a1d1fa1eed0..ad5bbf510314 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -190,6 +190,11 @@ SwDoc * SwPosition::GetDoc() const return nNode.GetNode().GetDoc(); } +std::ostream &operator <<(std::ostream& s, const SwPosition& position) +{ + return s << "SwPosition (node " << position.nNode.GetIndex() << ", offset " << position.nContent.GetIndex() << ")"; +} + enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; static CHKSECTION lcl_TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, const SwNode& rEndNd ) @@ -1085,4 +1090,13 @@ void SwPaM::InvalidatePaM() } } +std::ostream &operator <<(std::ostream& s, const SwPaM& pam) +{ + if( pam.HasMark()) + return s << "SwPaM (point " << *pam.GetPoint() << ", mark " << *pam.GetMark() << ")"; + else + return s << "SwPaM (point " << *pam.GetPoint() << ")"; +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx index 3c3a9f61e580..03e98bee77e2 100644 --- a/sw/source/core/docnode/ndindex.cxx +++ b/sw/source/core/docnode/ndindex.cxx @@ -130,4 +130,9 @@ SwNodeIndex& SwNodeIndex::Assign( const SwNode& rNd, long nOffset ) return *this; } +std::ostream &operator <<(std::ostream& s, const SwNodeIndex& index) +{ + return s << "SwNodeIndex (node " << index.GetIndex() << ")"; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |