summaryrefslogtreecommitdiff
path: root/svx/source/gallery2/galobj.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/gallery2/galobj.cxx')
-rw-r--r--svx/source/gallery2/galobj.cxx66
1 files changed, 33 insertions, 33 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 39aceac564ad..9ba9cff068a3 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -59,16 +59,16 @@ using namespace ::com::sun::star;
// -------------
SgaObject::SgaObject() :
- bIsValid ( FALSE ),
- bIsThumbBmp ( TRUE )
+ bIsValid ( sal_False ),
+ bIsThumbBmp ( sal_True )
{
}
// ------------------------------------------------------------------------
-BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
+sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( rGraphic.GetType() == GRAPHIC_BITMAP )
{
@@ -104,7 +104,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = TRUE;
+ bRet = sal_True;
}
else
{
@@ -116,7 +116,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
(double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_INTERPOLATE ) )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -137,7 +137,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
if( !aThumbBmp.IsEmpty() )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -148,15 +148,15 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
{
- static const UINT32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
+ static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
- rOut << nInventor << (UINT16) 0x0004 << GetVersion() << (UINT16) GetObjKind();
+ rOut << nInventor << (sal_uInt16) 0x0004 << GetVersion() << (sal_uInt16) GetObjKind();
rOut << bIsThumbBmp;
if( bIsThumbBmp )
{
- const USHORT nOldCompressMode = rOut.GetCompressMode();
- const ULONG nOldVersion = rOut.GetVersion();
+ const sal_uInt16 nOldCompressMode = rOut.GetCompressMode();
+ const sal_uIntPtr nOldVersion = rOut.GetVersion();
rOut.SetCompressMode( COMPRESSMODE_ZBITMAP );
rOut.SetVersion( SOFFICE_FILEFORMAT_50 );
@@ -176,11 +176,11 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
// ------------------------------------------------------------------------
-void SgaObject::ReadData(SvStream& rIn, UINT16& rReadVersion )
+void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
{
ByteString aTmpStr;
- UINT32 nTmp32;
- UINT16 nTmp16;
+ sal_uInt32 nTmp32;
+ sal_uInt16 nTmp16;
rIn >> nTmp32 >> nTmp16 >> rReadVersion >> nTmp16 >> bIsThumbBmp;
@@ -245,7 +245,7 @@ SvStream& operator<<( SvStream& rOut, const SgaObject& rObj )
SvStream& operator>>( SvStream& rIn, SgaObject& rObj )
{
- UINT16 nReadVersion;
+ sal_uInt16 nReadVersion;
rObj.ReadData( rIn, nReadVersion );
rObj.bIsValid = ( rIn.GetError() == ERRCODE_NONE );
@@ -303,7 +303,7 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const
// ------------------------------------------------------------------------
-void SgaObjectBmp::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
ByteString aTmpStr;
@@ -335,10 +335,10 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
{
aURL = rURL;
aThumbBmp = Bitmap( Size( 1, 1 ), 1 );
- bIsValid = TRUE;
+ bIsValid = sal_True;
}
else
- bIsValid = FALSE;
+ bIsValid = sal_False;
}
// ------------------------------------------------------------------------
@@ -351,7 +351,7 @@ SgaObjectSound::~SgaObjectSound()
Bitmap SgaObjectSound::GetThumbBmp() const
{
- USHORT nId;
+ sal_uInt16 nId;
switch( eSoundType )
{
@@ -380,19 +380,19 @@ Bitmap SgaObjectSound::GetThumbBmp() const
void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const
{
SgaObject::WriteData( rOut, rDestDir );
- rOut << (UINT16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
+ rOut << (sal_uInt16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
}
// ------------------------------------------------------------------------
-void SgaObjectSound::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
SgaObject::ReadData( rIn, rReadVersion );
if( rReadVersion >= 5 )
{
ByteString aTmpStr;
- UINT16 nTmp16;
+ sal_uInt16 nTmp16;
rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16;
@@ -504,11 +504,11 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
// ------------------------------------------------------------------------
-BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
{
Graphic aGraphic;
ImageMap aImageMap;
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if ( CreateIMapGraphic( rModel, aGraphic, aImageMap ) )
bRet = SgaObject::CreateThumb( aGraphic );
@@ -537,10 +537,10 @@ BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
// ------------------------------------------------------------------------
-BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
{
const FmFormPage* pPage = static_cast< const FmFormPage* >( rModel.GetPage( 0 ) );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pOut && pPage )
{
@@ -566,11 +566,11 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
aOrigin.Y() += ( ( aDrawSize.Height() - aObjRect.GetHeight() ) >> 1 ) - aObjRect.Top();
aMap.SetOrigin( aOrigin );
- aView.SetPageVisible( FALSE );
- aView.SetBordVisible( FALSE );
- aView.SetGridVisible( FALSE );
- aView.SetHlplVisible( FALSE );
- aView.SetGlueVisible( FALSE );
+ aView.SetPageVisible( sal_False );
+ aView.SetBordVisible( sal_False );
+ aView.SetGridVisible( sal_False );
+ aView.SetHlplVisible( sal_False );
+ aView.SetGlueVisible( sal_False );
pOut->Push();
pOut->SetMapMode( aMap );
@@ -578,7 +578,7 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
aView.CompleteRedraw( pOut, Rectangle( pOut->PixelToLogic( Point() ), pOut->GetOutputSize() ) );
pOut->Pop();
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -595,7 +595,7 @@ void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const
// ------------------------------------------------------------------------
-void SgaObjectSvDraw::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
SgaObject::ReadData( rIn, rReadVersion );
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 05:56:17 +0000