User: kz Date: 05/10/05 07:46:15 Modified: /dba/dbaccess/source/ui/dlg/ generalpage.cxx
Log: INTEGRATION: CWS intptr (1.43.52); FILE MERGED 2005/09/13 14:50:25 kendy 1.43.52.1: #i54498# Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: generalpage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.cxx?r1=1.44&r2=1.45 Delta lines: +2 -2 ------------------- --- generalpage.cxx 8 Sep 2005 15:04:29 -0000 1.44 +++ generalpage.cxx 5 Oct 2005 14:46:11 -0000 1.45 @@ -514,7 +514,7 @@ if ( bCommitTypeSelection ) { USHORT nEntry = m_pDatasourceType->GetSelectEntryPos(); - DATASOURCE_TYPE eSelectedType = static_cast<DATASOURCE_TYPE>(reinterpret_cast<sal_Int32>(m_pDatasourceType->GetEntryData(nEntry))); + DATASOURCE_TYPE eSelectedType = static_cast<DATASOURCE_TYPE>(reinterpret_cast<sal_IntPtr>(m_pDatasourceType->GetEntryData(nEntry))); if (m_DBWizardMode) { if ( ( m_pDatasourceType->GetSavedValue() != nEntry ) @@ -544,7 +544,7 @@ { // get the type from the entry data sal_Int16 nSelected = _pBox->GetSelectEntryPos(); - DATASOURCE_TYPE eSelectedType = static_cast<DATASOURCE_TYPE>(reinterpret_cast<sal_Int32>(_pBox->GetEntryData(nSelected))); + DATASOURCE_TYPE eSelectedType = static_cast<DATASOURCE_TYPE>(reinterpret_cast<sal_IntPtr>(_pBox->GetEntryData(nSelected))); setParentTitle(eSelectedType); // let the impl method do all the stuff --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
