diff -ur ooo_ooo64bit02_src.orig/fpicker/source/office/asyncfilepicker.cxx ooo_ooo64bit02_src/fpicker/source/office/asyncfilepicker.cxx --- ooo_ooo64bit02_src.orig/fpicker/source/office/asyncfilepicker.cxx 2005-06-14 06:09:09.772847545 +0200 +++ ooo_ooo64bit02_src/fpicker/source/office/asyncfilepicker.cxx 2005-06-14 06:09:26.119017847 +0200 @@ -202,7 +202,7 @@ DBG_TESTSOLARMUTEX(); // if this asserts, we'd need to have an own mutex per instance - FileViewResult eResult = static_cast< FileViewResult >( reinterpret_cast< int >( pEmptyArg ) ); + FileViewResult eResult = static_cast< FileViewResult >( reinterpret_cast< sal_IntPtr >( pEmptyArg ) ); OSL_ENSURE( eStillRunning != eResult, "AsyncPickerAction::OnActionDone: invalid result!" ); // release once (since we acquired in |execute|), but keep alive until the diff -ur ooo_ooo64bit02_src.orig/fpicker/source/office/iodlg.cxx ooo_ooo64bit02_src/fpicker/source/office/iodlg.cxx --- ooo_ooo64bit02_src.orig/fpicker/source/office/iodlg.cxx 2005-06-14 06:09:09.773847311 +0200 +++ ooo_ooo64bit02_src/fpicker/source/office/iodlg.cxx 2005-06-14 06:09:26.121017378 +0200 @@ -2730,7 +2730,7 @@ Size aDlgSize = GetResizeOutputSizePixel(); Size aOldSize = _pImp->_aDlgSize; _pImp->_aDlgSize = aDlgSize; - long nWinDeltaW = 0; + sal_Int32 nWinDeltaW = 0; if ( _pPrevWin && _pPrevWin->GetPosPixel().X() > _pFileView->GetPosPixel().X() ) @@ -2740,8 +2740,8 @@ Size aNewSize = _pFileView->GetSizePixel(); Point aBoxPos( _pFileView->GetPosPixel() ); - long nDeltaY = aNewSize.Height(); - long nDeltaX = aNewSize.Width(); + sal_Int32 nDeltaY = aNewSize.Height(); + sal_Int32 nDeltaX = aNewSize.Width(); aNewSize.Height() = aDlgSize.Height() - _pImp->_nFixDeltaHeight; aNewSize.Width() = aDlgSize.Width() - aBoxPos.X() - _pImp->_a6Size.Width() - nWinDeltaW; if ( aOldSize.Height() ) @@ -2761,7 +2761,7 @@ // Dieses Resize wurde nur zum Ein - oder Ausblenden des Indicators aufgerufen return; - long nMaxYPos = 0; + sal_Int32 nMaxYPos = 0; // ------------- // move controls