diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-07 11:53:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-07 12:53:39 +0200 |
| commit | 306f04830300c239fd74677bcc61efcb5a4532ea (patch) | |
| tree | 99e45a78bdf3a7ed307ac87306737e976302b649 /svx | |
| parent | f536699304e951ab2e104118ad36335ee0f1b268 (diff) | |
fdo#84938: convert COMPRESSMODE_ #defines to 'enum class'
Change-Id: Ica501fc73e7e5f9dbd30dd9da3f337b2dc7e6f02
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 1 | ||||
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 4fe3e054e6bc..3205a9ca0927 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -178,10 +178,10 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const if( bIsThumbBmp ) { - const sal_uInt16 nOldCompressMode = rOut.GetCompressMode(); - const sal_uIntPtr nOldVersion = rOut.GetVersion(); + const SvStreamCompressFlags nOldCompressMode = rOut.GetCompressMode(); + const sal_uIntPtr nOldVersion = rOut.GetVersion(); - rOut.SetCompressMode( COMPRESSMODE_ZBITMAP ); + rOut.SetCompressMode( SvStreamCompressFlags::ZBITMAP ); rOut.SetVersion( SOFFICE_FILEFORMAT_50 ); WriteDIBBitmapEx(aThumbBmp, rOut); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 84efe695a76e..60aec9453890 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -154,7 +154,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe bPasteResize=false; bNoBitmapCaching=false; bReadOnly=false; - nStreamCompressMode=COMPRESSMODE_NONE; nStreamNumberFormat=SvStreamEndian::BIG; nDefaultTabulator=0; mpNumberFormatter = NULL; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 568d76b0e4f2..07d475a9703b 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -134,7 +134,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { pStm->SetVersion( SOFFICE_FILEFORMAT_8 ); - pStm->SetCompressMode( COMPRESSMODE_ZBITMAP ); + pStm->SetCompressMode( SvStreamCompressFlags::ZBITMAP ); ( (GDIMetaFile&) aGraphic.GetGDIMetaFile() ).Write( *pStm ); bRet = ( pStm->GetError() == 0 ); } @@ -554,7 +554,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { pStream->SetVersion( SOFFICE_FILEFORMAT_8 ); - pStream->SetCompressMode( COMPRESSMODE_ZBITMAP ); + pStream->SetCompressMode( SvStreamCompressFlags::ZBITMAP ); // SJ: first check if this metafile is just a eps file, then we will store the eps instead of svm GDIMetaFile& rMtf( (GDIMetaFile&)aGraphic.GetGDIMetaFile() ); |