Kaydet (Commit) ff52269a authored tarafından Miklos Vajna's avatar Miklos Vajna Kaydeden (comit) Andras Timar

sw: outline SwTextSizeInfo ctors

Change-Id: I8964701bf5b1ecdb11851d7cc8540175e007dd2b
(cherry picked from commit d7eacc57)
üst 70c13d2d
...@@ -188,6 +188,35 @@ inline sal_Int32 GetMinLen( const SwTextSizeInfo &rInf ) ...@@ -188,6 +188,35 @@ inline sal_Int32 GetMinLen( const SwTextSizeInfo &rInf )
return std::min(nTextLen, nInfLen); return std::min(nTextLen, nInfLen);
} }
SwTextSizeInfo::SwTextSizeInfo()
: m_pKanaComp(0)
, m_pVsh(0)
, m_pOut(0)
, m_pRef(0)
, m_pFnt(0)
, m_pUnderFnt(0)
, m_pFrm(0)
, m_pOpt(0)
, m_pText(0)
, m_nIdx(0)
, m_nLen(0)
, m_nKanaIdx(0)
, m_bOnWin (false)
, m_bNotEOL (false)
, m_bURLNotify(false)
, m_bStopUnderflow(false)
, m_bFootnoteInside(false)
, m_bOtherThanFootnoteInside(false)
, m_bMulti(false)
, m_bFirstMulti(false)
, m_bRuby(false)
, m_bHanging(false)
, m_bScriptSpace(false)
, m_bForbiddenChars(false)
, m_bSnapToGrid(false)
, m_nDirection(0)
{}
SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew ) SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew )
: SwTextInfo( rNew ), : SwTextInfo( rNew ),
m_pKanaComp(rNew.GetpKanaComp()), m_pKanaComp(rNew.GetpKanaComp()),
...@@ -334,6 +363,14 @@ SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew, const OUString* pTex ...@@ -334,6 +363,14 @@ SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew, const OUString* pTex
SetLen( GetMinLen( *this ) ); SetLen( GetMinLen( *this ) );
} }
SwTextSizeInfo::SwTextSizeInfo( SwTextFrm *pTextFrm, SwFont *pTextFnt,
const sal_Int32 nIndex,
const sal_Int32 nLength )
: m_bOnWin(false)
{
CtorInitTextSizeInfo( pTextFrm, pTextFnt, nIndex, nLength );
}
void SwTextSizeInfo::SelectFont() void SwTextSizeInfo::SelectFont()
{ {
// The path needs to go via ChgPhysFnt or the FontMetricCache gets confused. // The path needs to go via ChgPhysFnt or the FontMetricCache gets confused.
......
...@@ -194,34 +194,7 @@ protected: ...@@ -194,34 +194,7 @@ protected:
void CtorInitTextSizeInfo( SwTextFrm *pFrm, SwFont *pFnt = 0, void CtorInitTextSizeInfo( SwTextFrm *pFrm, SwFont *pFnt = 0,
const sal_Int32 nIdx = 0, const sal_Int32 nIdx = 0,
const sal_Int32 nLen = COMPLETE_STRING ); const sal_Int32 nLen = COMPLETE_STRING );
SwTextSizeInfo() SwTextSizeInfo();
: m_pKanaComp(0)
, m_pVsh(0)
, m_pOut(0)
, m_pRef(0)
, m_pFnt(0)
, m_pUnderFnt(0)
, m_pFrm(0)
, m_pOpt(0)
, m_pText(0)
, m_nIdx(0)
, m_nLen(0)
, m_nKanaIdx(0)
, m_bOnWin (false)
, m_bNotEOL (false)
, m_bURLNotify(false)
, m_bStopUnderflow(false)
, m_bFootnoteInside(false)
, m_bOtherThanFootnoteInside(false)
, m_bMulti(false)
, m_bFirstMulti(false)
, m_bRuby(false)
, m_bHanging(false)
, m_bScriptSpace(false)
, m_bForbiddenChars(false)
, m_bSnapToGrid(false)
, m_nDirection(0)
{}
public: public:
SwTextSizeInfo( const SwTextSizeInfo &rInf ); SwTextSizeInfo( const SwTextSizeInfo &rInf );
SwTextSizeInfo( const SwTextSizeInfo &rInf, const OUString* pText, SwTextSizeInfo( const SwTextSizeInfo &rInf, const OUString* pText,
...@@ -230,11 +203,7 @@ public: ...@@ -230,11 +203,7 @@ public:
SwTextSizeInfo( SwTextFrm *pTextFrm, SwFont *pTextFnt = 0, SwTextSizeInfo( SwTextFrm *pTextFrm, SwFont *pTextFnt = 0,
const sal_Int32 nIndex = 0, const sal_Int32 nIndex = 0,
const sal_Int32 nLength = COMPLETE_STRING ) const sal_Int32 nLength = COMPLETE_STRING );
: m_bOnWin(false)
{
CtorInitTextSizeInfo( pTextFrm, pTextFnt, nIndex, nLength );
}
// GetMultiAttr returns the text attribute of the multiportion, // GetMultiAttr returns the text attribute of the multiportion,
// if rPos is inside any multi-line part. // if rPos is inside any multi-line part.
......
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