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

INTEGRATION: CWS impress44 (1.4.156); FILE MERGED

Browse source 
2005/04/05 09:22:16 af 1.4.156.1: #i46605# GetColumnAtPosition() does not anymore return columns larger or eual to the maximum column number.
This commit is contained in:
Oliver Bolte 2005-04-12 15:59:17 +00:00
parent 2c56eb7924
commit 97c68d012a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sd/source/ui/slidesorter/view/SlsLayouter.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: SlsLayouter.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: hr $ $Date: 2004-11-26 15:08:30 $
* last change: $Author: obo $ $Date: 2005-04-12 16:59:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -644,6 +644,10 @@ sal_Int32 Layouter::GetColumnAtPosition (
// Calculate row consisting of page objects and gap below.
nColumn = nX / nColumnOffset;
if (nColumn < 0)
nColumn = 0;
else if (nColumn >= mnColumnCount)
nColumn = mnColumnCount-1;
const sal_Int32 nDistanceIntoGap (
(nX - nColumn*nColumnOffset) - maPageObjectModelSize.Width());