diff -urN ooo_cws_src680_ooo64bit02_src.orig/setup2/inc/sistream.hxx ooo_cws_src680_ooo64bit02_src/setup2/inc/sistream.hxx --- ooo_cws_src680_ooo64bit02_src.orig/setup2/inc/sistream.hxx 2000-09-19 00:50:55.000000000 +0800 +++ ooo_cws_src680_ooo64bit02_src/setup2/inc/sistream.hxx 2004-10-08 15:46:47.000000000 +0800 @@ -84,7 +84,10 @@ SiFileStream & operator << (char const*); SiFileStream & operator << (ByteString const&); SiFileStream & operator << (long); + SiFileStream & operator << (sal_uInt32); +#if SAL_TYPES_SIZEOFLONG == 8 SiFileStream & operator << (ULONG); +#endif }; class SiAnsiFileStream : public SiFileStream diff -urN ooo_cws_src680_ooo64bit02_src.orig/setup2/source/agenda/action.cxx ooo_cws_src680_ooo64bit02_src/setup2/source/agenda/action.cxx --- ooo_cws_src680_ooo64bit02_src.orig/setup2/source/agenda/action.cxx 2004-05-12 16:12:09.000000000 +0800 +++ ooo_cws_src680_ooo64bit02_src/setup2/source/agenda/action.cxx 2004-10-08 15:37:40.000000000 +0800 @@ -645,7 +645,7 @@ void SiTransferAction::Substitute( const ByteString& rFilename, const SiEnvironment& rEnv ) { - ULONG nLen = _SubstituteInFile( rFilename, rEnv ); + sal_uInt32 nLen = _SubstituteInFile( rFilename, rEnv ); GetLogfile().Success(TRUE) << "substitue: " << rFilename diff -urN ooo_cws_src680_ooo64bit02_src.orig/setup2/source/agenda/agenda.cxx ooo_cws_src680_ooo64bit02_src/setup2/source/agenda/agenda.cxx --- ooo_cws_src680_ooo64bit02_src.orig/setup2/source/agenda/agenda.cxx 2004-09-09 19:19:06.000000000 +0800 +++ ooo_cws_src680_ooo64bit02_src/setup2/source/agenda/agenda.cxx 2004-10-08 15:37:40.000000000 +0800 @@ -445,7 +445,7 @@ } else { - m_ActionSlot4.Insert(pAction,(sal_uInt32)0); + m_ActionSlot4.Insert(pAction,0UL); } } @@ -471,7 +471,7 @@ if( pAction->IsRegister() ) m_ActionSlot5.Insert( pAction, LIST_APPEND ); else - m_ActionSlot1.Insert( pAction, (sal_uInt32)0 ); + m_ActionSlot1.Insert( pAction, 0UL ); } void SiAgenda::Add(SiUnixCreateSoftLinkAction* pAction) @@ -486,7 +486,7 @@ void SiAgenda::Add(SiMakeFolderAction* pAction) { - m_ActionSlot4.Insert(pAction,(sal_uInt32)0); + m_ActionSlot4.Insert(pAction,0UL); } void SiAgenda::Add(SiMakeFolderItemAction* pAction) @@ -503,7 +503,7 @@ { if( m_eInstallSubMode == ISM_DELETE ) { - m_ActionSlot1.Insert(pAction,(sal_uInt32)0); + m_ActionSlot1.Insert(pAction,0UL); return; } @@ -529,7 +529,7 @@ { if( m_eInstallSubMode == ISM_DELETE ) { - m_ActionSlot1.Insert(pAction,(sal_uInt32)0); + m_ActionSlot1.Insert(pAction,0UL); return ; } m_ActionSlot4.Insert(pAction, LIST_APPEND); @@ -538,20 +538,20 @@ void SiAgenda::Add(SiRunProcedureAction* pAction, BOOL bExecBefore) { if( bExecBefore ) - m_ActionSlot1.Insert( pAction,(sal_uInt32)0 ); + m_ActionSlot1.Insert( pAction,0UL ); else m_ActionSlot5.Insert( pAction,LIST_APPEND ); } void SiAgenda::Add(SiRegistryItemAction* pAction) { - m_ActionSlot4.Insert(pAction,(sal_uInt32)0); + m_ActionSlot4.Insert(pAction,0UL); } void SiAgenda::Add(SiOs2RegisterClassAction* pAction) { // Classes vor Templates registrieren - m_ActionSlot4.Insert(pAction,(sal_uInt32)0); + m_ActionSlot4.Insert(pAction,0UL); } void SiAgenda::Add(SiOs2CreateTemplateAction* pAction) @@ -586,12 +586,12 @@ void SiAgenda::Add(SiDeleteFileAction* pAction, BOOL bLink ) { - m_ActionSlot4.Insert(pAction, bLink ? (sal_uInt32)0 : LIST_APPEND); + m_ActionSlot4.Insert(pAction, bLink ? 0UL : LIST_APPEND); } void SiAgenda::Add(SiUnregisterAction* pAction) { - m_ActionSlot1.Insert(pAction,(sal_uInt32)0); + m_ActionSlot1.Insert(pAction,0UL); } void SiAgenda::Add(SiDeleteFolderAction* pAction) diff -urN ooo_cws_src680_ooo64bit02_src.orig/setup2/source/agenda/webagenda.cxx ooo_cws_src680_ooo64bit02_src/setup2/source/agenda/webagenda.cxx --- ooo_cws_src680_ooo64bit02_src.orig/setup2/source/agenda/webagenda.cxx 2004-09-09 19:19:07.000000000 +0800 +++ ooo_cws_src680_ooo64bit02_src/setup2/source/agenda/webagenda.cxx 2004-10-08 15:37:40.000000000 +0800 @@ -124,10 +124,10 @@ switch( pAction->GetType() ) { // deinstall - case ActionType_DELETEFILE : m_WebDeActionSlot2.Insert( (SiWebDeleteFileAction*)pAction, (sal_uInt32)0 ); break; + case ActionType_DELETEFILE : m_WebDeActionSlot2.Insert( (SiWebDeleteFileAction*)pAction, 0UL ); break; case ActionType_DELETEDIR : m_WebDeActionSlot3.Insert( (SiWebDeleteDirAction*)pAction, LIST_APPEND ); break; - case ActionType_DELETEFOLDERITEM : m_WebDeActionSlot4.Insert( (SiWebDeleteFolderItemAction*)pAction, (sal_uInt32)0 ); break; + case ActionType_DELETEFOLDERITEM : m_WebDeActionSlot4.Insert( (SiWebDeleteFolderItemAction*)pAction, 0UL ); break; case ActionType_DELETEFOLDER : m_WebDeActionSlot4.Insert( (SiWebDeleteFolderAction*)pAction, LIST_APPEND ); break; // deinstall / install @@ -153,11 +153,11 @@ case ActionType_FONT : if( ((SiWebFontAction*)pAction)->bCreate ) m_WebActionSlot5.Insert( (SiWebFontAction*)pAction, LIST_APPEND ); else - m_WebDeActionSlot3.Insert( (SiWebFontAction*)pAction, (sal_uInt32)0 ); + m_WebDeActionSlot3.Insert( (SiWebFontAction*)pAction, 0UL ); break; case ActionType_WINREGISTRY : if( ((SiWebWindowsRegistryAction*)pAction)->bCreate ) - m_WebActionSlot5.Insert( (SiWebWindowsRegistryAction*)pAction, (sal_uInt32)0 ); + m_WebActionSlot5.Insert( (SiWebWindowsRegistryAction*)pAction, 0UL ); else m_WebDeActionSlot4.Insert( (SiWebWindowsRegistryAction*)pAction, LIST_APPEND ); break; @@ -166,12 +166,12 @@ case ActionType_DOWNLOAD : m_WebActionSlot2.Insert( (SiWebDownloadAction*)pAction, LIST_APPEND ); break; case ActionType_MAKEDIR : m_WebActionSlot1.Insert( (SiWebMakeDirAction*)pAction, LIST_APPEND ); break; - case ActionType_COPYFILE : m_WebActionSlot3.Insert( (SiWebCopyFileAction*)pAction, (sal_uInt32)0 ); break; + case ActionType_COPYFILE : m_WebActionSlot3.Insert( (SiWebCopyFileAction*)pAction, 0UL ); break; case ActionType_UNZIPFILE : m_WebActionSlot3.Insert( (SiWebUnzipAction*)pAction, LIST_APPEND ); break; - case ActionType_CREATESHORTCUT : m_WebActionSlot6.Insert( (SiWebMakeShortcutAction*)pAction, (sal_uInt32)0 ); break; + case ActionType_CREATESHORTCUT : m_WebActionSlot6.Insert( (SiWebMakeShortcutAction*)pAction, 0UL ); break; - case ActionType_MAKEFOLDER : m_WebActionSlot6.Insert( (SiWebMakeFolderAction*)pAction, (sal_uInt32)0 ); break; + case ActionType_MAKEFOLDER : m_WebActionSlot6.Insert( (SiWebMakeFolderAction*)pAction, 0UL ); break; case ActionType_MAKEFOLDERITEM: m_WebActionSlot6.Insert( (SiWebMakeFolderItemAction*)pAction, LIST_APPEND ); break; } } diff -urN ooo_cws_src680_ooo64bit02_src.orig/setup2/source/other/sistream.cxx ooo_cws_src680_ooo64bit02_src/setup2/source/other/sistream.cxx --- ooo_cws_src680_ooo64bit02_src.orig/setup2/source/other/sistream.cxx 2000-09-19 00:51:05.000000000 +0800 +++ ooo_cws_src680_ooo64bit02_src/setup2/source/other/sistream.cxx 2004-10-08 18:12:15.000000000 +0800 @@ -120,11 +120,21 @@ SiFileStream & SiFileStream::operator << (long i) { +#if SAL_TYPES_SIZEOFLONG == 8 + return operator << (ByteString::CreateFromInt64(i)); +#else return operator << (ByteString::CreateFromInt32(i)); +#endif } -SiFileStream & SiFileStream::operator << (ULONG i) +SiFileStream & SiFileStream::operator << (sal_uInt32 i) { return operator << (ByteString::CreateFromInt32(i)); } +#if SAL_TYPES_SIZEOFLONG == 8 +SiFileStream & SiFileStream::operator << (ULONG i) +{ + return operator << (ByteString::CreateFromInt64(i)); +} +#endif