strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor cleanup in ScHeaderControl: nCount is always greater than 0

Browse source 
Change-Id: Ia50265e397704131dc948bc2bcbf80a442054b71
Signed-off-by: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/6538
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Rodolfo Ribeiro Gomes 2013-11-03 22:57:26 -02:00 committed by Markus Mohrhard
parent b64d19a652
commit 0432f847bb
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sc/source/ui/view/hdrcont.cxx
View file

@ -563,9 +563,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, bool& rBorder ) const
{
bool bFound = false;
SCCOLROW nCount = 1;
SCCOLROW nPos = GetPos();
SCCOLROW nHitNo = nPos;
SCCOLROW nEntryNo = 1 + nPos;
long nScrPos;
long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X();
long nDif;
@ -579,22 +579,20 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, bool& rBorder )
nScrPos = GetScrPos( nPos ) - nLayoutSign;
do
{
SCCOLROW nEntryNo = nCount + nPos;
if (nEntryNo > nSize)
nScrPos = nEndPos + nLayoutSign;
else
nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //! GetHiddenCount() ??
nDif = nMousePos - nScrPos;
if (nDif >= -2 && nDif <= 2 && nCount > 0)
if (nDif >= -2 && nDif <= 2)
{
bFound = true;
nHitNo=nEntryNo-1;
}
else if (nDif * nLayoutSign >= 0 && nEntryNo < nSize)
nHitNo = nEntryNo;
++nCount;
++nEntryNo;
}
while ( nScrPos * nLayoutSign < nEndPos * nLayoutSign && nDif * nLayoutSign > 0 );