summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-07 09:28:42 +0200
committerNoel Grandin <noel@peralex.com>2015-01-07 11:20:44 +0200
commit7f8f277b94704a289fbbd1b836e4e5d66311580d (patch)
tree2400b7306a0a2a3ea63aee2e5bfc336b52102635 /sd
parent8db77209e0755d21d9efc34f70a2978d1df5d2c6 (diff)
fdo#84938: convert STREAM_ #defines to 'enum class'
Change-Id: Ibbf14c7e9a5c1883c1311d4c86f948f74f8e473e
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/sdiocmpt.hxx14
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx2
-rw-r--r--sd/source/core/drawdoc3.cxx2
-rw-r--r--sd/source/core/sdiocmpt.cxx16
-rw-r--r--sd/source/filter/eppt/eppt.cxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.cxx2
-rw-r--r--sd/source/filter/html/htmlex.cxx4
-rw-r--r--sd/source/filter/html/pubdlg.cxx14
-rw-r--r--sd/source/filter/ppt/pptin.cxx2
-rw-r--r--sd/source/filter/ppt/propread.cxx2
-rw-r--r--sd/source/ui/app/sdxfer.cxx2
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx2
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx4
-rw-r--r--sd/source/ui/dlg/navigatr.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx4
-rw-r--r--sd/source/ui/func/fuinsfil.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx2
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx2
-rw-r--r--sd/source/ui/view/sdview4.cxx2
21 files changed, 43 insertions, 45 deletions
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index 7775d1757b24..cc18b4a0265f 100644
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -22,15 +22,13 @@
#include <tools/stream.hxx>
-class SvStream;
-
class old_SdrDownCompat
{
protected:
SvStream& rStream;
- sal_uInt32 nSubRecSiz;
- sal_uInt32 nSubRecPos;
- sal_uInt16 nMode;
+ sal_uInt32 nSubRecSiz;
+ sal_uInt32 nSubRecPos;
+ StreamMode nMode;
bool bOpen;
protected:
@@ -38,7 +36,7 @@ protected:
void Write();
public:
- old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode);
+ old_SdrDownCompat(SvStream& rNewStream, StreamMode nNewMode);
~old_SdrDownCompat();
void OpenSubRecord();
void CloseSubRecord();
@@ -54,9 +52,9 @@ private:
sal_uInt16 nVersion;
public:
- // nNewMode: STREAM_READ or STREAM_WRITE
+ // nNewMode: StreamMode::READ or StreamMode::WRITE
// nVer: specify only when writing
- SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode,
+ SdIOCompat(SvStream& rNewStream, StreamMode nNewMode,
sal_uInt16 nVer = SDIOCOMPAT_VERSIONDONTKNOW);
~SdIOCompat();
sal_uInt16 GetVersion() const { return nVersion; }
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index f86940f7ca31..cf9f9b181055 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -245,7 +245,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac
try
{
// create stream
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, StreamMode::READ );
Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, true ) );
// prepare ParserInputSrouce
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index d00c8aa168fd..8052e7ee7d91 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -263,7 +263,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const OUString& rBookmarkFile)
if (!rBookmarkFile.isEmpty() && maBookmarkFile != rBookmarkFile)
{
- SfxMedium* pMedium = new SfxMedium( rBookmarkFile, STREAM_READ );
+ SfxMedium* pMedium = new SfxMedium( rBookmarkFile, StreamMode::READ );
pBookmarkDoc = OpenBookmarkDoc(*pMedium);
}
else if (mxBookmarkDocShRef.Is())
diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx
index 09d116e0457e..3795a4adef82 100644
--- a/sd/source/core/sdiocmpt.cxx
+++ b/sd/source/core/sdiocmpt.cxx
@@ -21,7 +21,7 @@
#include "sdiocmpt.hxx"
-old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode)
+old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, StreamMode nNewMode)
: rStream(rNewStream),
nSubRecSiz(0),
nSubRecPos(0),
@@ -54,11 +54,11 @@ void old_SdrDownCompat::OpenSubRecord()
nSubRecPos = rStream.Tell();
- if(nMode == STREAM_READ)
+ if(nMode == StreamMode::READ)
{
Read();
}
- else if(nMode == STREAM_WRITE)
+ else if(nMode == StreamMode::WRITE)
{
Write();
}
@@ -73,7 +73,7 @@ void old_SdrDownCompat::CloseSubRecord()
sal_uInt32 nAktPos(rStream.Tell());
- if(nMode == STREAM_READ)
+ if(nMode == StreamMode::READ)
{
sal_uInt32 nReadAnz(nAktPos - nSubRecPos);
if(nReadAnz != nSubRecSiz)
@@ -81,7 +81,7 @@ void old_SdrDownCompat::CloseSubRecord()
rStream.Seek(nSubRecPos + nSubRecSiz);
}
}
- else if(nMode == STREAM_WRITE)
+ else if(nMode == StreamMode::WRITE)
{
nSubRecSiz = nAktPos - nSubRecPos;
rStream.Seek(nSubRecPos);
@@ -98,16 +98,16 @@ void old_SdrDownCompat::CloseSubRecord()
|*
\************************************************************************/
-SdIOCompat::SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode, sal_uInt16 nVer)
+SdIOCompat::SdIOCompat(SvStream& rNewStream, StreamMode nNewMode, sal_uInt16 nVer)
: old_SdrDownCompat(rNewStream, nNewMode), nVersion(nVer)
{
- if (nNewMode == STREAM_WRITE)
+ if (nNewMode == StreamMode::WRITE)
{
DBG_ASSERT(nVer != SDIOCOMPAT_VERSIONDONTKNOW,
"can´t write unknown version");
rNewStream.WriteUInt16( nVersion );
}
- else if (nNewMode == STREAM_READ)
+ else if (nNewMode == StreamMode::READ)
{
DBG_ASSERT(nVer == SDIOCOMPAT_VERSIONDONTKNOW,
"referring to the version while reading is silly!");
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 4bf6e91542ab..ee806335b054 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1487,7 +1487,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell
{
xTemp->Seek( STREAM_SEEK_TO_BEGIN );
xTemp->Read( pTemp, nLen );
- pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ );
+ pBas = new SvMemoryStream( pTemp, nLen, StreamMode::READ );
pBas->ObjectOwnsMemory( true );
return true;
}
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index ce9cb4d0ef0b..83ccbfaf1e19 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2514,7 +2514,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
SvStorageStreamRef xCompObj = xTemp->OpenSotStream(
OUString( "\1CompObj" ),
- STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL );
+ StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL );
sal_uInt32 const nStreamLen = xCompObj->remainingSize();
sal_Int16 nVersion, nByteOrder;
sal_Int32 nWinVersion, nVal, nStringLen;
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index 74a81f3cff11..4b732d747bfd 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -126,7 +126,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const
rSt.WriteUInt32( ( EPP_SoundData << 16 ) ).WriteUInt32( ( nFileSize ) );
sal_uInt32 nBytesLeft = nFileSize;
- SvStream* pSourceFile = ::utl::UcbStreamHelper::CreateStream( aSoundURL, STREAM_READ );
+ SvStream* pSourceFile = ::utl::UcbStreamHelper::CreateStream( aSoundURL, StreamMode::READ );
if ( pSourceFile )
{
sal_uInt8* pBuf = new sal_uInt8[ 0x10000 ]; // 64 kB Buffer
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 23a3ce37c5fa..83e8ddb196d3 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2873,7 +2873,7 @@ bool HtmlExport::CopyScript( const OUString& rPath, const OUString& rSource, con
meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource );
sal_uLong nErr = 0;
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ );
if( pIStm )
{
@@ -3167,7 +3167,7 @@ sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr )
if( nErr == 0 )
{
- pOStm = ::utl::UcbStreamHelper::CreateStream( aFileName, STREAM_WRITE | STREAM_TRUNC );
+ pOStm = ::utl::UcbStreamHelper::CreateStream( aFileName, StreamMode::WRITE | StreamMode::TRUNC );
if( pOStm )
{
bOpen = true;
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 40aa4a2b1e9c..c65adae60e68 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -240,7 +240,7 @@ bool SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const
// Load the design from the stream
SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
{
- SdIOCompat aIO(rIn, STREAM_READ);
+ SdIOCompat aIO(rIn, StreamMode::READ);
sal_uInt16 nTemp16;
@@ -295,7 +295,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDesign)
{
// The last parameter is the versionnumber of the code
- SdIOCompat aIO(rOut, STREAM_WRITE, 0);
+ SdIOCompat aIO(rOut, StreamMode::WRITE, 0);
// Name
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName,
@@ -1455,7 +1455,7 @@ bool SdPublishingDlg::Load()
// check if file exists, SfxMedium shows an errorbox else
{
com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler > xHandler;
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, xHandler );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ, xHandler );
bool bOk = pIStm && ( pIStm->GetError() == 0);
@@ -1466,7 +1466,7 @@ bool SdPublishingDlg::Load()
return false;
}
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ | StreamMode::NOCREATE );
SvStream* pStream = aMedium.GetInStream();
@@ -1479,7 +1479,7 @@ bool SdPublishingDlg::Load()
if(aCheck != nMagic)
return false;
- SdIOCompat aIO(*pStream, STREAM_READ);
+ SdIOCompat aIO(*pStream, StreamMode::READ);
sal_uInt16 nDesigns;
pStream->ReadUInt16( nDesigns );
@@ -1502,7 +1502,7 @@ bool SdPublishingDlg::Save()
{
INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
aURL.Append( OUString( "designs.sod" ) );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC );
SvStream* pStream = aMedium.GetOutStream();
@@ -1514,7 +1514,7 @@ bool SdPublishingDlg::Save()
// Destroys the SdIOCompat before the Stream is being destributed
{
- SdIOCompat aIO(*pStream, STREAM_WRITE, 0);
+ SdIOCompat aIO(*pStream, StreamMode::WRITE, 0);
sal_uInt16 nDesigns = (sal_uInt16) m_aDesignList.size();
pStream->WriteUInt16( nDesigns );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index b01e1b61aa0c..31d9cdcd4044 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1906,7 +1906,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
sal_uInt8* pBuf = new sal_uInt8[ nSoundDataLen ];
rStCtrl.Read( pBuf, nSoundDataLen );
- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
+ SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC );
if( pOStm )
{
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index ec95e409b8e6..2318c4b8be1a 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -263,7 +263,7 @@ bool Section::GetDictionary( Dictionary& rDict )
if ( iter != maEntries.end() )
{
sal_uInt32 nDictCount, nId, nSize, nPos;
- SvMemoryStream aStream( (sal_Int8*)iter->mpBuf, iter->mnSize, STREAM_READ );
+ SvMemoryStream aStream( (sal_Int8*)iter->mpBuf, iter->mnSize, StreamMode::READ );
aStream.Seek( STREAM_SEEK_TO_BEGIN );
aStream.ReadUInt32( nDictCount );
for ( sal_uInt32 i = 0; i < nDictCount; i++ )
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index dda4f74a5fe0..d6a2a59c286e 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -631,7 +631,7 @@ bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sa
if ( xTransact.is() )
xTransact->commit();
- SvStream* pSrcStm = ::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), STREAM_READ );
+ SvStream* pSrcStm = ::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ );
if( pSrcStm )
{
rxOStm->SetBufferSize( 0xff00 );
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 92421a3f3a11..4f3a0a874fb4 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -580,7 +580,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
// remote?
if ( INET_PROT_FILE != aURLObj.GetProtocol() )
{
- SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( sImgUrl, STREAM_READ );
+ SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( sImgUrl, StreamMode::READ );
if( pStream )
mpGraphicFilter->ImportGraphic( aGraphic, sImgUrl, *pStream, nFilter, NULL, nFilterImportFlags );
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 78fbcf47c3fd..d21de6f97c27 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -77,7 +77,7 @@ void MorphDlg::LoadSettings()
if( xIStm.Is() )
{
- SdIOCompat aCompat( *xIStm, STREAM_READ );
+ SdIOCompat aCompat( *xIStm, StreamMode::READ );
xIStm->ReadUInt16( nSteps ).ReadCharAsBool( bOrient ).ReadCharAsBool( bAttrib );
}
@@ -99,7 +99,7 @@ void MorphDlg::SaveSettings() const
if( xOStm.Is() )
{
- SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 );
+ SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 );
xOStm->WriteUInt16( m_pMtfSteps->GetValue() )
.WriteUChar( m_pCbxOrientation->IsChecked() )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 91f5d2f63e4e..ed45f06e8230 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -607,7 +607,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName)
if (aFileName != maDropFileName)
{
- SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE));
+ SfxMedium aMed(aFileName, (StreamMode::READ | StreamMode::SHARE_DENYNONE));
SfxFilterMatcher aMatch( OUString("simpress") );
aMed.UseInteractionHandler( true );
nErr = aMatch.GuessFilter(aMed, &pFilter);
@@ -618,7 +618,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName)
// The medium may be opened with READ/WRITE. Therefore, we first
// check if it contains a Storage.
SfxMedium* pMedium = new SfxMedium( aFileName,
- STREAM_READ | STREAM_NOCREATE);
+ StreamMode::READ | StreamMode::NOCREATE);
if (pMedium->IsStorage())
{
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index f7c49377762b..a7e414754a1b 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -648,7 +648,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
{
// check if it is a valid draw file
SfxMedium aMedium( aFile,
- STREAM_READ | STREAM_NOCREATE );
+ StreamMode::READ | StreamMode::NOCREATE );
if( aMedium.IsStorage() )
{
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index c58665666b4a..2755789683f2 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -306,7 +306,7 @@ void SdVectorizeDlg::LoadSettings()
if( xIStm.Is() )
{
- SdIOCompat aCompat( *xIStm, STREAM_READ );
+ SdIOCompat aCompat( *xIStm, StreamMode::READ );
xIStm->ReadUInt16( nLayers ).ReadUInt16( nReduce ).ReadUInt16( nFillHoles ).ReadCharAsBool( bFillHoles );
}
else
@@ -333,7 +333,7 @@ void SdVectorizeDlg::SaveSettings() const
if( xOStm.Is() )
{
- SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 );
+ SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 );
xOStm->WriteUInt16( m_pNmLayers->GetValue() ).WriteUInt16( m_pMtReduce->GetValue() );
xOStm->WriteUInt16( m_pMtFillHoles->GetValue() ).WriteUChar( m_pCbFillHoles->IsChecked() );
}
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index ff71ff2034f4..71cf119c3620 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -247,7 +247,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
mpDocSh->SetWaitCursor( true );
- SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE );
+ SfxMedium* pMedium = new SfxMedium( aFile, StreamMode::READ | StreamMode::NOCREATE );
const SfxFilter* pFilter = NULL;
SfxGetpApp()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index ca59270f227b..94bf10085b44 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -183,7 +183,7 @@ Bitmap PngCompression::Decompress (
const PngReplacement* pData (dynamic_cast<const PngReplacement*>(&rBitmapData));
if (pData != NULL)
{
- SvMemoryStream aStream (pData->mpData, pData->mnDataSize, STREAM_READ);
+ SvMemoryStream aStream (pData->mpData, pData->mnDataSize, StreamMode::READ);
::vcl::PNGReader aReader (aStream);
aResult = aReader.Read().GetBitmap();
}
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 280055a2b72a..b193dd6fa2a8 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -746,7 +746,7 @@ throw (UnknownPropertyException, PropertyVetoException,
sal_uInt32 nSize = aSequence.getLength();
if( nSize )
{
- SvMemoryStream aStream (aSequence.getArray(), nSize, STREAM_READ );
+ SvMemoryStream aStream (aSequence.getArray(), nSize, StreamMode::READ );
aStream.Seek ( STREAM_SEEK_TO_BEGIN );
SfxItemSet* pItemSet;
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 6a30a19f2275..04d64b7af3b8 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -448,7 +448,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
if( !bOK )
{
const SfxFilter* pFoundFilter = NULL;
- SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE );
+ SfxMedium aSfxMedium( aCurrentDropFile, StreamMode::READ | StreamMode::SHARE_DENYNONE );
ErrCode nErr = SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
if( pFoundFilter && !nErr )