summaryrefslogtreecommitdiff
path: root/svx/source/gallery2
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/gallery2')
-rw-r--r--svx/source/gallery2/galobj.cxx4
-rw-r--r--svx/source/gallery2/galtheme.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 15810448ba84..b8d11333ac6a 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -173,7 +173,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const
{
static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
- rOut.WriteUInt32( nInventor ).WriteUInt16( 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( (sal_uInt16)GetObjKind() );
+ rOut.WriteUInt32( nInventor ).WriteUInt16( 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( static_cast<sal_uInt16>(GetObjKind()) );
rOut.WriteBool( bIsThumbBmp );
if( bIsThumbBmp )
@@ -353,7 +353,7 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
sal_uInt16 nTmp16;
- rIn.ReadUInt16( nTmp16 ); eSoundType = (GalSoundType) nTmp16;
+ rIn.ReadUInt16( nTmp16 ); eSoundType = static_cast<GalSoundType>(nTmp16);
if( rReadVersion >= 6 )
aTitle = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8);
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 9c6cdf8dfbec..8b63c7ab3b5b 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1337,7 +1337,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
rOStm.WriteBool( bRel );
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8);
- rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( (sal_uInt16)pObj->eObjKind );
+ rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( static_cast<sal_uInt16>(pObj->eObjKind) );
}
// more recently, a 512-byte reserve buffer is written,
@@ -1407,7 +1407,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
rIStm.ReadCharAsBool( bRel );
OString aTempFileName = read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm);
rIStm.ReadUInt32( pObj->nOffset );
- rIStm.ReadUInt16( nTemp ); pObj->eObjKind = (SgaObjKind) nTemp;
+ rIStm.ReadUInt16( nTemp ); pObj->eObjKind = static_cast<SgaObjKind>(nTemp);
aFileName = OStringToOUString(aTempFileName, osl_getThreadTextEncoding());