mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check of nMultiSpace is probably no longer relevant

Browse Source 
The original code introduced with 1d10fb1197 "New:
Text adjustment in multiportions" read

+            if( nMultiSpace < KSHRT_MAX )
+            {
+                pCurr->GetpSpaceAdd()->Insert(KSHORT(nMultiSpace),0);
+                bRet = sal_True;
+            }

so needed nMulitSpace to fit into KSHORT (an alias for USHORT back then),
whereas today nMultiSpace is inserted into a std::vector<long>.

Change-Id: I24cafa7e295b87bf93f4e0ef5fbda5f99834286a
Reviewed-on: https://gerrit.libreoffice.org/49034
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2018-01-31 16:58:38 +01:00
parent ad39f63d4d
commit fd0e8beee9
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sw/source/core/text/pormulti.cxx
View File

@@ -515,15 +515,12 @@ bool SwDoubleLinePortion::ChgSpaceAdd( SwLineLayout* pCurr,
if( nMyBlank )
nMultiSpace /= nMyBlank;
if( nMultiSpace < USHRT_MAX * SPACING_PRECISION_FACTOR )
{
// pCurr->SetLLSpaceAdd( nMultiSpace, 0 );
// #i65711# SetLLSpaceAdd replaces the first value,
// instead we want to insert a new first value:
std::vector<long>* pVec = pCurr->GetpLLSpaceAdd();
pVec->insert( pVec->begin(), nMultiSpace );
bRet = true;
}
// pCurr->SetLLSpaceAdd( nMultiSpace, 0 );
// #i65711# SetLLSpaceAdd replaces the first value,
// instead we want to insert a new first value:
std::vector<long>* pVec = pCurr->GetpLLSpaceAdd();
pVec->insert( pVec->begin(), nMultiSpace );
bRet = true;
}
}
return bRet;