diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-03 14:32:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-04 08:47:29 +0200 |
| commit | ac8fc5a6a5a1adef7aaa8aa901439e268283d113 (patch) | |
| tree | 22128c56ea06c6ec8f1e00b4129fb47c5860198d | |
| parent | 7959a491450fb55526ab94fee9d1e5be5d2c95ed (diff) | |
rename nToleranz->nTolerance
Change-Id: I4a61f1cf9b94f7df98a8e9560c1384c948abf2c1
Reviewed-on: https://gerrit.libreoffice.org/40737
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/srcedtw.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 424d06b862ff..ace6e8f776d5 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2887,7 +2887,7 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) if (!m_MergeGroups.empty()) { // still valid area near the boundery - const short nToleranz = 4; + const short nTolerance = 4; // box boundery short nX2 = nX1 + nWidth; // approximate group boundery @@ -2902,9 +2902,9 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) if (!rActGroup.bGroupLocked) { // approximate group boundery with room (tolerance) to the *outside* - nGrX1 = rActGroup.nGroupXStart - nToleranz; + nGrX1 = rActGroup.nGroupXStart - nTolerance; nGrX2 = rActGroup.nGroupXStart - +rActGroup.nGroupWidth + nToleranz; + + rActGroup.nGroupWidth + nTolerance; // If box fits report success @@ -2919,8 +2919,8 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) { // successful if nX1 *or* nX2 are inside the group if( ( ( nX1 > nGrX1 ) - && ( nX1 < nGrX2 - 2*nToleranz ) ) - || ( ( nX2 > nGrX1 + 2*nToleranz ) + && ( nX1 < nGrX2 - 2*nTolerance ) ) + || ( ( nX2 > nGrX1 + 2*nTolerance ) && ( nX2 < nGrX2 ) ) // or nX1 and nX2 surround the group || ( ( nX1 <=nGrX1 ) diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 88367f6d7db4..abbc045031ae 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -639,7 +639,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer*, pIdle, void ) // SyntaxTimerHdl is called when text changed // => good opportunity to determine text width! long nPrevTextWidth = m_nCurTextWidth; - m_nCurTextWidth = m_pTextEngine->CalcTextWidth() + 25; // kleine Toleranz + m_nCurTextWidth = m_pTextEngine->CalcTextWidth() + 25; // small tolerance if ( m_nCurTextWidth != nPrevTextWidth ) SetScrollBarRanges(); m_bHighlighting = false; |