summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-06-25 15:47:15 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-06-26 09:21:22 +0200
commitabf0750c181edc20ce9dbd3a362df6cf1f5e10be (patch)
tree7fa32ddb0c68cc1f61cdcefa187243067f404d1a /sw
parent688227f66e815fac5a99dc6008e1376173bb1abb (diff)
sw: outline SwTextSizeInfo ctors
Change-Id: I8964701bf5b1ecdb11851d7cc8540175e007dd2b (cherry picked from commit d7eacc579fb0874e9602b5c0714ac00bd520322a)
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/inftxt.cxx37
-rw-r--r--sw/source/core/text/inftxt.hxx35
2 files changed, 39 insertions, 33 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 861f412f4d64..3dae3d3b59c2 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -188,6 +188,35 @@ inline sal_Int32 GetMinLen( const SwTextSizeInfo &rInf )
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 )
: SwTextInfo( rNew ),
m_pKanaComp(rNew.GetpKanaComp()),
@@ -334,6 +363,14 @@ SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew, const OUString* pTex
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()
{
// The path needs to go via ChgPhysFnt or the FontMetricCache gets confused.
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index a1a30cbd46af..1384906856f1 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -194,34 +194,7 @@ protected:
void CtorInitTextSizeInfo( SwTextFrm *pFrm, SwFont *pFnt = 0,
const sal_Int32 nIdx = 0,
const sal_Int32 nLen = COMPLETE_STRING );
- 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();
public:
SwTextSizeInfo( const SwTextSizeInfo &rInf );
SwTextSizeInfo( const SwTextSizeInfo &rInf, const OUString* pText,
@@ -230,11 +203,7 @@ public:
SwTextSizeInfo( SwTextFrm *pTextFrm, SwFont *pTextFnt = 0,
const sal_Int32 nIndex = 0,
- const sal_Int32 nLength = COMPLETE_STRING )
- : m_bOnWin(false)
- {
- CtorInitTextSizeInfo( pTextFrm, pTextFnt, nIndex, nLength );
- }
+ const sal_Int32 nLength = COMPLETE_STRING );
// GetMultiAttr returns the text attribute of the multiportion,
// if rPos is inside any multi-line part.