diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-04-16 12:09:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-29 12:58:46 +0100 |
| commit | b45876bf0f2eeafba0a4f9f8f30cd4279eb2aa3e (patch) | |
| tree | 82783c7310b49834d12acc95cdfc8cfab755579f /sw | |
| parent | compile callvirtualmethod with -fnon-call-exceptions (diff) | |
| download | core-b45876bf0f2eeafba0a4f9f8f30cd4279eb2aa3e.tar.gz core-b45876bf0f2eeafba0a4f9f8f30cd4279eb2aa3e.zip | |
provide complete type of CellInfo before it is used
(cherry picked from commit 687d6ed3e4ecb836634bfda71bb5596e18bbc2e1)
Conflicts:
sw/source/filter/ww8/WW8TableInfo.hxx
Change-Id: If21c5d7c6db2803f7da59e28c00d47790abffe86
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/WW8TableInfo.hxx | 89 |
1 files changed, 44 insertions, 45 deletions
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 68a3c0d6a637..93ac96c9aabb 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -112,7 +112,50 @@ public: #endif }; -class CellInfo; +class CellInfo +{ + SwRect m_aRect; + WW8TableNodeInfo * m_pNodeInfo; + unsigned long m_nFmtFrmWidth; + +public: + CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo); + + CellInfo(const CellInfo & aRectAndTableInfo) + : m_aRect(aRectAndTableInfo.m_aRect), + m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo), + m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth) + { + } + + ~CellInfo() {} + + bool operator < (const CellInfo & aCellInfo) const; + + long top() const { return m_aRect.Top(); } + long bottom() const { return m_aRect.Bottom(); } + long left() const { return m_aRect.Left(); } + long right() const { return m_aRect.Right(); } + long width() const { return m_aRect.Width(); } + long height() const { return m_aRect.Height(); } + SwRect getRect() const { return m_aRect; } + WW8TableNodeInfo * getTableNodeInfo() const + { return m_pNodeInfo; } + unsigned long getFmtFrmWidth() const + { + return m_nFmtFrmWidth; + } + + void setFmtFrmWidth(unsigned long nFmtFrmWidth) + { + m_nFmtFrmWidth = nFmtFrmWidth; + } + +#ifdef DBG_UTIL + ::std::string toString() const; +#endif +}; + typedef ::std::multiset<CellInfo, less<CellInfo> > CellInfoMultiSet; typedef boost::shared_ptr<CellInfoMultiSet> CellInfoMultiSetPtr; @@ -308,50 +351,6 @@ public: WW8TableNodeInfo * reorderByLayout(const SwTable * pTable); }; -class CellInfo -{ - SwRect m_aRect; - WW8TableNodeInfo * m_pNodeInfo; - unsigned long m_nFmtFrmWidth; - -public: - CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo); - - CellInfo(const CellInfo & aRectAndTableInfo) - : m_aRect(aRectAndTableInfo.m_aRect), - m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo), - m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth) - { - } - - ~CellInfo() {} - - bool operator < (const CellInfo & aCellInfo) const; - - long top() const { return m_aRect.Top(); } - long bottom() const { return m_aRect.Bottom(); } - long left() const { return m_aRect.Left(); } - long right() const { return m_aRect.Right(); } - long width() const { return m_aRect.Width(); } - long height() const { return m_aRect.Height(); } - SwRect getRect() const { return m_aRect; } - WW8TableNodeInfo * getTableNodeInfo() const - { return m_pNodeInfo; } - unsigned long getFmtFrmWidth() const - { - return m_nFmtFrmWidth; - } - - void setFmtFrmWidth(unsigned long nFmtFrmWidth) - { - m_nFmtFrmWidth = nFmtFrmWidth; - } - -#ifdef DBG_UTIL - ::std::string toString() const; -#endif -}; - } #endif // WW8_TABLE_INFO_HXX |