diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:12:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:12:07 +0000 |
| commit | 6504f508a6a9656283c06ad66a441ca6e6c11e48 (patch) | |
| tree | f72d8b625b33e6ada398233bc57e00ceaf907191 /vcl/source/control/edit.cxx | |
| parent | 7e8a9739da13a46596438873bfc3917abd2ebe7b (diff) | |
INTEGRATION: CWS ooo64bit01 (1.63.54); FILE MERGED
2004/04/13 03:42:22 fa 1.63.54.3: #i8605# Make vcl 64-bit clean, all coordinate arrays (like pDXAry, etc) should be
sal_Int32* rather than long*
2004/03/31 16:49:10 fa 1.63.54.2: Back out of changes since 2004-03-24, focus on smaller, more integratable changes
2004/03/29 00:30:21 fa 1.63.54.1: More 64-bit changes. 'rsc' still broken, but not as much as before.
Diffstat (limited to 'vcl/source/control/edit.cxx')
| -rw-r--r-- | vcl/source/control/edit.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 759bfe7c8467..8754f9f9ad5b 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edit.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: hr $ $Date: 2004-05-10 15:46:40 $ + * last change: $Author: rt $ $Date: 2004-06-17 12:12:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -540,15 +540,15 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout ) nStart = 0; nEnd = aText.Len(); - long nDXBuffer[256]; - long* pDXBuffer = NULL; - long* pDX = nDXBuffer; + sal_Int32 nDXBuffer[256]; + sal_Int32* pDXBuffer = NULL; + sal_Int32* pDX = nDXBuffer; if( aText.Len() ) { if( 2*aText.Len() > sizeof(nDXBuffer)/sizeof(nDXBuffer[0]) ) { - pDXBuffer = new long[2*(aText.Len()+1)]; + pDXBuffer = new sal_Int32[2*(aText.Len()+1)]; pDX = pDXBuffer; } @@ -987,15 +987,15 @@ void Edit::ImplShowCursor( BOOL bOnlyIfVisible ) long nTextPos = 0; - long nDXBuffer[256]; - long* pDXBuffer = NULL; - long* pDX = nDXBuffer; + sal_Int32 nDXBuffer[256]; + sal_Int32* pDXBuffer = NULL; + sal_Int32* pDX = nDXBuffer; if( aText.Len() ) { if( 2*aText.Len() > sizeof(nDXBuffer)/sizeof(nDXBuffer[0]) ) { - pDXBuffer = new long[2*(aText.Len()+1)]; + pDXBuffer = new sal_Int32[2*(aText.Len()+1)]; pDX = pDXBuffer; } @@ -1109,12 +1109,12 @@ xub_StrLen Edit::ImplGetCharPos( const Point& rWindowPos ) xub_StrLen nIndex = STRING_LEN; String aText = ImplGetText(); - long nDXBuffer[256]; - long* pDXBuffer = NULL; - long* pDX = nDXBuffer; + sal_Int32 nDXBuffer[256]; + sal_Int32* pDXBuffer = NULL; + sal_Int32* pDX = nDXBuffer; if( 2*aText.Len() > sizeof(nDXBuffer)/sizeof(nDXBuffer[0]) ) { - pDXBuffer = new long[2*(aText.Len()+1)]; + pDXBuffer = new sal_Int32[2*(aText.Len()+1)]; pDX = pDXBuffer; } |