Kaydet (Commit) b45876bf authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

provide complete type of CellInfo before it is used

(cherry picked from commit 687d6ed3)

Conflicts:
	sw/source/filter/ww8/WW8TableInfo.hxx

Change-Id: If21c5d7c6db2803f7da59e28c00d47790abffe86
üst e1823ea1
...@@ -112,7 +112,50 @@ public: ...@@ -112,7 +112,50 @@ public:
#endif #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 ::std::multiset<CellInfo, less<CellInfo> > CellInfoMultiSet;
typedef boost::shared_ptr<CellInfoMultiSet> CellInfoMultiSetPtr; typedef boost::shared_ptr<CellInfoMultiSet> CellInfoMultiSetPtr;
...@@ -308,50 +351,6 @@ public: ...@@ -308,50 +351,6 @@ public:
WW8TableNodeInfo * reorderByLayout(const SwTable * pTable); 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 #endif // WW8_TABLE_INFO_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment