summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-07 11:53:42 +0200
committerNoel Grandin <noel@peralex.com>2015-01-07 12:53:39 +0200
commit306f04830300c239fd74677bcc61efcb5a4532ea (patch)
tree99e45a78bdf3a7ed307ac87306737e976302b649 /vcl
parentf536699304e951ab2e104118ad36335ee0f1b268 (diff)
fdo#84938: convert COMPRESSMODE_ #defines to 'enum class'
Change-Id: Ica501fc73e7e5f9dbd30dd9da3f337b2dc7e6f02
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/dibtools.cxx2
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/impgraph.cxx6
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 054c070264cd..d226edc23cd9 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1259,7 +1259,7 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess&
}
}
- if((rOStm.GetCompressMode() & COMPRESSMODE_ZBITMAP) && (rOStm.GetVersion() >= SOFFICE_FILEFORMAT_40))
+ if((rOStm.GetCompressMode() & SvStreamCompressFlags::ZBITMAP) && (rOStm.GetVersion() >= SOFFICE_FILEFORMAT_40))
{
aHeader.nCompression = ZCOMPRESS;
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 3a6159ec9313..ac83c6da11a0 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2856,7 +2856,7 @@ SvStream& GDIMetaFile::Read( SvStream& rIStm )
SvStream& GDIMetaFile::Write( SvStream& rOStm )
{
VersionCompat* pCompat;
- const sal_uInt32 nStmCompressMode = rOStm.GetCompressMode();
+ const SvStreamCompressFlags nStmCompressMode = rOStm.GetCompressMode();
SvStreamEndian nOldFormat = rOStm.GetEndian();
rOStm.SetEndian( SvStreamEndian::LITTLE );
@@ -2864,7 +2864,7 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm )
pCompat = new VersionCompat( rOStm, StreamMode::WRITE, 1 );
- rOStm.WriteUInt32( nStmCompressMode );
+ rOStm.WriteUInt32( static_cast<sal_uInt32>(nStmCompressMode) );
WriteMapMode( rOStm, aPrefMapMode );
WritePair( rOStm, aPrefSize );
rOStm.WriteUInt32( GetActionSize() );
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 308d65d667c2..d0b74f4e7f74 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1172,7 +1172,7 @@ bool ImpGraphic::ImplSwapOut()
if( pOStm )
{
pOStm->SetVersion( SOFFICE_FILEFORMAT_50 );
- pOStm->SetCompressMode( COMPRESSMODE_NATIVE );
+ pOStm->SetCompressMode( SvStreamCompressFlags::NATIVE );
if( ( bRet = ImplSwapOut( pOStm.get() ) ) )
{
@@ -1271,7 +1271,7 @@ bool ImpGraphic::ImplSwapIn()
if( pIStm )
{
pIStm->SetVersion( SOFFICE_FILEFORMAT_50 );
- pIStm->SetCompressMode( COMPRESSMODE_NATIVE );
+ pIStm->SetCompressMode( SvStreamCompressFlags::NATIVE );
bRet = ImplSwapIn( pIStm.get() );
pIStm.reset();
@@ -1580,7 +1580,7 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
if( !rImpGraphic.ImplIsSwapOut() )
{
if( ( rOStm.GetVersion() >= SOFFICE_FILEFORMAT_50 ) &&
- ( rOStm.GetCompressMode() & COMPRESSMODE_NATIVE ) &&
+ ( rOStm.GetCompressMode() & SvStreamCompressFlags::NATIVE ) &&
rImpGraphic.mpGfxLink && rImpGraphic.mpGfxLink->IsNative() )
{
VersionCompat* pCompat;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index c87993434880..73344f990bd1 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -162,7 +162,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
sal_uInt32 nZippedFileSize; // sj: we will calculate the filesize of a zipped bitmap
{ // to determine if jpeg compression is useful
SvMemoryStream aTemp;
- aTemp.SetCompressMode( aTemp.GetCompressMode() | COMPRESSMODE_ZBITMAP );
+ aTemp.SetCompressMode( aTemp.GetCompressMode() | SvStreamCompressFlags::ZBITMAP );
aTemp.SetVersion( SOFFICE_FILEFORMAT_40 ); // sj: up from version 40 our bitmap stream operator
WriteDIBBitmapEx(aBitmapEx, aTemp); // is capable of zlib stream compression
aTemp.Seek( STREAM_SEEK_TO_END );