Index: source/core/inc/scriptinfo.hxx =================================================================== RCS file: /cvs/sw/sw/source/core/inc/scriptinfo.hxx,v retrieving revision 1.12 retrieving revision 1.12.12.1 diff -u -r1.12 -r1.12.12.1 --- source/core/inc/scriptinfo.hxx 9 Sep 2005 03:55:10 -0000 1.12 +++ source/core/inc/scriptinfo.hxx 19 Sep 2005 11:41:29 -0000 1.12.12.1 @@ -243,7 +243,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, + long Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen nLen, const USHORT nCompress, const USHORT nFontHeight, Point* pPoint = NULL ) const; @@ -263,7 +263,7 @@ The value which has to be added to a kashida opportunity. @return The number of kashida opportunities in the given range */ - USHORT KashidaJustify( long* pKernArray ,long* pScrArray, + USHORT KashidaJustify( sal_Int32* pKernArray ,sal_Int32* pScrArray, xub_StrLen nIdx, xub_StrLen nLen, long nSpaceAdd = 0 ) const; @@ -294,8 +294,8 @@ The value which has to be added to the cells. @return The number of extra spaces in the given range */ - static USHORT ThaiJustify( const XubString& rTxt, long* pKernArray, - long* pScrArray, xub_StrLen nIdx, + static USHORT ThaiJustify( const XubString& rTxt, sal_Int32* pKernArray, + sal_Int32* pScrArray, xub_StrLen nIdx, xub_StrLen nLen, xub_StrLen nNumberOfBlanks = 0, long nSpaceAdd = 0 ); Index: source/core/text/porlay.cxx =================================================================== RCS file: /cvs/sw/sw/source/core/text/porlay.cxx,v retrieving revision 1.55 retrieving revision 1.55.10.1 diff -u -r1.55 -r1.55.10.1 --- source/core/text/porlay.cxx 9 Sep 2005 04:59:47 -0000 1.55 +++ source/core/text/porlay.cxx 19 Sep 2005 11:41:29 -0000 1.55.10.1 @@ -1489,7 +1489,7 @@ * SwScriptInfo::Compress() *************************************************************************/ -long SwScriptInfo::Compress( long* pKernArray, xub_StrLen nIdx, xub_StrLen nLen, +long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen nLen, const USHORT nCompress, const USHORT nFontHeight, Point* pPoint ) const { @@ -1605,7 +1605,7 @@ * SwScriptInfo::KashidaJustify() *************************************************************************/ -USHORT SwScriptInfo::KashidaJustify( long* pKernArray, long* pScrArray, +USHORT SwScriptInfo::KashidaJustify( sal_Int32* pKernArray, sal_Int32* pScrArray, xub_StrLen nStt, xub_StrLen nLen, long nSpaceAdd ) const { @@ -1692,8 +1692,8 @@ * SwScriptInfo::ThaiJustify() *************************************************************************/ -USHORT SwScriptInfo::ThaiJustify( const XubString& rTxt, long* pKernArray, - long* pScrArray, xub_StrLen nStt, +USHORT SwScriptInfo::ThaiJustify( const XubString& rTxt, sal_Int32* pKernArray, + sal_Int32* pScrArray, xub_StrLen nStt, xub_StrLen nLen, xub_StrLen nNumberOfBlanks, long nSpaceAdd ) { Index: source/core/txtnode/fntcache.cxx =================================================================== RCS file: /cvs/sw/sw/source/core/txtnode/fntcache.cxx,v retrieving revision 1.80 retrieving revision 1.80.12.1 diff -u -r1.80 -r1.80.12.1 --- source/core/txtnode/fntcache.cxx 9 Sep 2005 05:12:20 -0000 1.80 +++ source/core/txtnode/fntcache.cxx 19 Sep 2005 11:41:30 -0000 1.80.12.1 @@ -1005,7 +1005,7 @@ if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() ) { const USHORT nGridWidth = pGrid->GetBaseHeight(); - long* pKernArray = new long[rInf.GetLen()]; + sal_Int32* pKernArray = new sal_Int32[rInf.GetLen()]; if ( pPrinter ) pPrinter->GetTextArray( rInf.GetText(), pKernArray, @@ -1106,7 +1106,7 @@ // Simple kerning is handled by DrawStretchText if( rInf.GetSpace() || rInf.GetKanaComp() ) { - long *pKernArray = new long[ rInf.GetLen() ]; + sal_Int32 *pKernArray = new sal_Int32[ rInf.GetLen() ]; rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray, rInf.GetIdx(), rInf.GetLen() ); @@ -1320,12 +1320,12 @@ BOOL bBullet = rInf.GetBullet(); if( bSymbol ) bBullet = FALSE; - long *pKernArray = new long[ rInf.GetLen() ]; + sal_Int32 *pKernArray = new sal_Int32[ rInf.GetLen() ]; CreateScrFont( *rInf.GetShell(), rInf.GetOut() ); long nScrPos; // get screen array - long* pScrArray = new long[ rInf.GetLen() ]; + sal_Int32* pScrArray = new sal_Int32[ rInf.GetLen() ]; rInf.GetOut().GetTextArray( rInf.GetText(), pScrArray, rInf.GetIdx(), rInf.GetLen() ); @@ -1898,7 +1898,7 @@ aTxtSize.Width() = pPrinter->GetTextWidth( rInf.GetText(), rInf.GetIdx(), nLn ); aTxtSize.Height() = pPrinter->GetTextHeight(); - long *pKernArray = new long[nLn]; + sal_Int32 *pKernArray = new sal_Int32[nLn]; CreateScrFont( *rInf.GetShell(), rInf.GetOut() ); if( !GetScrFont()->IsSameInstance( rInf.GetOut().GetFont() ) ) rInf.GetOut().SetFont( *pScrFont ); @@ -1916,7 +1916,7 @@ nScrPos = pKernArray[ nLn - 1 ]; else { - long* pScrArray = new long[ rInf.GetLen() ]; + sal_Int32* pScrArray = new sal_Int32[ rInf.GetLen() ]; rInf.GetOut().GetTextArray( rInf.GetText(), pScrArray, rInf.GetIdx(), rInf.GetLen() ); nScrPos = pScrArray[ 0 ]; @@ -1967,7 +1967,7 @@ rInf.GetOut().SetFont( *pPrtFont ); if( bCompress ) { - long *pKernArray = new long[nLn]; + sal_Int32 *pKernArray = new sal_Int32[nLn]; rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray, rInf.GetIdx(), nLn ); rInf.SetKanaDiff( rInf.GetScriptInfo()->Compress( pKernArray, @@ -2006,7 +2006,7 @@ if( 0 != nSperren ) nKern -= nSperren; - long *pKernArray = new long[ rInf.GetLen() ]; + sal_Int32 *pKernArray = new sal_Int32[ rInf.GetLen() ]; if ( pPrinter ) { @@ -2326,7 +2326,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() ); @@ -2428,7 +2428,7 @@ nLn = 1; else if( nLn > 2 * nTxtBreak ) nLn = 2 * nTxtBreak; - long *pKernArray = new long[ nLn ]; + sal_Int32 *pKernArray = new sal_Int32[ nLn ]; rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray, rInf.GetIdx(), nLn ); if( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn,