summaryrefslogtreecommitdiff
path: root/svx/source/xoutdev
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx76
-rw-r--r--svx/source/xoutdev/_xpoly.cxx240
-rw-r--r--svx/source/xoutdev/xattr.cxx480
-rw-r--r--svx/source/xoutdev/xattr2.cxx104
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx104
-rw-r--r--svx/source/xoutdev/xexch.cxx12
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx46
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx46
-rw-r--r--svx/source/xoutdev/xtabdash.cxx44
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx44
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx44
-rw-r--r--svx/source/xoutdev/xtable.cxx98
-rw-r--r--svx/source/xoutdev/xtablend.cxx44
13 files changed, 691 insertions, 691 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 6b3419c7b04e..495fa68fa264 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -129,7 +129,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
// UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
#ifdef UNX
const Size aBmpSize( aBmp.GetSizePixel() );
- BOOL bFullTrans = FALSE;
+ sal_Bool bFullTrans = sal_False;
if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
{
@@ -139,7 +139,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
if( pMAcc )
{
if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
- bFullTrans = TRUE;
+ bFullTrans = sal_True;
aTrans.ReleaseAccess( pMAcc );
}
@@ -207,7 +207,7 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
const long nBottom = aPixRect.Bottom();
const long nRight = aPixRect.Right();
const long nLeft = nXPos;
- const BOOL bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
+ const sal_Bool bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
pOutDev->Push();
pOutDev->SetMapMode( MapMode() );
@@ -239,14 +239,14 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
// ------------------------------------------------------------------------
-Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr )
+Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
{
Animation aNewAnim( rAnimation );
if( bHMirr || bVMirr )
{
const Size& rGlobalSize = aNewAnim.GetDisplaySizePixel();
- ULONG nMirrorFlags = 0L;
+ sal_uIntPtr nMirrorFlags = 0L;
if( bHMirr )
nMirrorFlags |= BMP_MIRROR_HORZ;
@@ -254,7 +254,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
if( bVMirr )
nMirrorFlags |= BMP_MIRROR_VERT;
- for( USHORT i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
+ for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
{
AnimationBitmap aAnimBmp( aNewAnim.Get( i ) );
@@ -280,7 +280,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
// ------------------------------------------------------------------------
-Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags )
+Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags )
{
Graphic aRetGraphic;
@@ -318,8 +318,8 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorF
// ------------------------------------------------------------------------
-USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
- const String& rFilterName, const ULONG nFlags,
+sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
+ const String& rFilterName, const sal_uIntPtr nFlags,
const Size* pMtfSize_100TH_MM )
{
if( rGraphic.GetType() != GRAPHIC_NONE )
@@ -328,8 +328,8 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
Graphic aGraphic;
String aExt;
GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
- USHORT nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
- BOOL bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
+ sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
+ sal_Bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
@@ -370,7 +370,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
aURL.setExtension( aExt );
rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
SvStream* pOStm = aMedium.GetOutStream();
if( pOStm && aGfxLink.GetDataSize() && aGfxLink.GetData() )
@@ -493,15 +493,15 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
#pragma optimize ( "", off )
#endif
-USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
- GraphicFilter& rFilter, const USHORT nFormat,
+sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+ GraphicFilter& rFilter, const sal_uInt16 nFormat,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
{
DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
- SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+ SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
SvStream* pOStm = aMedium.GetOutStream();
- USHORT nRet = GRFILTER_IOERROR;
+ sal_uInt16 nRet = GRFILTER_IOERROR;
if( pOStm )
{
@@ -525,11 +525,11 @@ USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject&
// ------------------------------------------------------------------------
-Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
+Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
{
const Size aSize( rBmp.GetSizePixel() );
Bitmap aRetBmp;
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) )
{
@@ -548,8 +548,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
const long nHeight = aSize.Height();
const long nHeight2 = nHeight - 2L;
const long lThres2 = (long) cThreshold * cThreshold;
- const BitmapColor aWhite = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
- const BitmapColor aBlack = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
+ const BitmapColor aWhite = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
+ const BitmapColor aBlack = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
long nSum1;
long nSum2;
long lGray;
@@ -567,18 +567,18 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
{
nXTmp = nX;
- nSum1 = -( nSum2 = lGray = (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) );
- nSum2 += ( (long) (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
+ nSum1 = -( nSum2 = lGray = (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) );
+ nSum2 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
nSum1 += ( lGray = pReadAcc->GetPixel( nY, nXTmp ) );
nSum2 += lGray;
- nSum1 += ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
- nSum1 -= ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
+ nSum1 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
+ nSum1 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
- nSum1 += ( lGray = -(long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) );
+ nSum1 += ( lGray = -(long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) );
nSum2 += lGray;
- nSum2 -= ( (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
- nSum1 += ( lGray = (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp ) );
+ nSum2 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
+ nSum1 += ( lGray = (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp ) );
nSum2 -= lGray;
if( ( nSum1 * nSum1 + nSum2 * nSum2 ) < lThres2 )
@@ -588,7 +588,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
}
}
- bRet = TRUE;
+ bRet = sal_True;
}
aWorkBmp.ReleaseAccess( pReadAcc );
@@ -612,8 +612,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
// ------------------------------------------------------------------------
-Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
- const BYTE cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
+Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
+ const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
{
Bitmap aWorkBmp;
Polygon aRetPoly;
@@ -653,7 +653,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
Point* pPoints1 = NULL;
Point* pPoints2 = NULL;
long nX, nY;
- USHORT nPolyPos = 0;
+ sal_uInt16 nPolyPos = 0;
const BitmapColor aBlack = pAcc->GetBestMatchingColor( Color( COL_BLACK ) );
if( nFlags & XOUTBMP_CONTOUR_VERT )
@@ -674,7 +674,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
nY = nStartY2;
// diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
- while( TRUE )
+ while( sal_True )
{
if( aBlack == pAcc->GetPixel( nY, nX ) )
{
@@ -711,7 +711,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
nX = nStartX2;
// diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
- while( TRUE )
+ while( sal_True )
{
if( aBlack == pAcc->GetPixel( nY, nX ) )
{
@@ -731,13 +731,13 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
}
}
- const USHORT nNewSize1 = nPolyPos << 1;
+ const sal_uInt16 nNewSize1 = nPolyPos << 1;
aRetPoly = Polygon( nPolyPos, pPoints1 );
aRetPoly.SetSize( nNewSize1 + 1 );
aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
- for( USHORT j = nPolyPos; nPolyPos < nNewSize1; )
+ for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; )
aRetPoly[ nPolyPos++ ] = pPoints2[ --j ];
if( ( fFactorX != 0. ) && ( fFactorY != 0. ) )
@@ -755,14 +755,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
// - DitherBitmap -
// ----------------
-BOOL DitherBitmap( Bitmap& rBitmap )
+sal_Bool DitherBitmap( Bitmap& rBitmap )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) )
bRet = rBitmap.Dither( BMP_DITHER_FLOYD );
else
- bRet = FALSE;
+ bRet = sal_False;
return bRet;
}
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 0e6252ddcb92..3dd39fc10347 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -57,11 +57,11 @@ DBG_NAME(XPolyPolygon);
|*
*************************************************************************/
-ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT _nResize )
+ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize )
{
pPointAry = NULL;
pFlagAry = NULL;
- bDeleteOldPoints = FALSE;
+ bDeleteOldPoints = sal_False;
nSize = 0;
nResize = _nResize;
nPoints = 0;
@@ -86,7 +86,7 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
pPointAry = NULL;
pFlagAry = NULL;
- bDeleteOldPoints = FALSE;
+ bDeleteOldPoints = sal_False;
nSize = 0;
ImpXPolygon::nResize = rImpXPoly.nResize;
nPoints = 0;
@@ -140,7 +140,7 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
|*
|* ImpXPolygon::Resize()
|*
-|* !!! Polygongroesse aendern - wenn bDeletePoints FALSE, dann den
+|* !!! Polygongroesse aendern - wenn bDeletePoints sal_False, dann den
|* Point-Array nicht loeschen, sondern in pOldPointAry sichern und
|* das Flag bDeleteOldPoints setzen. Beim naechsten Zugriff wird
|* das Array dann geloescht.
@@ -152,13 +152,13 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
|*
*************************************************************************/
-void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
+void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints )
{
if( nNewSize == nSize )
return;
- BYTE* pOldFlagAry = pFlagAry;
- USHORT nOldSize = nSize;
+ sal_uInt8* pOldFlagAry = pFlagAry;
+ sal_uInt16 nOldSize = nSize;
CheckPointDelete();
pOldPointAry = pPointAry;
@@ -176,7 +176,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
memset( pPointAry, 0, nSize*sizeof( Point ) );
// Flag Array erzeugen
- pFlagAry = new BYTE[ nSize ];
+ pFlagAry = new sal_uInt8[ nSize ];
memset( pFlagAry, 0, nSize );
// Eventuell umkopieren
@@ -197,7 +197,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
nPoints = nSize;
}
if ( bDeletePoints ) delete[] (char*) pOldPointAry;
- else bDeleteOldPoints = TRUE;
+ else bDeleteOldPoints = sal_True;
delete[] pOldFlagAry;
}
}
@@ -213,7 +213,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
|*
*************************************************************************/
-void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
+void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckPointDelete();
@@ -228,7 +228,7 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
// den Rest nach hinten schieben
if( nPos < nPoints )
{
- USHORT nMove = nPoints - nPos;
+ sal_uInt16 nMove = nPoints - nPos;
memmove( &pPointAry[nPos+nCount], &pPointAry[nPos],
nMove * sizeof(Point) );
memmove( &pFlagAry[nPos+nCount], &pFlagAry[nPos], nMove );
@@ -250,13 +250,13 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
|*
*************************************************************************/
-void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
+void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckPointDelete();
if( (nPos + nCount) <= nPoints )
{
- USHORT nMove = nPoints - nPos - nCount;
+ sal_uInt16 nMove = nPoints - nPos - nCount;
if( nMove )
{
@@ -281,7 +281,7 @@ void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
|*
*************************************************************************/
-XPolygon::XPolygon( USHORT nSize, USHORT nResize )
+XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize )
{
DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon( nSize, nResize );
@@ -318,14 +318,14 @@ XPolygon::XPolygon( const Polygon& rPoly )
{
DBG_CTOR(XPolygon,NULL);
- USHORT nSize = rPoly.GetSize();
+ sal_uInt16 nSize = rPoly.GetSize();
pImpXPolygon = new ImpXPolygon( nSize );
pImpXPolygon->nPoints = nSize;
- for( USHORT i = 0; i < nSize; i++ )
+ for( sal_uInt16 i = 0; i < nSize; i++ )
{
pImpXPolygon->pPointAry[i] = rPoly[i];
- pImpXPolygon->pFlagAry[i] = (BYTE) rPoly.GetFlags( i );
+ pImpXPolygon->pFlagAry[i] = (sal_uInt8) rPoly.GetFlags( i );
}
}
@@ -355,13 +355,13 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
// Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
long nXHdl = (long)(0.552284749 * nRx);
long nYHdl = (long)(0.552284749 * nRy);
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if ( nRx && nRy )
{
Point aCenter;
- for (USHORT nQuad = 0; nQuad < 4; nQuad++)
+ for (sal_uInt16 nQuad = 0; nQuad < 4; nQuad++)
{
switch ( nQuad )
{
@@ -383,8 +383,8 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
break;
}
GenBezArc(aCenter, nRx, nRy, nXHdl, nYHdl, 0, 900, nQuad, nPos);
- pImpXPolygon->pFlagAry[nPos ] = (BYTE) XPOLY_SMOOTH;
- pImpXPolygon->pFlagAry[nPos+3] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos ] = (sal_uInt8) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos+3] = (sal_uInt8) XPOLY_SMOOTH;
nPos += 4;
}
}
@@ -410,31 +410,31 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
*************************************************************************/
XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
- USHORT nStartAngle, USHORT nEndAngle, BOOL bClose)
+ sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
{
DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon(17);
nStartAngle %= 3600;
if ( nEndAngle > 3600 ) nEndAngle %= 3600;
- BOOL bFull = (nStartAngle == 0 && nEndAngle == 3600);
+ sal_Bool bFull = (nStartAngle == 0 && nEndAngle == 3600);
// Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
long nXHdl = (long)(0.552284749 * nRx);
long nYHdl = (long)(0.552284749 * nRy);
- USHORT nPos = 0;
- BOOL bLoopEnd = FALSE;
+ sal_uInt16 nPos = 0;
+ sal_Bool bLoopEnd = sal_False;
do
{
- USHORT nA1, nA2;
- USHORT nQuad = nStartAngle / 900;
+ sal_uInt16 nA1, nA2;
+ sal_uInt16 nQuad = nStartAngle / 900;
if ( nQuad == 4 ) nQuad = 0;
bLoopEnd = CheckAngles(nStartAngle, nEndAngle, nA1, nA2);
GenBezArc(rCenter, nRx, nRy, nXHdl, nYHdl, nA1, nA2, nQuad, nPos);
nPos += 3;
if ( !bLoopEnd )
- pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
} while ( !bLoopEnd );
@@ -444,8 +444,8 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
if ( bFull )
{
- pImpXPolygon->pFlagAry[0 ] = (BYTE) XPOLY_SMOOTH;
- pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[0 ] = (sal_uInt8) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
}
pImpXPolygon->nPoints = nPos + 1;
}
@@ -498,7 +498,7 @@ void XPolygon::CheckReference()
|*
*************************************************************************/
-void XPolygon::SetSize( USHORT nNewSize )
+void XPolygon::SetSize( sal_uInt16 nNewSize )
{
CheckReference();
pImpXPolygon->Resize( nNewSize );
@@ -514,7 +514,7 @@ void XPolygon::SetSize( USHORT nNewSize )
|*
*************************************************************************/
-USHORT XPolygon::GetSize() const
+sal_uInt16 XPolygon::GetSize() const
{
pImpXPolygon->CheckPointDelete();
return pImpXPolygon->nSize;
@@ -530,7 +530,7 @@ USHORT XPolygon::GetSize() const
|*
*************************************************************************/
-void XPolygon::SetPointCount( USHORT nPoints )
+void XPolygon::SetPointCount( sal_uInt16 nPoints )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
@@ -540,7 +540,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
if ( nPoints < pImpXPolygon->nPoints )
{
- USHORT nSize = pImpXPolygon->nPoints - nPoints;
+ sal_uInt16 nSize = pImpXPolygon->nPoints - nPoints;
memset( &pImpXPolygon->pPointAry[nPoints], 0, nSize * sizeof( Point ) );
memset( &pImpXPolygon->pFlagAry [nPoints], 0, nSize );
}
@@ -557,7 +557,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
|*
*************************************************************************/
-USHORT XPolygon::GetPointCount() const
+sal_uInt16 XPolygon::GetPointCount() const
{
pImpXPolygon->CheckPointDelete();
return pImpXPolygon->nPoints;
@@ -573,13 +573,13 @@ USHORT XPolygon::GetPointCount() const
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
+void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
pImpXPolygon->InsertSpace( nPos, 1 );
pImpXPolygon->pPointAry[nPos] = rPt;
- pImpXPolygon->pFlagAry[nPos] = (BYTE)eFlags;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8)eFlags;
}
/*************************************************************************
@@ -592,12 +592,12 @@ void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
- USHORT nPoints = rXPoly.GetPointCount();
+ sal_uInt16 nPoints = rXPoly.GetPointCount();
pImpXPolygon->InsertSpace( nPos, nPoints );
@@ -619,16 +619,16 @@ void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
- USHORT nPoints = rPoly.GetSize();
+ sal_uInt16 nPoints = rPoly.GetSize();
pImpXPolygon->InsertSpace( nPos, nPoints );
- USHORT i;
+ sal_uInt16 i;
for( i=0; i < nPoints; i++ )
pImpXPolygon->pPointAry[i] = rPoly[i];
@@ -645,7 +645,7 @@ void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
|*
*************************************************************************/
-void XPolygon::Remove( USHORT nPos, USHORT nCount )
+void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckReference();
pImpXPolygon->Remove( nPos, nCount );
@@ -669,8 +669,8 @@ void XPolygon::Move( long nHorzMove, long nVertMove )
CheckReference();
// Punkte verschieben
- USHORT nCount = pImpXPolygon->nPoints;
- for ( USHORT i = 0; i < nCount; i++ )
+ sal_uInt16 nCount = pImpXPolygon->nPoints;
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
{
Point* pPt = &(pImpXPolygon->pPointAry[i]);
pPt->X() += nHorzMove;
@@ -720,7 +720,7 @@ Rectangle XPolygon::GetBoundRect() const
|*
*************************************************************************/
-const Point& XPolygon::operator[]( USHORT nPos ) const
+const Point& XPolygon::operator[]( sal_uInt16 nPos ) const
{
DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Ungueltiger Index bei const-Arrayzugriff auf XPolygon");
@@ -738,7 +738,7 @@ const Point& XPolygon::operator[]( USHORT nPos ) const
|*
*************************************************************************/
-Point& XPolygon::operator[]( USHORT nPos )
+Point& XPolygon::operator[]( sal_uInt16 nPos )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
@@ -746,7 +746,7 @@ Point& XPolygon::operator[]( USHORT nPos )
if( nPos >= pImpXPolygon->nSize )
{
DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon");
- pImpXPolygon->Resize(nPos + 1, FALSE);
+ pImpXPolygon->Resize(nPos + 1, sal_False);
}
if( nPos >= pImpXPolygon->nPoints )
pImpXPolygon->nPoints = nPos + 1;
@@ -789,10 +789,10 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly )
|*
*************************************************************************/
-BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return TRUE;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True;
return *rXPoly.pImpXPolygon == *pImpXPolygon;
}
@@ -806,10 +806,10 @@ BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
|*
*************************************************************************/
-BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return FALSE;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False;
return *rXPoly.pImpXPolygon != *pImpXPolygon;
}
@@ -823,7 +823,7 @@ BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
|*
*************************************************************************/
-XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
+XPolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const
{
pImpXPolygon->CheckPointDelete();
return (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
@@ -839,11 +839,11 @@ XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
|*
*************************************************************************/
-void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
+void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
- pImpXPolygon->pFlagAry[nPos] = (BYTE) eFlags;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) eFlags;
}
/*************************************************************************
@@ -856,7 +856,7 @@ void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
|*
*************************************************************************/
-BOOL XPolygon::IsControl(USHORT nPos) const
+sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const
{
return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL );
}
@@ -871,7 +871,7 @@ BOOL XPolygon::IsControl(USHORT nPos) const
|*
*************************************************************************/
-BOOL XPolygon::IsSmooth(USHORT nPos) const
+sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const
{
XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR );
@@ -887,7 +887,7 @@ BOOL XPolygon::IsSmooth(USHORT nPos) const
|*
*************************************************************************/
-double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
+double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2)
{
const Point& rP1 = pImpXPolygon->pPointAry[nP1];
const Point& rP2 = pImpXPolygon->pPointAry[nP2];
@@ -906,7 +906,7 @@ double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
|*
*************************************************************************/
-void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
+void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT)
{
Point* pPoints = pImpXPolygon->pPointAry;
double fT2 = fT * fT;
@@ -914,7 +914,7 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
double fU = 1.0 - fT;
double fU2 = fU * fU;
double fU3 = fU * fU2;
- USHORT nIdx = nPos;
+ sal_uInt16 nIdx = nPos;
short nPosInc, nIdxInc;
if ( bCalcFirst )
@@ -955,8 +955,8 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
/************************************************************************/
void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
- long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
- USHORT nQuad, USHORT nFirst)
+ long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+ sal_uInt16 nQuad, sal_uInt16 nFirst)
{
Point* pPoints = pImpXPolygon->pPointAry;
pPoints[nFirst ] = rCenter;
@@ -991,29 +991,29 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
}
if ( nStart > 0 )
- SubdivideBezier(nFirst, FALSE, (double)nStart / 900);
+ SubdivideBezier(nFirst, sal_False, (double)nStart / 900);
if ( nEnd < 900 )
- SubdivideBezier(nFirst, TRUE, (double)(nEnd-nStart) / (900-nStart));
+ SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart));
SetFlags(nFirst+1, XPOLY_CONTROL);
SetFlags(nFirst+2, XPOLY_CONTROL);
}
/************************************************************************/
-BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2)
+sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
{
if ( nStart == 3600 ) nStart = 0;
if ( nEnd == 0 ) nEnd = 3600;
- USHORT nStPrev = nStart;
- USHORT nMax = (nStart / 900 + 1) * 900;
- USHORT nMin = nMax - 900;
+ sal_uInt16 nStPrev = nStart;
+ sal_uInt16 nMax = (nStart / 900 + 1) * 900;
+ sal_uInt16 nMin = nMax - 900;
if ( nEnd >= nMax || nEnd <= nStart ) nA2 = 900;
else nA2 = nEnd - nMin;
nA1 = nStart - nMin;
nStart = nMax;
- // TRUE zurueck, falls letztes Segment berechnet wurde
+ // sal_True zurueck, falls letztes Segment berechnet wurde
return (nStPrev < nEnd && nStart >= nEnd);
}
@@ -1034,11 +1034,11 @@ BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2
|*
\************************************************************************/
-void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
+void XPolygon::CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt)
{
CheckReference();
-// USHORT nMaxPnt = pImpXPolygon->nPoints - 1;
+// sal_uInt16 nMaxPnt = pImpXPolygon->nPoints - 1;
// if ( nCenter == nMaxPnt ) nPnt = 1;
// else if ( nCenter == 0 ) nPnt = nMaxPnt - 1;
@@ -1047,7 +1047,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
// statt dessen nDrag auf der Achse nCenter-nPnt verschieben
if ( !IsControl(nPnt) )
{
- USHORT nTmp = nDrag;
+ sal_uInt16 nTmp = nDrag;
nDrag = nPnt;
nPnt = nTmp;
}
@@ -1081,7 +1081,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
|*
\************************************************************************/
-void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
+void XPolygon::CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext)
{
CheckReference();
@@ -1119,7 +1119,7 @@ void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
|*
\************************************************************************/
-void XPolygon::PointsToBezier(USHORT nFirst)
+void XPolygon::PointsToBezier(sal_uInt16 nFirst)
{
double nFullLength, nPart1Length, nPart2Length;
double fX0, fY0, fX1, fY1, fX2, fY2, fX3, fY3;
@@ -1202,9 +1202,9 @@ void XPolygon::Translate(const Point& rTrans)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
pImpXPolygon->pPointAry[i] += rTrans;
}
@@ -1231,9 +1231,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
long nCenterX = rCenter.X();
long nCenterY = rCenter.Y();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point *pPt = &(pImpXPolygon->pPointAry[i]);
nX = pPt->X()-nCenterX;
@@ -1245,9 +1245,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
/* und so stand das in einem anderen File auf T:
dass ich am 29-11-1995 gegettet habe. Joe M.
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point P = pImpXPolygon->pPointAry[i] - rCenter;
long X = P.X();
@@ -1270,7 +1270,7 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
|*
*************************************************************************/
-void XPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
{
nAngle %= 3600;
@@ -1298,9 +1298,9 @@ void XPolygon::Scale(double fSx, double fSy)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
rPnt.X() = (long)(fSx * rPnt.X());
@@ -1324,9 +1324,9 @@ void XPolygon::SlantX(long nYRef, double fSin, double fCos)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
long nDy = rPnt.Y() - nYRef;
@@ -1351,9 +1351,9 @@ void XPolygon::SlantY(long nXRef, double fSin, double fCos)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
long nDx = rPnt.X() - nXRef;
@@ -1407,9 +1407,9 @@ void XPolygon::Distort(const Rectangle& rRefRect,
X4 = rDistortedRect[2].X();
Y4 = rDistortedRect[2].Y();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
@@ -1487,14 +1487,14 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon)
DBG_CTOR(XPolygon,NULL);
const Polygon aSource(rPolygon);
- USHORT nSize = aSource.GetSize();
+ sal_uInt16 nSize = aSource.GetSize();
pImpXPolygon = new ImpXPolygon( nSize );
pImpXPolygon->nPoints = nSize;
- for( USHORT i = 0; i < nSize; i++ )
+ for( sal_uInt16 i = 0; i < nSize; i++ )
{
pImpXPolygon->pPointAry[i] = aSource[i];
- pImpXPolygon->pFlagAry[i] = (BYTE) aSource.GetFlags( i );
+ pImpXPolygon->pFlagAry[i] = (sal_uInt8) aSource.GetFlags( i );
}
}
@@ -1559,11 +1559,11 @@ ImpXPolyPolygon::~ImpXPolyPolygon()
bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
{
- USHORT nAnz=(USHORT)aXPolyList.Count();
+ sal_uInt16 nAnz=(sal_uInt16)aXPolyList.Count();
const XPolygonList& rCmpList=rImpXPolyPoly.aXPolyList;
- if (nAnz!=(USHORT)rCmpList.Count()) return FALSE;
+ if (nAnz!=(sal_uInt16)rCmpList.Count()) return sal_False;
bool bEq=true;
- for (USHORT i=nAnz; i>0 && bEq;) {
+ for (sal_uInt16 i=nAnz; i>0 && bEq;) {
i--;
bEq= *aXPolyList.GetObject(i) == *rCmpList.GetObject(i);
}
@@ -1580,7 +1580,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
|*
*************************************************************************/
-XPolyPolygon::XPolyPolygon( USHORT nInitSize, USHORT nResize )
+XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize )
{
DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon( nInitSize, nResize );
@@ -1636,7 +1636,7 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly )
DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon;
- for (USHORT i = 0; i < rPolyPoly.Count(); i++)
+ for (sal_uInt16 i = 0; i < rPolyPoly.Count(); i++)
pImpXPolyPolygon->aXPolyList.Insert(
new XPolygon(rPolyPoly.GetObject(i)) );
}
@@ -1689,7 +1689,7 @@ void XPolyPolygon::CheckReference()
|*
*************************************************************************/
-void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos )
{
CheckReference();
XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1706,11 +1706,11 @@ void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
|*
*************************************************************************/
-void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos )
{
CheckReference();
- for (USHORT i = 0; i < rXPolyPoly.Count(); i++)
+ for (sal_uInt16 i = 0; i < rXPolyPoly.Count(); i++)
{
XPolygon* pXPoly = new XPolygon(rXPolyPoly[i]);
pImpXPolyPolygon->aXPolyList.Insert(pXPoly, nPos);
@@ -1729,7 +1729,7 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
|*
*************************************************************************/
-XPolygon XPolyPolygon::Remove( USHORT nPos )
+XPolygon XPolyPolygon::Remove( sal_uInt16 nPos )
{
CheckReference();
XPolygon* pTmpXPoly = pImpXPolyPolygon->aXPolyList.Remove( nPos );
@@ -1749,7 +1749,7 @@ XPolygon XPolyPolygon::Remove( USHORT nPos )
|*
*************************************************************************/
-XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
+XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos )
{
CheckReference();
XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1770,7 +1770,7 @@ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
|*
*************************************************************************/
-const XPolygon& XPolyPolygon::GetObject( USHORT nPos ) const
+const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const
{
return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos ));
}
@@ -1816,9 +1816,9 @@ void XPolyPolygon::Clear()
|*
*************************************************************************/
-USHORT XPolyPolygon::Count() const
+sal_uInt16 XPolyPolygon::Count() const
{
- return (USHORT)(pImpXPolyPolygon->aXPolyList.Count());
+ return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.Count());
}
@@ -1862,10 +1862,10 @@ void XPolyPolygon::Move( long nHorzMove, long nVertMove )
Rectangle XPolyPolygon::GetBoundRect() const
{
- USHORT nXPoly = (USHORT)pImpXPolyPolygon->aXPolyList.Count();
+ sal_uInt16 nXPoly = (sal_uInt16)pImpXPolyPolygon->aXPolyList.Count();
Rectangle aRect;
- for ( USHORT n = 0; n < nXPoly; n++ )
+ for ( sal_uInt16 n = 0; n < nXPoly; n++ )
{
const XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList.GetObject( n );
aRect.Union( pXPoly->GetBoundRect() );
@@ -1885,7 +1885,7 @@ Rectangle XPolyPolygon::GetBoundRect() const
|*
*************************************************************************/
-XPolygon& XPolyPolygon::operator[]( USHORT nPos )
+XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos )
{
CheckReference();
return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos ));
@@ -1925,9 +1925,9 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly )
|*
*************************************************************************/
-BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return TRUE;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True;
return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon;
}
@@ -1942,9 +1942,9 @@ BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
|*
*************************************************************************/
-BOOL XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return FALSE;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False;
return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon;
}
@@ -1962,7 +1962,7 @@ void XPolyPolygon::Translate(const Point& rTrans)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Translate(rTrans);
}
@@ -1981,7 +1981,7 @@ void XPolyPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate(rCenter, fSin, fCos);
}
@@ -1996,7 +1996,7 @@ void XPolyPolygon::Rotate20()
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate20();
}
@@ -2011,7 +2011,7 @@ void XPolyPolygon::Rotate20()
|*
*************************************************************************/
-void XPolyPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolyPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
{
nAngle %= 3600;
@@ -2038,7 +2038,7 @@ void XPolyPolygon::Scale(double fSx, double fSy)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Scale(fSx, fSy);
}
@@ -2057,7 +2057,7 @@ void XPolyPolygon::SlantX(long nYRef, double fSin, double fCos)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantX(nYRef, fSin, fCos);
}
@@ -2076,7 +2076,7 @@ void XPolyPolygon::SlantY(long nXRef, double fSin, double fCos)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantY(nXRef, fSin, fCos);
}
@@ -2101,7 +2101,7 @@ void XPolyPolygon::Distort(const Rectangle& rRefRect,
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Distort(rRefRect,
rDistortedRect);
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index f7ce452ea6e8..5df3689e023e 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star;
/************************************************************************/
-#define VCLTOSVCOL( rCol ) (USHORT)((((USHORT)(rCol))<<8)|(rCol))
+#define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol))
/************************************************************************/
@@ -107,7 +107,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -115,7 +115,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) :
SfxStringItem(_nWhich, aNameOrIndexEmptyString),
nPalIndex(nIndex)
{
@@ -123,7 +123,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, const String& rName)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, const String& rName)
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -131,7 +131,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) :
SfxStringItem(_nWhich, rName),
nPalIndex(-1)
{
@@ -139,7 +139,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, SvStream& rIn)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, SvStream& rIn)
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -147,7 +147,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, SvStream& rIn) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) :
SfxStringItem(_nWhich, rIn)
{
rIn >> nPalIndex;
@@ -203,7 +203,7 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -211,7 +211,7 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new NameOrIndex(Which(), rIn);
}
@@ -226,7 +226,7 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
SfxStringItem::Store( rOut, nItemVersion );
rOut << nPalIndex;
@@ -238,7 +238,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
Argument pPool2 can be null.
If returned string equals NameOrIndex->GetName(), the name was already unique.
*/
-String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults )
+String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults )
{
sal_Bool bForceNew = sal_False;
@@ -368,11 +368,11 @@ TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex);
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) :
NameOrIndex(_nWhich, nIndex),
aColor(rTheColor)
{
@@ -380,11 +380,11 @@ XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, const XubString& rName, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, const XubString& rName, const Color& rTheColor) :
NameOrIndex(_nWhich, rName),
aColor(rTheColor)
{
@@ -404,11 +404,11 @@ XColorItem::XColorItem(const XColorItem& rItem) :
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, SvStream& rIn)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, SvStream& rIn)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, SvStream& rIn) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) :
NameOrIndex(_nWhich, rIn)
{
if (!IsIndex())
@@ -442,11 +442,11 @@ int XColorItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
\************************************************************************/
-SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XColorItem(Which(), rIn);
}
@@ -457,7 +457,7 @@ SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\************************************************************************/
-SvStream& XColorItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -484,13 +484,13 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
}
-sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
return sal_True;
}
-sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -520,7 +520,7 @@ TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem);
*************************************************************************/
XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) :
- SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< USHORT >(eTheLineStyle))
+ SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle))
{
}
@@ -556,7 +556,7 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -564,7 +564,7 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStyleItem(rIn);
}
@@ -588,9 +588,9 @@ SfxItemPresentation XLineStyleItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
- switch( (USHORT)GetValue() )
+ switch( (sal_uInt16)GetValue() )
{
case XLINE_NONE:
nId = RID_SVXSTR_INVISIBLE;
@@ -609,14 +609,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation
}
}
-sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
rVal <<= eLS;
return sal_True;
}
-sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
::com::sun::star::drawing::LineStyle eLS;
if(!(rVal >>= eLS ))
@@ -628,13 +628,13 @@ sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
eLS = (::com::sun::star::drawing::LineStyle)nLS;
}
- SetValue( sal::static_int_cast< USHORT >( eLS ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) );
return sal_True;
}
//------------------------------------------------------------------------
-USHORT XLineStyleItem::GetValueCount() const
+sal_uInt16 XLineStyleItem::GetValueCount() const
{
return 3;
}
@@ -645,7 +645,7 @@ USHORT XLineStyleItem::GetValueCount() const
// ------------
/*************************************************************************
|*
-|* XDash::XDash(XDashStyle, USHORT, ULONG, USHORT, ULONG, ULONG)
+|* XDash::XDash(XDashStyle, sal_uInt16, sal_uIntPtr, sal_uInt16, sal_uIntPtr, sal_uIntPtr)
|*
|* Beschreibung
|* Ersterstellung 21.11.94
@@ -653,8 +653,8 @@ USHORT XLineStyleItem::GetValueCount() const
|*
*************************************************************************/
-XDash::XDash(XDashStyle eTheDash, USHORT nTheDots, ULONG nTheDotLen,
- USHORT nTheDashes, ULONG nTheDashLen, ULONG nTheDistance) :
+XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen,
+ sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) :
eDash(eTheDash),
nDots(nTheDots),
nDotLen(nTheDotLen),
@@ -883,7 +883,7 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash)
+|* XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -891,7 +891,7 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
|*
*************************************************************************/
-XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) :
+XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) :
NameOrIndex(XATTR_LINEDASH, nIndex),
aDash(rTheDash)
{
@@ -944,9 +944,9 @@ XLineDashItem::XLineDashItem(SvStream& rIn) :
{
if (!IsIndex())
{
- USHORT nSTemp;
- UINT32 nLTemp;
- INT32 nITemp;
+ sal_uInt16 nSTemp;
+ sal_uInt32 nLTemp;
+ sal_Int32 nITemp;
rIn >> nITemp; aDash.SetDashStyle((XDashStyle)nITemp);
rIn >> nSTemp; aDash.SetDots(nSTemp);
@@ -1005,7 +1005,7 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1013,7 +1013,7 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineDashItem(rIn);
}
@@ -1028,18 +1028,18 @@ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineDashItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT32) aDash.GetDashStyle();
+ rOut << (sal_Int32) aDash.GetDashStyle();
rOut << aDash.GetDots();
- rOut << (UINT32) aDash.GetDotLen();
+ rOut << (sal_uInt32) aDash.GetDotLen();
rOut << aDash.GetDashes();
- rOut << (UINT32) aDash.GetDashLen();
- rOut << (UINT32) aDash.GetDistance();
+ rOut << (sal_uInt32) aDash.GetDashLen();
+ rOut << (sal_uInt32) aDash.GetDistance();
}
return rOut;
@@ -1089,22 +1089,22 @@ SfxItemPresentation XLineDashItem::GetPresentation
//------------------------------------------------------------------------
-FASTBOOL XLineDashItem::HasMetrics() const
+int XLineDashItem::HasMetrics() const
{
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
-FASTBOOL XLineDashItem::ScaleMetrics(long nMul, long nDiv)
+int XLineDashItem::ScaleMetrics(long nMul, long nDiv)
{
aDash.SetDotLen( ScaleMetricValue( aDash.GetDotLen(), nMul, nDiv ) );
aDash.SetDashLen( ScaleMetricValue( aDash.GetDashLen(), nMul, nDiv ) );
aDash.SetDistance( ScaleMetricValue( aDash.GetDistance(), nMul, nDiv ) );
- return TRUE;
+ return sal_True;
}
-sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1118,7 +1118,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
::com::sun::star::drawing::LineDash aLineDash;
const XDash& rXD = GetDashValue();
- aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+ aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
aLineDash.Dots = rXD.GetDots();
aLineDash.DotLen = rXD.GetDotLen();
aLineDash.Dashes = rXD.GetDashes();
@@ -1149,7 +1149,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
::com::sun::star::drawing::LineDash aLineDash;
- aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+ aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
aLineDash.Dots = rXD.GetDots();
aLineDash.DotLen = rXD.GetDotLen();
aLineDash.Dashes = rXD.GetDashes();
@@ -1208,7 +1208,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
return sal_True;
}
-sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1240,7 +1240,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
{
XDash aXDash;
- aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
aXDash.SetDots(aLineDash.Dots);
aXDash.SetDotLen(aLineDash.DotLen);
aXDash.SetDashes(aLineDash.Dashes);
@@ -1276,7 +1276,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
XDash aXDash;
- aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
aXDash.SetDots(aLineDash.Dots);
aXDash.SetDotLen(aLineDash.DotLen);
aXDash.SetDashes(aLineDash.Dashes);
@@ -1297,7 +1297,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
return sal_False;
XDash aXDash = GetDashValue();
- aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal)));
if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
aXDash.SetDots(1);
@@ -1354,7 +1354,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
return sal_True;
}
-BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue();
}
@@ -1433,7 +1433,7 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1441,7 +1441,7 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineWidthItem(rIn);
}
@@ -1472,7 +1472,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
}
}
-sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Int32 nValue = GetValue();
if( 0 != (nMemberId&CONVERT_TWIPS) )
@@ -1482,7 +1482,7 @@ sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
return sal_True;
}
-sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -1500,7 +1500,7 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
/*************************************************************************
|*
-|* XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor)
+|* XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1508,7 +1508,7 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
|*
*************************************************************************/
-XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) :
+XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
{
}
@@ -1560,7 +1560,7 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1568,7 +1568,7 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineColorItem(rIn);
}
@@ -1597,13 +1597,13 @@ SfxItemPresentation XLineColorItem::GetPresentation
}
}
-sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
return sal_True;
}
-sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1719,7 +1719,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineStartItem::XLineStartItem(INT32 nIndex)
+|* XLineStartItem::XLineStartItem(sal_Int32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1727,7 +1727,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
|*
*************************************************************************/
-XLineStartItem::XLineStartItem(INT32 nIndex)
+XLineStartItem::XLineStartItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINESTART, nIndex)
{
}
@@ -1831,7 +1831,7 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1839,7 +1839,7 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartItem(rIn);
}
@@ -1854,7 +1854,7 @@ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineStartItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -1913,7 +1913,7 @@ SfxItemPresentation XLineStartItem::GetPresentation
}
}
-sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1933,7 +1933,7 @@ sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
return sal_True;
}
-sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2191,7 +2191,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineEndItem::XLineEndItem(INT32 nIndex)
+|* XLineEndItem::XLineEndItem(sal_Int32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2199,7 +2199,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
|*
*************************************************************************/
-XLineEndItem::XLineEndItem(INT32 nIndex)
+XLineEndItem::XLineEndItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINEEND, nIndex)
{
}
@@ -2303,7 +2303,7 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2311,7 +2311,7 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndItem(rIn);
}
@@ -2326,7 +2326,7 @@ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineEndItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -2607,7 +2607,7 @@ SfxItemPresentation XLineEndItem::GetPresentation
}
}
-sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2626,7 +2626,7 @@ sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMembe
return sal_True;
}
-sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2663,7 +2663,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem);
/*************************************************************************
|*
-|* XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth)
+|* XLineStartWidthItem::XLineStartWidthItem(sal_Int32 nWidth)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2708,7 +2708,7 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Beschreibung
@@ -2717,7 +2717,7 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartWidthItem(rIn);
}
@@ -2748,13 +2748,13 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
}
}
-sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -2816,7 +2816,7 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2824,7 +2824,7 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndWidthItem(rIn);
}
@@ -2855,13 +2855,13 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
}
}
-sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -2877,7 +2877,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
/*************************************************************************
|*
-|* XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter)
+|* XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2885,7 +2885,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
|*
*************************************************************************/
-XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter) :
+XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) :
SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
{
}
@@ -2922,7 +2922,7 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Beschreibung
@@ -2931,7 +2931,7 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartCenterItem(rIn);
}
@@ -2961,14 +2961,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
}
}
-sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
rVal.setValue( &bValue, ::getCppuBooleanType() );
return sal_True;
}
-sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
return sal_False;
@@ -2985,7 +2985,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
/*************************************************************************
|*
-|* XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter)
+|* XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2993,7 +2993,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
|*
*************************************************************************/
-XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter) :
+XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) :
SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
{
}
@@ -3030,7 +3030,7 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Beschreibung
@@ -3039,7 +3039,7 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndCenterItem(rIn);
}
@@ -3069,14 +3069,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
}
}
-sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
rVal.setValue( &bValue, ::getCppuBooleanType() );
return sal_True;
}
-BOOL XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
return sal_False;
@@ -3106,7 +3106,7 @@ TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem);
*************************************************************************/
XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) :
- SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< USHORT >(eFillStyle))
+ SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle))
{
}
@@ -3142,7 +3142,7 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3150,7 +3150,7 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillStyleItem(rIn);
}
@@ -3175,9 +3175,9 @@ SfxItemPresentation XFillStyleItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
- switch( (USHORT)GetValue() )
+ switch( (sal_uInt16)GetValue() )
{
case XFILL_NONE:
nId = RID_SVXSTR_INVISIBLE;
@@ -3207,13 +3207,13 @@ SfxItemPresentation XFillStyleItem::GetPresentation
//------------------------------------------------------------------------
-USHORT XFillStyleItem::GetValueCount() const
+sal_uInt16 XFillStyleItem::GetValueCount() const
{
return 5;
}
// -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
@@ -3223,7 +3223,7 @@ sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
}
// -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
::com::sun::star::drawing::FillStyle eFS;
if(!(rVal >>= eFS))
@@ -3235,7 +3235,7 @@ sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
eFS = (::com::sun::star::drawing::FillStyle)nFS;
}
- SetValue( sal::static_int_cast< USHORT >( eFS ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) );
return sal_True;
}
@@ -3248,7 +3248,7 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
/*************************************************************************
|*
-|* XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor)
+|* XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3256,7 +3256,7 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
|*
*************************************************************************/
-XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
{
}
@@ -3308,7 +3308,7 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3316,7 +3316,7 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillColorItem(rIn);
}
@@ -3347,7 +3347,7 @@ SfxItemPresentation XFillColorItem::GetPresentation
// -----------------------------------------------------------------------
-sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
@@ -3356,7 +3356,7 @@ sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
// -----------------------------------------------------------------------
-sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue ))
@@ -3371,7 +3371,7 @@ sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
// -----------------------------
TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
-XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
{
}
@@ -3391,14 +3391,14 @@ SfxPoolItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const
return new XSecondaryFillColorItem(*this);
}
-SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
{
if ( nVer >= 2 )
return new XSecondaryFillColorItem( rIn );
else
return new XSecondaryFillColorItem( String(), Color(0,184,255) );
}
-USHORT XSecondaryFillColorItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
{
return 2;
}
@@ -3451,7 +3451,7 @@ XGradient::XGradient() :
/*************************************************************************
|*
|* XGradient::XGradient(XGradientStyle, const Color&, const Color&,
-|* long, USHORT, USHORT, USHORT)
+|* long, sal_uInt16, sal_uInt16, sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 21.11.94
@@ -3460,10 +3460,10 @@ XGradient::XGradient() :
*************************************************************************/
XGradient::XGradient(const Color& rStart, const Color& rEnd,
- XGradientStyle eTheStyle, long nTheAngle, USHORT nXOfs,
- USHORT nYOfs, USHORT nTheBorder,
- USHORT nStartIntens, USHORT nEndIntens,
- USHORT nSteps) :
+ XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
+ sal_uInt16 nYOfs, sal_uInt16 nTheBorder,
+ sal_uInt16 nStartIntens, sal_uInt16 nEndIntens,
+ sal_uInt16 nSteps) :
eStyle(eTheStyle),
aStartColor(rStart),
aEndColor(rEnd),
@@ -3509,7 +3509,7 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillGradientItem::XFillGradientItem(INT32 nIndex,
+|* XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
|* const XGradient& rTheGradient)
|*
|* Beschreibung
@@ -3518,7 +3518,7 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
|*
*************************************************************************/
-XFillGradientItem::XFillGradientItem(INT32 nIndex,
+XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
const XGradient& rTheGradient) :
NameOrIndex(XATTR_FILLGRADIENT, nIndex),
aGradient(rTheGradient)
@@ -3569,31 +3569,31 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) :
|*
*************************************************************************/
-XFillGradientItem::XFillGradientItem(SvStream& rIn, USHORT nVer) :
+XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
NameOrIndex(XATTR_FILLGRADIENT, rIn),
aGradient(COL_BLACK, COL_WHITE)
{
if (!IsIndex())
{
- USHORT nUSTemp;
- USHORT nRed;
- USHORT nGreen;
- USHORT nBlue;
- INT16 nITemp;
- INT32 nLTemp;
+ sal_uInt16 nUSTemp;
+ sal_uInt16 nRed;
+ sal_uInt16 nGreen;
+ sal_uInt16 nBlue;
+ sal_Int16 nITemp;
+ sal_Int32 nLTemp;
rIn >> nITemp; aGradient.SetGradientStyle((XGradientStyle)nITemp);
rIn >> nRed;
rIn >> nGreen;
rIn >> nBlue;
Color aCol;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aGradient.SetStartColor( aCol );
rIn >> nRed;
rIn >> nGreen;
rIn >> nBlue;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aGradient.SetEndColor(aCol);
rIn >> nLTemp; aGradient.SetAngle(nLTemp);
rIn >> nUSTemp; aGradient.SetBorder(nUSTemp);
@@ -3659,7 +3659,7 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3667,7 +3667,7 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
{
return new XFillGradientItem(rIn, nVer);
}
@@ -3682,15 +3682,15 @@ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
|*
*************************************************************************/
-SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16)aGradient.GetGradientStyle();
+ rOut << (sal_Int16)aGradient.GetGradientStyle();
- USHORT nTmp;
+ sal_uInt16 nTmp;
nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp;
@@ -3699,7 +3699,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp;
- rOut << (INT32) aGradient.GetAngle();
+ rOut << (sal_Int32) aGradient.GetAngle();
rOut << aGradient.GetBorder();
rOut << aGradient.GetXOffset();
rOut << aGradient.GetYOffset();
@@ -3733,7 +3733,7 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
/*************************************************************************
|*
-|* USHORT XFillGradientItem::GetVersion() const
+|* sal_uInt16 XFillGradientItem::GetVersion() const
|*
|* Beschreibung
|* Ersterstellung 01.11.95
@@ -3741,7 +3741,7 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
|*
*************************************************************************/
-USHORT XFillGradientItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
// !!! this version number also represents the version number of superclasses
// !!! (e.g. XFillFloatTransparenceItem); if you make any changes here,
@@ -3774,7 +3774,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation
}
// -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
//sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3788,8 +3788,8 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
const XGradient& aXGradient = GetGradientValue();
aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
- aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
- aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+ aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+ aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
aGradient2.Border = aXGradient.GetBorder();
aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3814,8 +3814,8 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
::com::sun::star::awt::Gradient aGradient2;
aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
- aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
- aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+ aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+ aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
aGradient2.Border = aXGradient.GetBorder();
aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3854,7 +3854,7 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
}
// -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3998,7 +3998,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
return sal_True;
}
-BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue();
}
@@ -4034,14 +4034,14 @@ TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
// -----------------------------------------------------------------------------
XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
- bEnabled( FALSE )
+ bEnabled( sal_False )
{
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( nIndex, rGradient ),
bEnabled ( bEnable )
{
@@ -4050,7 +4050,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGra
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( rName, rGradient ),
bEnabled ( bEnable )
{
@@ -4068,7 +4068,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
//------------------------------------------------------------------------
-//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, USHORT nVer ) :
+//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, sal_uInt16 nVer ) :
// XFillGradientItem ( rIn, nVer )
//{
// SetWhich( XATTR_FILLFLOATTRANSPARENCE );
@@ -4077,7 +4077,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
//*************************************************************************
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, BOOL bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
: XFillGradientItem ( -1, rTheGradient ),
bEnabled ( bEnable )
{
@@ -4109,14 +4109,14 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
//------------------------------------------------------------------------
-//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
+//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
//{
// return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem( rIn, nVer ) );
//}
//------------------------------------------------------------------------
-//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
//{
// XFillGradientItem::Store( rOut, nItemVersion );
// rOut << bEnabled;
@@ -4125,7 +4125,7 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
//------------------------------------------------------------------------
-USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
+sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
{
// !!! if version number of this object must be increased, please !!!
// !!! increase version number of base class XFillGradientItem !!!
@@ -4134,14 +4134,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
//------------------------------------------------------------------------
-sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
return XFillGradientItem::QueryValue( rVal, nMemberId );
}
//------------------------------------------------------------------------
-sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
return XFillGradientItem::PutValue( rVal, nMemberId );
}
@@ -4156,7 +4156,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPrese
return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
}
-BOOL XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() &&
((XFillFloatTransparenceItem*)p1)->GetGradientValue() == ((XFillFloatTransparenceItem*)p2)->GetGradientValue();
@@ -4180,7 +4180,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// if the given name is not valid, replace it!
if( aUniqueName != GetName() )
{
- return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), TRUE );
+ return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True );
}
}
}
@@ -4189,7 +4189,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// #85953# if disabled, force name to empty string
if(GetName().Len())
{
- return new XFillFloatTransparenceItem(String(), GetGradientValue(), FALSE);
+ return new XFillFloatTransparenceItem(String(), GetGradientValue(), sal_False);
}
}
@@ -4245,7 +4245,7 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillHatchItem::XFillHatchItem(INT32 nIndex,
+|* XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
|* const XHatch& rTheHatch)
|*
|* Beschreibung
@@ -4254,7 +4254,7 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
|*
*************************************************************************/
-XFillHatchItem::XFillHatchItem(INT32 nIndex,
+XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
const XHatch& rTheHatch) :
NameOrIndex(XATTR_FILLHATCH, nIndex),
aHatch(rTheHatch)
@@ -4311,11 +4311,11 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
{
if (!IsIndex())
{
- USHORT nRed;
- USHORT nGreen;
- USHORT nBlue;
- INT16 nITemp;
- INT32 nLTemp;
+ sal_uInt16 nRed;
+ sal_uInt16 nGreen;
+ sal_uInt16 nBlue;
+ sal_Int16 nITemp;
+ sal_Int32 nLTemp;
rIn >> nITemp; aHatch.SetHatchStyle((XHatchStyle)nITemp);
rIn >> nRed;
@@ -4323,7 +4323,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
rIn >> nBlue;
Color aCol;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aHatch.SetColor(aCol);
rIn >> nLTemp; aHatch.SetDistance(nLTemp);
rIn >> nLTemp; aHatch.SetAngle(nLTemp);
@@ -4378,7 +4378,7 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -4386,7 +4386,7 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillHatchItem(rIn);
}
@@ -4401,21 +4401,21 @@ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XFillHatchItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16)aHatch.GetHatchStyle();
+ rOut << (sal_Int16)aHatch.GetHatchStyle();
- USHORT nTmp;
+ sal_uInt16 nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp;
- rOut << (INT32) aHatch.GetDistance();
- rOut << (INT32) aHatch.GetAngle();
+ rOut << (sal_Int32) aHatch.GetDistance();
+ rOut << (sal_Int32) aHatch.GetAngle();
}
return rOut;
@@ -4465,21 +4465,21 @@ SfxItemPresentation XFillHatchItem::GetPresentation
//------------------------------------------------------------------------
-FASTBOOL XFillHatchItem::HasMetrics() const
+int XFillHatchItem::HasMetrics() const
{
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
-FASTBOOL XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
+int XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
{
aHatch.SetDistance( ScaleMetricValue( aHatch.GetDistance(), nMul, nDiv ) );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -4543,7 +4543,7 @@ sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
}
// -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -4639,7 +4639,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
return sal_True;
}
-BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue();
}
@@ -4686,7 +4686,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem);
*************************************************************************/
XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) :
- SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< USHORT >(eTheStyle))
+ SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle))
{
}
@@ -4722,7 +4722,7 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -4730,7 +4730,7 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStyleItem(rIn);
}
@@ -4741,7 +4741,7 @@ SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextStyleItem::GetValueCount() const
+sal_uInt16 XFormTextStyleItem::GetValueCount() const
{
return 5;
}
@@ -4753,7 +4753,7 @@ USHORT XFormTextStyleItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -4766,11 +4766,11 @@ sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) con
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -4791,7 +4791,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem);
*************************************************************************/
XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) :
- SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< USHORT >(eTheAdjust))
+ SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust))
{
}
@@ -4827,7 +4827,7 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -4835,7 +4835,7 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextAdjustItem(rIn);
}
@@ -4846,7 +4846,7 @@ SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextAdjustItem::GetValueCount() const
+sal_uInt16 XFormTextAdjustItem::GetValueCount() const
{
return 4;
}
@@ -4858,7 +4858,7 @@ USHORT XFormTextAdjustItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -4871,11 +4871,11 @@ sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -4932,7 +4932,7 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -4940,7 +4940,7 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextDistanceItem(rIn);
}
@@ -4997,7 +4997,7 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -5005,7 +5005,7 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStartItem(rIn);
}
@@ -5017,14 +5017,14 @@ TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
/*************************************************************************
|*
-|* XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror)
+|* XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror)
|*
|* Ersterstellung 06.02.95 ESO
|* Letzte Aenderung 06.02.95 ESO
|*
*************************************************************************/
-XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror) :
+XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) :
SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
{
}
@@ -5059,7 +5059,7 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Ersterstellung 06.02.95 ESO
@@ -5067,7 +5067,7 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextMirrorItem(rIn);
}
@@ -5087,7 +5087,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
|*
*************************************************************************/
-XFormTextOutlineItem::XFormTextOutlineItem(BOOL bOutline) :
+XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) :
SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
{
}
@@ -5122,7 +5122,7 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Ersterstellung 27.06.95 ESO
@@ -5130,7 +5130,7 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextOutlineItem(rIn);
}
@@ -5152,7 +5152,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem);
XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) :
SfxEnumItem(
- XATTR_FORMTXTSHADOW, sal::static_int_cast< USHORT >(eFormTextShadow))
+ XATTR_FORMTXTSHADOW, sal::static_int_cast< sal_uInt16 >(eFormTextShadow))
{
}
@@ -5188,7 +5188,7 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 27.06.95
@@ -5196,7 +5196,7 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowItem(rIn);
}
@@ -5208,7 +5208,7 @@ SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextShadowItem::GetValueCount() const
+sal_uInt16 XFormTextShadowItem::GetValueCount() const
{
return 3;
}
@@ -5220,7 +5220,7 @@ USHORT XFormTextShadowItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -5233,11 +5233,11 @@ sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -5257,7 +5257,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
|*
*************************************************************************/
-XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex,
+XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex,
const Color& rTheColor) :
XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
{
@@ -5311,7 +5311,7 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 27.06.95
@@ -5319,7 +5319,7 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowColorItem(rIn);
}
@@ -5376,7 +5376,7 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 28.06.95 ESO
@@ -5384,7 +5384,7 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowXValItem(rIn);
}
@@ -5441,7 +5441,7 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 28.06.95 ESO
@@ -5449,7 +5449,7 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowYValItem(rIn);
}
@@ -5471,7 +5471,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem);
XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) :
SfxEnumItem(
- XATTR_FORMTXTSTDFORM, sal::static_int_cast< USHORT >(eFormTextStdForm))
+ XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm))
{
}
@@ -5507,7 +5507,7 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 27.06.95
@@ -5515,7 +5515,7 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStdFormItem(rIn);
}
@@ -5527,7 +5527,7 @@ SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextStdFormItem::GetValueCount() const
+sal_uInt16 XFormTextStdFormItem::GetValueCount() const
{
return 3;
}
@@ -5539,7 +5539,7 @@ USHORT XFormTextStdFormItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -5552,11 +5552,11 @@ sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -5575,7 +5575,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
|*
*************************************************************************/
-XFormTextHideFormItem::XFormTextHideFormItem(BOOL bHide) :
+XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) :
SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
{
}
@@ -5610,7 +5610,7 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Ersterstellung 27.06.95 ESO
@@ -5618,7 +5618,7 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextHideFormItem(rIn);
}
@@ -5682,7 +5682,7 @@ SfxPoolItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const
|*
\************************************************************************/
-SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
{
SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
XATTR_LINE_FIRST, XATTR_LINE_LAST);
@@ -5696,7 +5696,7 @@ SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
|*
\************************************************************************/
-SvStream& XLineAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
{
return SfxSetItem::Store( rStream, nItemVersion );
}
@@ -5755,7 +5755,7 @@ SfxPoolItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const
|*
\************************************************************************/
-SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
{
SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
XATTR_FILL_FIRST, XATTR_FILL_LAST);
@@ -5769,7 +5769,7 @@ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
|*
\************************************************************************/
-SvStream& XFillAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
{
return SfxSetItem::Store( rStream, nItemVersion );
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 0c8fc3e9cbec..f48a51f22e73 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -52,7 +52,7 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XLineTransparenceItem::XLineTransparenceItem(USHORT)
+|* XLineTransparenceItem::XLineTransparenceItem(sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -60,7 +60,7 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
|*
*************************************************************************/
-XLineTransparenceItem::XLineTransparenceItem(USHORT nLineTransparence) :
+XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence)
{
}
@@ -97,7 +97,7 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -105,7 +105,7 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineTransparenceItem(rIn);
}
@@ -130,7 +130,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
rText.AppendAscii(": ");
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue()) );
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) );
rText += sal_Unicode('%');
return ePres;
default:
@@ -147,7 +147,7 @@ TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem);
// -----------------------------------------------------------------------------
XLineJointItem::XLineJointItem( XLineJoint eLineJoint ) :
- SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< USHORT >(eLineJoint))
+ SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint))
{
}
@@ -160,14 +160,14 @@ XLineJointItem::XLineJointItem( SvStream& rIn ) :
// -----------------------------------------------------------------------------
-USHORT XLineJointItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XLineJointItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
return 1;
}
// -----------------------------------------------------------------------------
-SfxPoolItem* XLineJointItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
{
XLineJointItem* pRet = new XLineJointItem( rIn );
@@ -198,7 +198,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
case SFX_ITEM_PRESENTATION_COMPLETE:
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
switch( GetValue() )
{
@@ -238,7 +238,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
// -----------------------------------------------------------------------------
-sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
@@ -268,7 +268,7 @@ sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
// -----------------------------------------------------------------------------
-BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
XLineJoint eJoint = XLINEJOINT_NONE;
::com::sun::star::drawing::LineJoint eUnoJoint;
@@ -300,14 +300,14 @@ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
break;
}
- SetValue( sal::static_int_cast< USHORT >( eJoint ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eJoint ) );
return sal_True;
}
// -----------------------------------------------------------------------------
-USHORT XLineJointItem::GetValueCount() const
+sal_uInt16 XLineJointItem::GetValueCount() const
{
// don't forget to update the api interface also
return 5;
@@ -320,7 +320,7 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XFillTransparenceItem::XFillTransparenceItem(USHORT)
+|* XFillTransparenceItem::XFillTransparenceItem(sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -328,7 +328,7 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
|*
*************************************************************************/
-XFillTransparenceItem::XFillTransparenceItem(USHORT nFillTransparence) :
+XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) :
SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence)
{
}
@@ -365,7 +365,7 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -373,7 +373,7 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillTransparenceItem(rIn);
}
@@ -398,7 +398,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
rText.AppendAscii(": ");
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
rText += sal_Unicode('%');
return ePres;
default:
@@ -413,7 +413,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT)
+|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 09.11.95 KA
@@ -421,7 +421,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
|*
*************************************************************************/
-XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT nShdwTransparence) :
+XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) :
SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence)
{
}
@@ -458,7 +458,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 09.11.95 KA
@@ -466,7 +466,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowTranspItem(rIn);
}
@@ -479,7 +479,7 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XGradientStepCountItem::XGradientStepCountItem( USHORT )
+|* XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 )
|*
|* Beschreibung
|* Ersterstellung 23.01.96 KA
@@ -487,7 +487,7 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
|*
*************************************************************************/
-XGradientStepCountItem::XGradientStepCountItem( USHORT nStepCount ) :
+XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) :
SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount )
{
}
@@ -524,7 +524,7 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 23.01.96 KA
@@ -532,7 +532,7 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XGradientStepCountItem( rIn );
}
@@ -557,7 +557,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
// rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
// rText += ": ";
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
@@ -580,7 +580,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
|*
*************************************************************************/
-XFillBmpTileItem::XFillBmpTileItem( BOOL bTile ) :
+XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) :
SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
{
}
@@ -628,7 +628,7 @@ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileItem( rIn );
}
@@ -683,7 +683,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem );
*************************************************************************/
XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) :
- SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< USHORT >( eRP ) )
+ SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) )
{
}
@@ -730,7 +730,7 @@ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosItem( rIn );
}
@@ -774,7 +774,7 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation
|*
\******************************************************************************/
-USHORT XFillBmpPosItem::GetValueCount() const
+sal_uInt16 XFillBmpPosItem::GetValueCount() const
{
return 9;
}
@@ -843,7 +843,7 @@ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeXItem( rIn );
}
@@ -890,7 +890,7 @@ SfxItemPresentation XFillBmpSizeXItem::GetPresentation
|*
\*************************************************************************/
-FASTBOOL XFillBmpSizeXItem::HasMetrics() const
+int XFillBmpSizeXItem::HasMetrics() const
{
return GetValue() > 0L;
}
@@ -959,7 +959,7 @@ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeYItem( rIn );
}
@@ -1006,7 +1006,7 @@ SfxItemPresentation XFillBmpSizeYItem::GetPresentation
|*
\*************************************************************************/
-FASTBOOL XFillBmpSizeYItem::HasMetrics() const
+int XFillBmpSizeYItem::HasMetrics() const
{
return GetValue() > 0L;
}
@@ -1027,7 +1027,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
|*
*************************************************************************/
-XFillBmpSizeLogItem::XFillBmpSizeLogItem( BOOL bLog ) :
+XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) :
SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
{
}
@@ -1075,7 +1075,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeLogItem( rIn );
}
@@ -1129,7 +1129,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( USHORT nOffX ) :
+XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX )
{
}
@@ -1177,7 +1177,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileOffsetXItem( rIn );
}
@@ -1231,7 +1231,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( USHORT nOffY ) :
+XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY )
{
}
@@ -1279,7 +1279,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileOffsetYItem( rIn );
}
@@ -1333,7 +1333,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
|*
*************************************************************************/
-XFillBmpStretchItem::XFillBmpStretchItem( BOOL bStretch ) :
+XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) :
SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
{
}
@@ -1381,7 +1381,7 @@ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpStretchItem( rIn );
}
@@ -1435,7 +1435,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( USHORT nOffPosX ) :
+XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX )
{
}
@@ -1483,7 +1483,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosOffsetXItem( rIn );
}
@@ -1537,7 +1537,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( USHORT nOffPosY ) :
+XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY )
{
}
@@ -1585,7 +1585,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosOffsetYItem( rIn );
}
@@ -1630,7 +1630,7 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
/*************************************************************************
|*
-|* XFillBackgroundItem::XFillBackgroundItem( BOOL )
+|* XFillBackgroundItem::XFillBackgroundItem( sal_Bool )
|*
|* Beschreibung
|* Ersterstellung 19.11.96 KA
@@ -1638,7 +1638,7 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
|*
*************************************************************************/
-XFillBackgroundItem::XFillBackgroundItem( BOOL bFill ) :
+XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) :
SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
{
}
@@ -1675,7 +1675,7 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 23.01.96 KA
@@ -1683,7 +1683,7 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBackgroundItem( rIn );
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 57c894e00475..874cb35d3e30 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -70,7 +70,7 @@ XOBitmap::XOBitmap() :
eType ( XBITMAP_NONE ),
eStyle ( XBITMAP_STRETCH ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
@@ -89,7 +89,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) :
eStyle ( eInStyle ),
aGraphicObject ( rBmp ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
@@ -108,13 +108,13 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
eStyle ( eInStyle ),
aGraphicObject ( rGraphicObject ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
/*************************************************************************
|*
-|* XOBitmap::XOBitmap( USHORT* pArray, const Color& aPixelColor,
+|* XOBitmap::XOBitmap( sal_uInt16* pArray, const Color& aPixelColor,
|* const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
|* XBitmapStyle eStyle = XBITMAP_TILE )
|*
@@ -124,7 +124,7 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
|*
*************************************************************************/
-XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
+XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor,
const Color& rBckgrColor, const Size& rSize,
XBitmapStyle eInStyle ) :
eStyle ( eInStyle ),
@@ -132,15 +132,15 @@ XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
aArraySize ( rSize ),
aPixelColor ( rPixelColor ),
aBckgrColor ( rBckgrColor ),
- bGraphicDirty ( TRUE )
+ bGraphicDirty ( sal_True )
{
if( aArraySize.Width() == 8 && aArraySize.Height() == 8 )
{
eType = XBITMAP_8X8;
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( pArray + i );
}
else
@@ -174,9 +174,9 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
{
if( eType == XBITMAP_8X8 )
{
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
}
}
@@ -222,9 +222,9 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
{
if( eType == XBITMAP_8X8 )
{
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
}
}
@@ -251,24 +251,24 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
aBckgrColor != rXOBitmap.aBckgrColor ||
bGraphicDirty != rXOBitmap.bGraphicDirty )
{
- return( FALSE );
+ return( sal_False );
}
if( pPixelArray && rXOBitmap.pPixelArray )
{
- USHORT nCount = (USHORT) ( aArraySize.Width() * aArraySize.Height() );
- for( USHORT i = 0; i < nCount; i++ )
+ sal_uInt16 nCount = (sal_uInt16) ( aArraySize.Width() * aArraySize.Height() );
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) )
- return( FALSE );
+ return( sal_False );
}
}
- return( TRUE );
+ return( sal_True );
}
/*************************************************************************
|*
-|* void SetPixelArray( const USHORT* pArray )
+|* void SetPixelArray( const sal_uInt16* pArray )
|*
|* Beschreibung
|* Ersterstellung 27.07.95
@@ -276,19 +276,19 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
|*
*************************************************************************/
-void XOBitmap::SetPixelArray( const USHORT* pArray )
+void XOBitmap::SetPixelArray( const sal_uInt16* pArray )
{
if( eType == XBITMAP_8X8 )
{
if( pPixelArray )
delete []pPixelArray;
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( pArray + i );
- bGraphicDirty = TRUE;
+ bGraphicDirty = sal_True;
}
else
{
@@ -343,12 +343,12 @@ const GraphicObject& XOBitmap::GetGraphicObject() const
void XOBitmap::Bitmap2Array()
{
VirtualDevice aVD;
- BOOL bPixelColor = FALSE;
+ sal_Bool bPixelColor = sal_False;
const Bitmap aBitmap( GetBitmap() );
- const USHORT nLines = 8; // von Type abhaengig
+ const sal_uInt16 nLines = 8; // von Type abhaengig
if( !pPixelArray )
- pPixelArray = new USHORT[ nLines * nLines ];
+ pPixelArray = new sal_uInt16[ nLines * nLines ];
aVD.SetOutputSizePixel( aBitmap.GetSizePixel() );
aVD.DrawBitmap( Point(), aBitmap );
@@ -356,9 +356,9 @@ void XOBitmap::Bitmap2Array()
// Aufbau des Arrays und Ermittlung der Vorder-, bzw.
// Hintergrundfarbe
- for( USHORT i = 0; i < nLines; i++ )
+ for( sal_uInt16 i = 0; i < nLines; i++ )
{
- for( USHORT j = 0; j < nLines; j++ )
+ for( sal_uInt16 j = 0; j < nLines; j++ )
{
if ( aVD.GetPixel( Point( j, i ) ) == aBckgrColor )
*( pPixelArray + j + i * nLines ) = 0;
@@ -368,7 +368,7 @@ void XOBitmap::Bitmap2Array()
if( !bPixelColor )
{
aPixelColor = aVD.GetPixel( Point( j, i ) );
- bPixelColor = TRUE;
+ bPixelColor = sal_True;
}
}
}
@@ -389,7 +389,7 @@ void XOBitmap::Bitmap2Array()
void XOBitmap::Array2Bitmap()
{
VirtualDevice aVD;
- USHORT nLines = 8; // von Type abhaengig
+ sal_uInt16 nLines = 8; // von Type abhaengig
if( !pPixelArray )
return;
@@ -397,9 +397,9 @@ void XOBitmap::Array2Bitmap()
aVD.SetOutputSizePixel( Size( nLines, nLines ) );
// Aufbau der Bitmap
- for( USHORT i = 0; i < nLines; i++ )
+ for( sal_uInt16 i = 0; i < nLines; i++ )
{
- for( USHORT j = 0; j < nLines; j++ )
+ for( sal_uInt16 j = 0; j < nLines; j++ )
{
if( *( pPixelArray + j + i * nLines ) == 0 )
aVD.DrawPixel( Point( j, i ), aBckgrColor );
@@ -409,7 +409,7 @@ void XOBitmap::Array2Bitmap()
}
aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) );
- bGraphicDirty = FALSE;
+ bGraphicDirty = sal_False;
}
// -----------------------
@@ -479,7 +479,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) :
|*
*************************************************************************/
-XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
+XFillBitmapItem::XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer ) :
NameOrIndex( XATTR_FILLBITMAP, rIn )
{
if( nVer == 0 )
@@ -508,7 +508,7 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
{
if (!IsIndex())
{
- INT16 iTmp;
+ sal_Int16 iTmp;
rIn >> iTmp;
aXOBitmap.SetBitmapStyle( (XBitmapStyle) iTmp );
rIn >> iTmp;
@@ -522,10 +522,10 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
}
else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
{
- USHORT* pArray = new USHORT[ 64 ];
+ sal_uInt16* pArray = new sal_uInt16[ 64 ];
Color aColor;
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
rIn >> *( pArray + i );
aXOBitmap.SetPixelArray( pArray );
@@ -591,7 +591,7 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 17.11.94
@@ -599,7 +599,7 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
{
return new XFillBitmapItem( rIn, nVer );
}
@@ -614,22 +614,22 @@ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
|*
*************************************************************************/
-SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16) aXOBitmap.GetBitmapStyle();
+ rOut << (sal_Int16) aXOBitmap.GetBitmapStyle();
if( !aXOBitmap.GetBitmap() )
- rOut << (INT16) XBITMAP_NONE;
+ rOut << (sal_Int16) XBITMAP_NONE;
else
{
- rOut << (INT16) aXOBitmap.GetBitmapType();
+ rOut << (sal_Int16) aXOBitmap.GetBitmapType();
if( aXOBitmap.GetBitmapType() == XBITMAP_IMPORT )
{
- const USHORT nOldComprMode = rOut.GetCompressMode();
- USHORT nNewComprMode = nOldComprMode;
+ const sal_uInt16 nOldComprMode = rOut.GetCompressMode();
+ sal_uInt16 nNewComprMode = nOldComprMode;
if( rOut.GetVersion() >= SOFFICE_FILEFORMAT_50 )
nNewComprMode |= COMPRESSMODE_ZBITMAP;
@@ -642,9 +642,9 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
}
else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
{
- USHORT* pArray = aXOBitmap.GetPixelArray();
- for( USHORT i = 0; i < 64; i++ )
- rOut << (USHORT) *( pArray + i );
+ sal_uInt16* pArray = aXOBitmap.GetPixelArray();
+ for( sal_uInt16 i = 0; i < 64; i++ )
+ rOut << (sal_uInt16) *( pArray + i );
rOut << aXOBitmap.GetPixelColor();
rOut << aXOBitmap.GetBackgroundColor();
@@ -676,7 +676,7 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
/*************************************************************************
|*
-|* USHORT XFillBitmapItem::GetVersion() const
+|* sal_uInt16 XFillBitmapItem::GetVersion() const
|*
|* Beschreibung
|* Ersterstellung 26.07.95
@@ -684,7 +684,7 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
|*
*************************************************************************/
-USHORT XFillBitmapItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillBitmapItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
// 2. Version
return( 1 );
@@ -716,7 +716,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -782,7 +782,7 @@ sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMe
//------------------------------------------------------------------------
-sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -865,7 +865,7 @@ sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
return (bSetName || bSetURL || bSetBitmap);
}
-BOOL XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillBitmapItem*)p1)->GetBitmapValue().GetGraphicObject().GetUniqueID() ==
((XFillBitmapItem*)p2)->GetBitmapValue().GetGraphicObject().GetUniqueID();
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 8b658918069a..052bc4c8d25a 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -88,7 +88,7 @@ XFillExchangeData::~XFillExchangeData()
|*
|*
*************************************************************************/
-ULONG XFillExchangeData::RegisterClipboardFormatName()
+sal_uIntPtr XFillExchangeData::RegisterClipboardFormatName()
{
return( SOT_FORMATSTR_ID_XFA );
}
@@ -104,7 +104,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
if( rData.pXFillAttrSetItem )
{
SfxWhichIter aIter( rData.pXFillAttrSetItem->GetItemSet() );
- USHORT nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
const SfxPoolItem* pItem;
sal_uInt32 nItemCount = 0;
sal_Size nFirstPos = rOStm.Tell();
@@ -113,10 +113,10 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
while( nWhich )
{
- if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, sal_False, &pItem ) )
{
VersionCompat aCompat( rOStm, STREAM_WRITE );
- const USHORT nItemVersion2 = pItem->GetVersion( (USHORT) rOStm.GetVersion() );
+ const sal_uInt16 nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() );
rOStm << nWhich << nItemVersion2;
pItem->Store( rOStm, nItemVersion2 );
@@ -127,7 +127,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
nWhich = aIter.NextWhich();
}
- const ULONG nLastPos = rOStm.Tell();
+ const sal_uIntPtr nLastPos = rOStm.Tell();
rOStm.Seek( nFirstPos );
rOStm << nItemCount;
rOStm.Seek( nLastPos );
@@ -150,7 +150,7 @@ SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData )
SfxItemSet* pSet = new SfxItemSet ( *rData.pPool, XATTR_FILL_FIRST, XATTR_FILL_LAST );
SfxPoolItem* pNewItem;
sal_uInt32 nItemCount = 0;
- USHORT nWhich, nItemVersion;
+ sal_uInt16 nWhich, nItemVersion;
rIStm >> nItemCount;
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index d61c339f762d..07a1e5bf3ad9 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -72,7 +72,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
XBitmapTable::XBitmapTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -107,35 +107,35 @@ XBitmapEntry* XBitmapTable::GetBitmap(long nIndex) const
/************************************************************************/
-BOOL XBitmapTable::Load()
+sal_Bool XBitmapTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::Save()
+sal_Bool XBitmapTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::Create()
+sal_Bool XBitmapTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::CreateBitmapsForUI()
+sal_Bool XBitmapTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -152,7 +152,7 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
XBitmapList::XBitmapList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyList( rPath, pInPool, nInitSize, nReSize)
{
// pBmpList = new List( nInitSize, nReSize );
@@ -187,18 +187,18 @@ XBitmapEntry* XBitmapList::GetBitmap(long nIndex) const
/************************************************************************/
-BOOL XBitmapList::Load()
+sal_Bool XBitmapList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -209,19 +209,19 @@ BOOL XBitmapList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXBitmapTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapList::Save()
+sal_Bool XBitmapList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -236,7 +236,7 @@ BOOL XBitmapList::Save()
/************************************************************************/
// Umgestellt am 27.07.95 auf XBitmap
-BOOL XBitmapList::Create()
+sal_Bool XBitmapList::Create()
{
// Array der Bitmap
//-----------------------
@@ -252,7 +252,7 @@ BOOL XBitmapList::Create()
String aStr( SVX_RES( RID_SVXSTR_BITMAP ) );
Color aColWhite( RGB_Color( COL_WHITE ) );
xub_StrLen nLen;
- USHORT aArray[64];
+ sal_uInt16 aArray[64];
memset( aArray, 0, sizeof( aArray ) );
aStr.AppendAscii(" 1");
@@ -274,19 +274,19 @@ BOOL XBitmapList::Create()
aStr.SetChar(nLen, sal_Unicode('4'));
Insert( new XBitmapEntry( XOBitmap( aArray, RGB_Color( COL_LIGHTBLUE ), aColWhite ), aStr ) );
- return( TRUE );
+ return( sal_True );
}
/************************************************************************/
-BOOL XBitmapList::CreateBitmapsForUI()
+sal_Bool XBitmapList::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 2b3ac7ab850b..7411904b6303 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -73,7 +73,7 @@ static XColorTable* pTable=0;
XColorTable::XColorTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
// ColorTable braucht keine eigene BmpTable
@@ -116,18 +116,18 @@ XColorEntry* XColorTable::GetColor(long nIndex) const
/************************************************************************/
-BOOL XColorTable::Load()
+sal_Bool XColorTable::Load()
{
if( bTableDirty )
{
- bTableDirty = FALSE;
+ bTableDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -138,19 +138,19 @@ BOOL XColorTable::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorTable::Save()
+sal_Bool XColorTable::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -164,13 +164,13 @@ BOOL XColorTable::Save()
/************************************************************************/
-BOOL XColorTable::Create()
+sal_Bool XColorTable::Create()
{
XubString aStr;
xub_StrLen nLen;
ResMgr& rRes = DIALOG_MGR();
- static USHORT __READONLY_DATA aResId[] =
+ static sal_uInt16 __READONLY_DATA aResId[] =
{
RID_SVXSTR_BLACK,
RID_SVXSTR_BLUE,
@@ -219,7 +219,7 @@ BOOL XColorTable::Create()
COL_WHITE
};
- for( USHORT n = 0; n < 16; ++n )
+ for( sal_uInt16 n = 0; n < 16; ++n )
{
Insert( n, new XColorEntry( Color( aColTab[n] ),
String( ResId( aResId[ n ], rRes )) ) );
@@ -453,14 +453,14 @@ BOOL XColorTable::Create()
/************************************************************************/
-BOOL XColorTable::CreateBitmapsForUI()
+sal_Bool XColorTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -477,7 +477,7 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
XColorList::XColorList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyList( rPath, pInPool, nInitSize, nReSize)
{
// pBmpList = new List( nInitSize, nReSize );
@@ -512,35 +512,35 @@ XColorEntry* XColorList::GetColor(long nIndex) const
/************************************************************************/
-BOOL XColorList::Load()
+sal_Bool XColorList::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::Save()
+sal_Bool XColorList::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::Create()
+sal_Bool XColorList::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::CreateBitmapsForUI()
+sal_Bool XColorList::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 3455ed4d3588..dd6bf8f17d19 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -86,7 +86,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XDashTable::XDashTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -121,35 +121,35 @@ XDashEntry* XDashTable::GetDash(long nIndex) const
/************************************************************************/
-BOOL XDashTable::Load()
+sal_Bool XDashTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::Save()
+sal_Bool XDashTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::Create()
+sal_Bool XDashTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::CreateBitmapsForUI()
+sal_Bool XDashTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -268,18 +268,18 @@ XDashEntry* XDashList::GetDash(long nIndex) const
return (XDashEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XDashList::Load()
+sal_Bool XDashList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -290,17 +290,17 @@ BOOL XDashList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXDashTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XDashList::Save()
+sal_Bool XDashList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -312,7 +312,7 @@ BOOL XDashList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XDashList::Create()
+sal_Bool XDashList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) );
xub_StrLen nLen;
@@ -325,16 +325,16 @@ BOOL XDashList::Create()
aStr.SetChar(nLen, sal_Unicode('3'));
Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XDashList::CreateBitmapsForUI()
+sal_Bool XDashList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -343,10 +343,10 @@ BOOL XDashList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XDashList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 3a9f24c6d15a..02b35fb27f33 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -83,7 +83,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XGradientTable::XGradientTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -118,35 +118,35 @@ XGradientEntry* XGradientTable::GetGradient(long nIndex) const
/************************************************************************/
-BOOL XGradientTable::Load()
+sal_Bool XGradientTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Save()
+sal_Bool XGradientTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Create()
+sal_Bool XGradientTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::CreateBitmapsForUI()
+sal_Bool XGradientTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -255,18 +255,18 @@ XGradientEntry* XGradientList::GetGradient(long nIndex) const
return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) );
}
-BOOL XGradientList::Load()
+sal_Bool XGradientList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -278,17 +278,17 @@ BOOL XGradientList::Load()
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XGradientList::Save()
+sal_Bool XGradientList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -300,7 +300,7 @@ BOOL XGradientList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XGradientList::Create()
+sal_Bool XGradientList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
xub_StrLen nLen;
@@ -319,16 +319,16 @@ BOOL XGradientList::Create()
aStr.SetChar(nLen, sal_Unicode('6'));
Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT , 1900,60,60,50,100,100),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XGradientList::CreateBitmapsForUI()
+sal_Bool XGradientList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -337,10 +337,10 @@ BOOL XGradientList::CreateBitmapsForUI()
impDestroy();
- return( FALSE );
+ return( sal_False );
}
-Bitmap* XGradientList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index ef5beece8dc8..b62909fda71a 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -82,7 +82,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XHatchTable::XHatchTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -117,35 +117,35 @@ XHatchEntry* XHatchTable::GetHatch(long nIndex) const
/************************************************************************/
-BOOL XHatchTable::Load()
+sal_Bool XHatchTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::Save()
+sal_Bool XHatchTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::Create()
+sal_Bool XHatchTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::CreateBitmapsForUI()
+sal_Bool XHatchTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -264,18 +264,18 @@ XHatchEntry* XHatchList::GetHatch(long nIndex) const
return (XHatchEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XHatchList::Load()
+sal_Bool XHatchList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -286,17 +286,17 @@ BOOL XHatchList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXHatchTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XHatchList::Save()
+sal_Bool XHatchList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -308,7 +308,7 @@ BOOL XHatchList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XHatchList::Create()
+sal_Bool XHatchList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
xub_StrLen nLen;
@@ -321,16 +321,16 @@ BOOL XHatchList::Create()
aStr.SetChar(nLen, sal_Unicode('3'));
Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120, 0),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XHatchList::CreateBitmapsForUI()
+sal_Bool XHatchList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -339,10 +339,10 @@ BOOL XHatchList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XHatchList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index befbe5696db9..e0e0a1c7aa69 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -57,19 +57,19 @@ Color RGB_Color( ColorData nColorName )
XPropertyTable::XPropertyTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
aName ( pszStandard, 8 ),
aPath ( rPath ),
pXPool ( pInPool ),
aTable ( nInitSize, nReSize ),
pBmpTable ( NULL ),
- bTableDirty ( TRUE ),
- bBitmapsDirty ( TRUE ),
- bOwnPool ( FALSE )
+ bTableDirty ( sal_True ),
+ bBitmapsDirty ( sal_True ),
+ bOwnPool ( sal_False )
{
if( !pXPool )
{
- bOwnPool = TRUE;
+ bOwnPool = sal_True;
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
@@ -96,7 +96,7 @@ XPropertyTable::~XPropertyTable()
{
XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
Bitmap* pBitmap = NULL;
- for (ULONG nIndex = 0; nIndex < aTable.Count(); nIndex++)
+ for (sal_uIntPtr nIndex = 0; nIndex < aTable.Count(); nIndex++)
{
delete pEntry;
pEntry = (XPropertyEntry*)aTable.Next();
@@ -106,7 +106,7 @@ XPropertyTable::~XPropertyTable()
{
pBitmap = (Bitmap*) pBmpTable->First();
- for( ULONG nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
{
delete pBitmap;
pBitmap = (Bitmap*) pBmpTable->Next();
@@ -140,7 +140,7 @@ long XPropertyTable::Count() const
{
if( bTableDirty )
{
- // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+ // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
if( !( (XPropertyTable*) this )->Load() )
( (XPropertyTable*) this )->Create();
}
@@ -153,15 +153,15 @@ long XPropertyTable::Count() const
|*
*************************************************************************/
-XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyTable::Get( long nIndex, sal_uInt16 /*nDummy*/) const
{
if( bTableDirty )
{
- // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+ // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
if( !( (XPropertyTable*) this )->Load() )
( (XPropertyTable*) this )->Create();
}
- return (XPropertyEntry*) aTable.GetObject( (ULONG) nIndex );
+ return (XPropertyEntry*) aTable.GetObject( (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -174,7 +174,7 @@ long XPropertyTable::Get(const XubString& rName)
{
if( bTableDirty )
{
- // bTableDirty = FALSE;
+ // bTableDirty = sal_False;
if( !Load() )
Create();
}
@@ -201,12 +201,12 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
{
if( bBitmapsDirty )
{
- ( (XPropertyTable*) this )->bBitmapsDirty = FALSE;
+ ( (XPropertyTable*) this )->bBitmapsDirty = sal_False;
( (XPropertyTable*) this )->CreateBitmapsForUI();
}
- if( pBmpTable->Count() >= (ULONG) nIndex )
- return (Bitmap*) pBmpTable->GetObject( (ULONG) nIndex );
+ if( pBmpTable->Count() >= (sal_uIntPtr) nIndex )
+ return (Bitmap*) pBmpTable->GetObject( (sal_uIntPtr) nIndex );
}
return( NULL );
}
@@ -217,14 +217,14 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
|*
*************************************************************************/
-BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
+sal_Bool XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
{
- BOOL bReturn = aTable.Insert( (ULONG) nIndex, pEntry );
+ sal_Bool bReturn = aTable.Insert( (sal_uIntPtr) nIndex, pEntry );
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- pBmpTable->Insert( (ULONG) nIndex, pBmp );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ pBmpTable->Insert( (sal_uIntPtr) nIndex, pBmp );
}
return bReturn;
}
@@ -237,12 +237,12 @@ BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (ULONG) nIndex, pEntry );
+ XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (sal_uIntPtr) nIndex, pEntry );
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (ULONG) nIndex, pBmp );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (sal_uIntPtr) nIndex, pBmp );
if( pOldBmp )
delete pOldBmp;
}
@@ -255,15 +255,15 @@ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
|*
*************************************************************************/
-XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/)
{
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (ULONG) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
- return (XPropertyEntry*) aTable.Remove((ULONG)nIndex);
+ return (XPropertyEntry*) aTable.Remove((sal_uIntPtr)nIndex);
}
/************************************************************************/
@@ -289,19 +289,19 @@ void XPropertyTable::SetName( const String& rString )
XPropertyList::XPropertyList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
aName ( pszStandard, 8 ),
aPath ( rPath ),
pXPool ( pInPool ),
aList ( nInitSize, nReSize ),
pBmpList ( NULL ),
- bListDirty ( TRUE ),
- bBitmapsDirty ( TRUE ),
- bOwnPool ( FALSE )
+ bListDirty ( sal_True ),
+ bBitmapsDirty ( sal_True ),
+ bOwnPool ( sal_False )
{
if( !pXPool )
{
- bOwnPool = TRUE;
+ bOwnPool = sal_True;
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
@@ -328,7 +328,7 @@ XPropertyList::~XPropertyList()
{
XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
Bitmap* pBitmap = NULL;
- for( ULONG nIndex = 0; nIndex < aList.Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ )
{
delete pEntry;
pEntry = (XPropertyEntry*)aList.Next();
@@ -338,7 +338,7 @@ XPropertyList::~XPropertyList()
{
pBitmap = (Bitmap*) pBmpList->First();
- for( ULONG nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
{
delete pBitmap;
pBitmap = (Bitmap*) pBmpList->Next();
@@ -372,7 +372,7 @@ long XPropertyList::Count() const
{
if( bListDirty )
{
- // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+ // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
@@ -385,15 +385,15 @@ long XPropertyList::Count() const
|*
*************************************************************************/
-XPropertyEntry* XPropertyList::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const
{
if( bListDirty )
{
- // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+ // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
- return (XPropertyEntry*) aList.GetObject( (ULONG) nIndex );
+ return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -406,7 +406,7 @@ long XPropertyList::Get(const XubString& rName)
{
if( bListDirty )
{
- //bListDirty = FALSE;
+ //bListDirty = sal_False;
if( !Load() )
Create();
}
@@ -433,11 +433,11 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
{
if( bBitmapsDirty )
{
- ( (XPropertyList*) this )->bBitmapsDirty = FALSE;
+ ( (XPropertyList*) this )->bBitmapsDirty = sal_False;
( (XPropertyList*) this )->CreateBitmapsForUI();
}
- if( pBmpList->Count() >= (ULONG) nIndex )
- return (Bitmap*) pBmpList->GetObject( (ULONG) nIndex );
+ if( pBmpList->Count() >= (sal_uIntPtr) nIndex )
+ return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex );
}
return( NULL );
}
@@ -450,13 +450,13 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
{
- aList.Insert( pEntry, (ULONG) nIndex );
+ aList.Insert( pEntry, (sal_uIntPtr) nIndex );
if( pBmpList && !bBitmapsDirty )
{
Bitmap* pBmp = CreateBitmapForUI(
- (ULONG) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
- pBmpList->Insert( pBmp, (ULONG) nIndex );
+ (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
+ pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex );
}
}
@@ -468,12 +468,12 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (ULONG) nIndex );
+ XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex );
if( pBmpList && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (ULONG) nIndex );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
@@ -486,15 +486,15 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
|*
*************************************************************************/
-XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
{
if( pBmpList && !bBitmapsDirty )
{
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (ULONG) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
- return (XPropertyEntry*) aList.Remove( (ULONG) nIndex );
+ return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex );
}
/************************************************************************/
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index ac5dcc739e41..4a984b2a5bfb 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -95,7 +95,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XLineEndTable::XLineEndTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -130,37 +130,37 @@ XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const
/************************************************************************/
-BOOL XLineEndTable::Load()
+sal_Bool XLineEndTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XLineEndTable::Save()
+sal_Bool XLineEndTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XLineEndTable::Create()
+sal_Bool XLineEndTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
/************************************************************************/
-BOOL XLineEndTable::CreateBitmapsForUI()
+sal_Bool XLineEndTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
// --------------------
@@ -277,18 +277,18 @@ XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
return (XLineEndEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XLineEndList::Load()
+sal_Bool XLineEndList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -299,17 +299,17 @@ BOOL XLineEndList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XLineEndList::Save()
+sal_Bool XLineEndList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -321,7 +321,7 @@ BOOL XLineEndList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XLineEndList::Create()
+sal_Bool XLineEndList::Create()
{
basegfx::B2DPolygon aTriangle;
aTriangle.append(basegfx::B2DPoint(10.0, 0.0));
@@ -341,16 +341,16 @@ BOOL XLineEndList::Create()
basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0));
Insert( new XLineEndEntry( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) );
- return( TRUE );
+ return( sal_True );
}
-BOOL XLineEndList::CreateBitmapsForUI()
+sal_Bool XLineEndList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" );
if( pBmp )
@@ -359,10 +359,10 @@ BOOL XLineEndList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
generated by cgit (git 2.34.1) at 2024-08-07 20:23:07 +0000