diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/inc/drawfont.hxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/inc/drawfont.hxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/inc/drawfont.hxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/inc/drawfont.hxx 2005-12-11 09:26:58.000000000 +0100 @@ -182,7 +182,7 @@ USHORT HasKana( xub_StrLen nStart, const xub_StrLen nEnd ) const; // modifies the kerning array according to a given compress value - long Compress( long* pKernArray, xub_StrLen nIdx, xub_StrLen nLen, + sal_Int32 Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen nLen, const USHORT nCompress, const USHORT nFontHeight, Point* pPoint = NULL ) const; diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/text/inftxt.hxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/text/inftxt.hxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/text/inftxt.hxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/text/inftxt.hxx 2005-12-11 09:25:02.000000000 +0100 @@ -182,7 +182,7 @@ * class SwTxtSizeInfo *************************************************************************/ -DECLARE_TABLE( SwTxtPortionTable, INT32 ) +DECLARE_TABLE( SwTxtPortionTable, sal_IntPtr ) class SwTxtSizeInfo : public SwTxtInfo { diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/text/sw_porlay.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/text/sw_porlay.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/text/sw_porlay.cxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/text/sw_porlay.cxx 2005-12-11 09:32:50.000000000 +0100 @@ -1235,7 +1235,7 @@ * SwScriptInfo::Compress() *************************************************************************/ -/*N*/ long SwScriptInfo::Compress( long* pKernArray, xub_StrLen nIdx, xub_StrLen nLen, +/*N*/ sal_Int32 SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen nLen, /*N*/ const USHORT nCompress, const USHORT nFontHeight, /*N*/ Point* pPoint ) const /*N*/ { diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx 2005-12-11 09:26:18.000000000 +0100 @@ -2271,7 +2271,7 @@ /*?*/ { /*?*/ const USHORT nGridWidth = pGrid->GetBaseHeight(); /*?*/ -/*?*/ long* pKernArray = new long[rInf.GetLen()]; +/*?*/ sal_Int32* pKernArray = new sal_Int32[rInf.GetLen()]; /*?*/ rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray, /*?*/ rInf.GetIdx(), rInf.GetLen() ); /*?*/ @@ -2373,7 +2373,7 @@ /*N*/ nLn = 1; /*N*/ else if( nLn > 2 * nTxtBreak ) /*N*/ nLn = 2 * nTxtBreak; -/*N*/ long *pKernArray = new long[ nLn ]; +/*N*/ sal_Int32 *pKernArray = new sal_Int32[ nLn ]; /*N*/ rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray, /*N*/ rInf.GetIdx(), nLn ); /*N*/ if( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn, diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx 2005-12-11 09:28:40.000000000 +0100 @@ -560,12 +560,12 @@ /*N*/ pBreakIt->xBreak->getScriptType( rText, nBegin ); /*N*/ /*N*/ XubString aTmpWord = rText.Copy( nBegin, aBound.endPos - nBegin ); -/*N*/ const long nScriptEnd = nBegin + +/*N*/ const sal_Int32 nScriptEnd = nBegin + /*N*/ pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript ); -/*N*/ const long nEnd = Min( aBound.endPos, nScriptEnd ); +/*N*/ const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd ); /*N*/ /*N*/ // restrict word start to last script change position -/*N*/ long nScriptBegin = 0; +/*N*/ sal_Int32 nScriptBegin = 0; /*N*/ if ( aBound.startPos < nBegin ) /*N*/ { /*N*/ // search from nBegin backwards until the next script change @@ -583,9 +583,9 @@ /*N*/ const USHORT nCurrScript = /*N*/ pBreakIt->xBreak->getScriptType( rText, aBound.startPos ); /*N*/ XubString aTmpWord = rText.Copy( aBound.startPos, aBound.endPos - aBound.startPos ); -/*N*/ const long nScriptEnd = aBound.startPos + +/*N*/ const sal_Int32 nScriptEnd = aBound.startPos + /*N*/ pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript ); -/*N*/ const long nEnd = Min( aBound.endPos, nScriptEnd ); +/*N*/ const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd ); /*N*/ nBegin = (xub_StrLen)aBound.startPos; /*N*/ nLen = (xub_StrLen)(nEnd - nBegin); /*N*/ } diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx 2005-12-11 09:39:55.000000000 +0100 @@ -876,7 +876,7 @@ sal_Bool bError = sal_False; FOREACHUNOPAM_START(&rPam) - sal_uInt32 nSttNd = PUNOPAM->GetMark()->nNode.GetIndex(), + ULONG nSttNd = PUNOPAM->GetMark()->nNode.GetIndex(), nEndNd = PUNOPAM->GetPoint()->nNode.GetIndex(); xub_StrLen nSttCnt = PUNOPAM->GetMark()->nContent.GetIndex(), nEndCnt = PUNOPAM->GetPoint()->nContent.GetIndex(); @@ -894,7 +894,7 @@ } const SwNodes& rNds = rPam.GetDoc()->GetNodes(); - for( sal_uInt32 n = nSttNd; n <= nEndNd; ++n ) + for( ULONG n = nSttNd; n <= nEndNd; ++n ) { const SwTxtNode* pNd = rNds[ n ]->GetTxtNode(); if( pNd ) diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx 2005-12-11 09:40:31.000000000 +0100 @@ -1036,7 +1036,7 @@ // beim 1.Node traegt der Node die Werte in den GetSet ein (Initial) // alle weiteren Nodes werden zum GetSet zu gemergt - for( sal_uInt32 n = nSttNd; n <= nEndNd; ++n ) + for( ULONG n = nSttNd; n <= nEndNd; ++n ) { SwNode* pNd = rPam.GetDoc()->GetNodes()[ n ]; switch( pNd->GetNodeType() ) diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx 2005-12-11 08:56:47.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx 2005-12-11 09:35:41.000000000 +0100 @@ -1111,7 +1111,7 @@ { INT32 nVal; aValue >>= nVal; - aInfo.SetPosFromLeft(Min(MM100_TO_TWIP(nVal), sal_Int32(0xffff))); + aInfo.SetPosFromLeft(Min((sal_Int32)MM100_TO_TWIP(nVal), sal_Int32(0xffff))); } break; case WID_INTERVAL :