diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-10-06 09:58:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-10-06 09:58:08 +0000 |
| commit | 8c41a3893404dad05b805d597207a8ffc6f10136 (patch) | |
| tree | 063ce97fb6703a5c553a41a7f06dfd1b08af286f /vcl/source/window/window2.cxx | |
| parent | aaf175cf2de427a5d40b560fd080c3e5e04e511b (diff) | |
INTEGRATION: CWS intptr (1.15.278); FILE MERGED
2005/09/19 14:45:20 kendy 1.15.278.2: #i54498# sal_IntPtr -> sal_uIntPtr for SaveFocus and EndSaveFocus.
2005/09/13 14:51:02 kendy 1.15.278.1: #i54498#
Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
Diffstat (limited to 'vcl/source/window/window2.cxx')
| -rw-r--r-- | vcl/source/window/window2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index ad0576335f4b..6baa1030d52d 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: window2.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:33:01 $ + * last change: $Author: kz $ $Date: 2005-10-06 10:58:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -877,7 +877,7 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, // ----------------------------------------------------------------------- -ULONG Window::SaveFocus() +sal_uIntPtr Window::SaveFocus() { ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maWinData.mpFocusWin ) @@ -885,7 +885,7 @@ ULONG Window::SaveFocus() ImplFocusDelData* pDelData = new ImplFocusDelData; pSVData->maWinData.mpFocusWin->ImplAddDel( pDelData ); pDelData->mpFocusWin = pSVData->maWinData.mpFocusWin; - return (ULONG)(void*)pDelData; + return (sal_uIntPtr)(void*)pDelData; } else return 0; @@ -893,7 +893,7 @@ ULONG Window::SaveFocus() // ----------------------------------------------------------------------- -BOOL Window::EndSaveFocus( ULONG nSaveId, BOOL bRestore ) +BOOL Window::EndSaveFocus( sal_uIntPtr nSaveId, BOOL bRestore ) { if ( !nSaveId ) return FALSE; |