diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-31 08:29:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-31 08:29:59 +0000 |
| commit | 6a1400ac579fd629608e67a85286adcb1e87cc02 (patch) | |
| tree | b994c265e80d224b84a847274ac25e708b0099b2 /svtools | |
| parent | 6beeec5c0a006ab4a333475018377a86df9dacdb (diff) | |
INTEGRATION: CWS long2int (1.29.58); FILE MERGED
2006/02/28 12:03:33 kendy 1.29.58.3: #i56715# Reversed everything but long -> sal_Int32 for GetBorder().
2006/01/16 14:21:48 kendy 1.29.58.2: RESYNC: (1.29-1.30); FILE MERGED
2005/10/26 18:07:17 kendy 1.29.58.1: #i56715#
Trivial long/ULONG -> sal_Int32/sal_uInt32 patches extracted from ooo64bit02 CWS.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/edit/svmedit.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 20f745cb67bd..590c2c479e41 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svmedit.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: obo $ $Date: 2006-03-22 10:35:47 $ + * last change: $Author: vg $ $Date: 2006-03-31 09:29:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1219,7 +1219,7 @@ Size MultiLineEdit::CalcMinimumSize() const { Size aSz = pImpSvMEdit->CalcMinimumSize(); - long nLeft, nTop, nRight, nBottom; + sal_Int32 nLeft, nTop, nRight, nBottom; ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Width() += nLeft+nRight; aSz.Height() += nTop+nBottom; @@ -1230,7 +1230,7 @@ Size MultiLineEdit::CalcMinimumSize() const Size MultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const { Size aSz = rPrefSize; - long nLeft, nTop, nRight, nBottom; + sal_Int32 nLeft, nTop, nRight, nBottom; ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); // In der Hoehe auf ganze Zeilen justieren @@ -1251,7 +1251,7 @@ Size MultiLineEdit::CalcSize( USHORT nColumns, USHORT nLines ) const { Size aSz = pImpSvMEdit->CalcSize( nColumns, nLines ); - long nLeft, nTop, nRight, nBottom; + sal_Int32 nLeft, nTop, nRight, nBottom; ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Width() += nLeft+nRight; aSz.Height() += nTop+nBottom; |