summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-02-01 09:37:57 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-02-02 08:50:24 +0100
commit0499fc5619bf540afd1caea8ebf40cecff0b0014 (patch)
treeeea716eb664345012a173d34de725d47bc977b17 /writerfilter/source
parent9529de103ce76cb7b4e95f4b70df94c2aa159849 (diff)
Remove obsolete overflow check
...which had originally been added with 766d2b65e3799fb66099c94837280cb9102219a6 "INTEGRATION: CWS geordi2q10: #111934#: join CWS os21" as - rInf.Left( KSHORT(Left()) ); - rInf.Right( KSHORT(Right()) ); - rInf.First( short(FirstLeft()) ); + + // Handle overflows: + SwTwips nTmpLeft = Left(); + SwTwips nTmpRight = Right(); + SwTwips nTmpFirst = FirstLeft(); + + if ( nTmpLeft > USHRT_MAX || + nTmpRight > USHRT_MAX || + nTmpFirst > USHRT_MAX ) + { + SWRECTFN( rInf.GetTxtFrm() ) + nTmpLeft = (rInf.GetTxtFrm()->Frm().*fnRect->fnGetLeft)(); + nTmpRight = (rInf.GetTxtFrm()->Frm().*fnRect->fnGetRight)(); + nTmpFirst = nTmpLeft; + } + + rInf.Left( KSHORT( nTmpLeft ) ); + rInf.Right( KSHORT( nTmpRight ) ); + rInf.First( KSHORT( nTmpFirst ) ); But later 2a2f9a30dc67bb64860333b83b0489bc610da48f "INTEGRATION: CWS swqbugfixes10: #i34348# Underflow with negative numbering indent values" had changed the SwTxtFormatInfo members from KSHORT to SwTwips, presumably obviating the need for such an overflow check. Change-Id: Id622d2bbc280e3d825981356e19c7fe9ed23fc5b Reviewed-on: https://gerrit.libreoffice.org/49077 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'writerfilter/source')
0 files changed, 0 insertions, 0 deletions