summaryrefslogtreecommitdiff
path: root/filter
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 /filter
parent8db77209e0755d21d9efc34f70a2978d1df5d2c6 (diff)
fdo#84938: convert STREAM_ #defines to 'enum class'
Change-Id: Ibbf14c7e9a5c1883c1311d4c86f948f74f8e473e
Diffstat (limited to 'filter')
-rw-r--r--filter/qa/cppunit/filters-dxf-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-eps-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-met-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-pcd-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-pcx-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-pict-test.cxx4
-rw-r--r--filter/qa/cppunit/filters-ppm-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-psd-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-ras-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-tga-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-tiff-test.cxx2
-rw-r--r--filter/source/flash/swfexporter.cxx4
-rw-r--r--filter/source/flash/swfwriter.cxx4
-rw-r--r--filter/source/flash/swfwriter1.cxx4
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/cgm.cxx2
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx4
-rw-r--r--filter/source/msfilter/escherex.cxx4
-rw-r--r--filter/source/msfilter/msdffimp.cxx12
-rw-r--r--filter/source/msfilter/svdfppt.cxx10
-rw-r--r--filter/source/msfilter/svxmsbas2.cxx6
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--filter/source/svg/svgexport.cxx4
-rw-r--r--filter/source/svg/svgwriter.cxx6
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx4
26 files changed, 48 insertions, 48 deletions
diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx
index 336b6cd35899..1d78a6188954 100644
--- a/filter/qa/cppunit/filters-dxf-test.cxx
+++ b/filter/qa/cppunit/filters-dxf-test.cxx
@@ -52,7 +52,7 @@ bool DxfFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-eps-test.cxx b/filter/qa/cppunit/filters-eps-test.cxx
index f291d113c315..2167281352b6 100644
--- a/filter/qa/cppunit/filters-eps-test.cxx
+++ b/filter/qa/cppunit/filters-eps-test.cxx
@@ -52,7 +52,7 @@ bool EpsFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-met-test.cxx b/filter/qa/cppunit/filters-met-test.cxx
index b8fc340dffab..4e551d24e06a 100644
--- a/filter/qa/cppunit/filters-met-test.cxx
+++ b/filter/qa/cppunit/filters-met-test.cxx
@@ -52,7 +52,7 @@ bool MetFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx
index 681dc7de641c..1658f4cf0c05 100644
--- a/filter/qa/cppunit/filters-pcd-test.cxx
+++ b/filter/qa/cppunit/filters-pcd-test.cxx
@@ -52,7 +52,7 @@ bool PcdFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-pcx-test.cxx b/filter/qa/cppunit/filters-pcx-test.cxx
index 013d96de8208..92139b1ad664 100644
--- a/filter/qa/cppunit/filters-pcx-test.cxx
+++ b/filter/qa/cppunit/filters-pcx-test.cxx
@@ -52,7 +52,7 @@ bool PcxFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index 0512b9b22287..35fed6162eec 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -66,7 +66,7 @@ bool PictFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
@@ -80,7 +80,7 @@ void PictFilterTest::testCVEs()
void PictFilterTest::testDontClipTooMuch()
{
- SvFileStream aFileStream(pictURL() + "clipping-problem.pct", STREAM_READ);
+ SvFileStream aFileStream(pictURL() + "clipping-problem.pct", StreamMode::READ);
GDIMetaFile aGDIMetaFile;
pict::ReadPictFile(aFileStream, aGDIMetaFile);
diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx
index 9b281abff231..9cdafcd9dbf1 100644
--- a/filter/qa/cppunit/filters-ppm-test.cxx
+++ b/filter/qa/cppunit/filters-ppm-test.cxx
@@ -52,7 +52,7 @@ bool PpmFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx
index 95ab882d82e5..0da3a9fa4dc5 100644
--- a/filter/qa/cppunit/filters-psd-test.cxx
+++ b/filter/qa/cppunit/filters-psd-test.cxx
@@ -52,7 +52,7 @@ bool PsdFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx
index a4862e6127dd..cbc7bdf1b288 100644
--- a/filter/qa/cppunit/filters-ras-test.cxx
+++ b/filter/qa/cppunit/filters-ras-test.cxx
@@ -52,7 +52,7 @@ bool RasFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx
index 615afbbbba9d..207e9ce2fef8 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/filter/qa/cppunit/filters-tga-test.cxx
@@ -52,7 +52,7 @@ bool TgaFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx
index a37ed17225f0..2de6c8f7874d 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/filter/qa/cppunit/filters-tiff-test.cxx
@@ -52,7 +52,7 @@ bool TiffFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
- SvFileStream aFileStream(rURL, STREAM_READ);
+ SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
}
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index b2bc39b6ae1c..2d0feeb583d8 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -705,7 +705,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
Graphic aGraphic;
GraphicFilter aFilter(false);
- aFilter.ImportGraphic( aGraphic, aFile.GetURL(), *aFile.GetStream( STREAM_READ ) );
+ aFilter.ImportGraphic( aGraphic, aFile.GetURL(), *aFile.GetStream( StreamMode::READ ) );
BitmapEx rBitmapEx( aGraphic.GetBitmap(), Color(255,255,255) );
Rectangle clipRect;
@@ -733,7 +733,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
}
else
{
- rMtf.Read( *aFile.GetStream( STREAM_READ ) );
+ rMtf.Read( *aFile.GetStream( StreamMode::READ ) );
if(usesClipActions(rMtf))
{
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index ded932b424ac..4e2021264605 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -55,8 +55,8 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
maMovieTempFile.EnableKillingFile();
maFontsTempFile.EnableKillingFile();
- mpMovieStream = maMovieTempFile.GetStream( STREAM_WRITE|STREAM_TRUNC );
- mpFontsStream = maFontsTempFile.GetStream( STREAM_WRITE|STREAM_TRUNC );
+ mpMovieStream = maMovieTempFile.GetStream( StreamMode::WRITE|StreamMode::TRUNC );
+ mpFontsStream = maFontsTempFile.GetStream( StreamMode::WRITE|StreamMode::TRUNC );
mnFrames = 0;
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index e2c34c10f8ef..ba7c610a2c9e 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1649,7 +1649,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
// the meta actions between the "XPATHFILL_SEQ_BEGIN" and "XPATHFILL_SEQ_END" comment.
SvtGraphicFill aFilling;
- SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
+ SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
// read the fill info
ReadSvtGraphicFill( aMemStm, aFilling );
@@ -1679,7 +1679,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
// the meta actions between the "XPATHFILL_SEQ_BEGIN" and "XPATHFILL_SEQ_END" comment.
SvtGraphicStroke aStroke;
- SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
+ SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
// read the fill info
ReadSvtGraphicStroke( aMemStm, aStroke );
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index ff423e97a97e..da5edcce41ec 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -1291,7 +1291,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
const sal_uInt8* pData = pA->GetData();
if ( pData )
{
- SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
+ SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
bool bSkipSequence = false;
OString sSeqEnd;
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index d00c40a6a5ce..45ae54e859cc 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -724,7 +724,7 @@ ImportCGM( OUString const & rFileName, uno::Reference< frame::XModel > const & r
{
if ( nMode & CGM_IMPORT_CGM )
{
- boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( rFileName, STREAM_READ ));
+ boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( rFileName, StreamMode::READ ));
if ( pIn )
{
pIn->SetEndian( SvStreamEndian::BIG );
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index db0b1654d033..abd8e1cdf60d 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -205,7 +205,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
OUString input;
osl::FileBase::getSystemPathFromFileURL(aTempInput.GetURL(), input);
- SvStream* pInputStream = aTempInput.GetStream(STREAM_WRITE);
+ SvStream* pInputStream = aTempInput.GetStream(StreamMode::WRITE);
sal_uInt64 nCount = pInputStream->Write(pBuf, nBytesRead);
aTempInput.CloseStream();
@@ -258,7 +258,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
if (pErr) osl_closeFile(pErr);
if (nCount == nBytesRead && bEMFSupported)
{
- SvFileStream aFile(output, STREAM_READ);
+ SvFileStream aFile(output, StreamMode::READ);
if (GraphicConverter::Import(aFile, rGraphic, CVT_EMF) == ERRCODE_NONE)
bRet = true;
}
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 23fcc48aa218..10b92eccf12e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1462,7 +1462,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
if ( pAry && nAryLen )
{
Graphic aGraphic;
- SvMemoryStream aTemp( (void*)pAry, nAryLen, STREAM_READ );
+ SvMemoryStream aTemp( (void*)pAry, nAryLen, StreamMode::READ );
sal_uInt32 nErrCode = GraphicConverter::Import( aTemp, aGraphic, CVT_WMF );
if ( nErrCode == ERRCODE_NONE )
{
@@ -1599,7 +1599,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
nFormat != GFF_EMF) )
{
boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream(
- aTmp.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ));
+ aTmp.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if ( pIn )
{
Graphic aGraphic;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f575f5aa21d6..ba30b8a89878 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -257,7 +257,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( OUString("d:\\ashape.dbg"), aURLStr ) )
{
- boost::scoped_ptr<SvStream> pOut(::utl::UcbStreamHelper::CreateStream( aURLStr, STREAM_WRITE ));
+ boost::scoped_ptr<SvStream> pOut(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::WRITE ));
if( pOut )
{
@@ -6360,7 +6360,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
SAL_INFO("filter.ms", "dumping " << aURLStr);
- boost::scoped_ptr<SvStream> pDbgOut(::utl::UcbStreamHelper::CreateStream(aURLStr, STREAM_TRUNC | STREAM_WRITE));
+ boost::scoped_ptr<SvStream> pDbgOut(::utl::UcbStreamHelper::CreateStream(aURLStr, StreamMode::TRUNC | STREAM_WRITE));
if( pDbgOut )
{
@@ -6653,7 +6653,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
{
bool bMtfRead = false;
SotStorageStreamRef xOle10Stm = rDest->OpenSotStream( OUString("\1Ole10Native"),
- STREAM_WRITE| STREAM_SHARE_DENYALL );
+ StreamMode::WRITE| StreamMode::SHARE_DENYALL );
if( xOle10Stm->GetError() )
return false;
@@ -7033,7 +7033,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
{
SvStorageRef xObjStg = rSrcStorage->OpenSotStorage( rStorageName,
- STREAM_READWRITE| STREAM_SHARE_DENYALL );
+ STREAM_READWRITE| StreamMode::SHARE_DENYALL );
if( xObjStg.Is() )
{
{
@@ -7060,7 +7060,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
// TODO/LATER: should the caller be notified if the aspect changes in future?
SvStorageStreamRef xObjInfoSrc = xObjStg->OpenSotStream(
- OUString( "\3ObjInfo" ), STREAM_STD_READ | STREAM_NOCREATE );
+ OUString( "\3ObjInfo" ), STREAM_STD_READ | StreamMode::NOCREATE );
if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
{
sal_uInt8 nByte = 0;
@@ -7095,7 +7095,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
if ( xObjStor.Is() )
{
- SotStorageRef xSrcStor = rSrcStorage->OpenSotStorage( rStorageName, STREAM_READ );
+ SotStorageRef xSrcStor = rSrcStorage->OpenSotStorage( rStorageName, StreamMode::READ );
xSrcStor->CopyTo( xObjStor );
if( !xObjStor->GetError() )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 744a7c3be473..1b09ed4d3765 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1757,7 +1757,7 @@ bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uInt32
rInput.Read( pBuf.get(), nInputSize );
ZCodec aZCodec( 0x8000, 0x8000 );
aZCodec.BeginCompression();
- SvMemoryStream aSource( pBuf.get(), nInputSize, STREAM_READ );
+ SvMemoryStream aSource( pBuf.get(), nInputSize, StreamMode::READ );
aZCodec.Decompress( aSource, rOutput );
const bool bSuccess(0L != aZCodec.EndCompression());
rInput.Seek( nOldPos );
@@ -1819,13 +1819,13 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
if ( aTmpFile.IsValid() )
{
- boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), STREAM_TRUNC | STREAM_WRITE ));
+ boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::TRUNC | StreamMode::WRITE ));
if ( pDest )
bSuccess = SdrPowerPointOLEDecompress( *pDest, rStCtrl, nLen );
}
if ( bSuccess )
{
- boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), STREAM_READ ));
+ boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::READ ));
Storage* pObjStor = pDest ? new Storage( *pDest, true ) : NULL;
if ( pObjStor )
{
@@ -1843,7 +1843,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
bool bGetItAsOle = ( sizeof( aTestA ) == xSrcTst->Read( aTestA, sizeof( aTestA ) ) );
if ( !bGetItAsOle )
{ // maybe there is a contentsstream in here
- xSrcTst = xObjStor->OpenSotStream( "Contents", STREAM_READWRITE | STREAM_NOCREATE );
+ xSrcTst = xObjStor->OpenSotStream( "Contents", STREAM_READWRITE | StreamMode::NOCREATE );
bGetItAsOle = ( xSrcTst.Is() && sizeof( aTestA ) == xSrcTst->Read( aTestA, sizeof( aTestA ) ) );
}
if ( bGetItAsOle )
@@ -1999,7 +1999,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
{
// is this a visual basic storage ?
SotStorageRef xSubStorage = xSource->OpenSotStorage( "VBA",
- STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL );
+ STREAM_READWRITE | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL );
if( xSubStorage.Is() && ( SVSTREAM_OK == xSubStorage->GetError() ) )
{
SotStorageRef xMacros = xDest->OpenSotStorage( "MACROS" );
diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx
index ae531a89a557..62be056be3cf 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -33,7 +33,7 @@ sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto,
uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() );
OUString aDstStgName( GetMSBasicStorageName() );
SotStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName,
- STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL ) );
+ STREAM_READWRITE | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL ) );
if( xVBAStg.Is() && !xVBAStg->GetError() )
{
xVBAStg = 0;
@@ -45,7 +45,7 @@ sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto,
nRet = ERRCODE_SVX_MODIFIED_VBASIC_STORAGE;
#endif
SotStorageRef xSrc = SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName, STREAM_STD_READ );
- SotStorageRef xDst = xRoot->OpenSotStorage( rStorageName, STREAM_READWRITE | STREAM_TRUNC );
+ SotStorageRef xDst = xRoot->OpenSotStorage( rStorageName, STREAM_READWRITE | StreamMode::TRUNC );
xSrc->CopyTo( xDst );
xDst->Commit();
ErrCode nError = xDst->GetError();
@@ -65,7 +65,7 @@ sal_uLong SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS
{
uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() );
SvStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, GetMSBasicStorageName(),
- STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL ));
+ StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL ));
return ( xVBAStg.Is() && !xVBAStg->GetError() )
? ERRCODE_SVX_VBASIC_STORAGE_EXIST
: ERRCODE_NONE;
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index cdaa4d521697..3e1349bf54f2 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -113,7 +113,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
if( bRet )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), STREAM_READ ));
+ boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ ));
if( pIStm )
{
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 9018cfcb052c..db8a76c6a853 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -544,7 +544,7 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
OUString aFileName;
pValue[ i ].Value >>= aFileName;
- pOStm.reset(::utl::UcbStreamHelper::CreateStream( aFileName, STREAM_WRITE | STREAM_TRUNC ));
+ pOStm.reset(::utl::UcbStreamHelper::CreateStream( aFileName, StreamMode::WRITE | StreamMode::TRUNC ));
if( pOStm )
xOStm = Reference< XOutputStream >( new ::utl::OOutputStreamWrapper ( *pOStm ) );
@@ -2070,7 +2070,7 @@ bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& r
xExporter->setSourceDocument( Reference< XComponent >( rxDrawPage, UNO_QUERY ) );
xExporter->filter( aDescriptor );
- aMtf.Read( *aFile.GetStream( STREAM_READ ) );
+ aMtf.Read( *aFile.GetStream( StreamMode::READ ) );
(*mpObjects)[ rxDrawPage ] = ObjectRepresentation( rxDrawPage, aMtf );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1ca787a20173..0eceaebc3ca1 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2998,7 +2998,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
mapCurShape.reset();
}
- SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), STREAM_READ );
+ SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), StreamMode::READ );
SvtGraphicFill aFill;
ReadSvtGraphicFill( aMemStm, aFill );
@@ -3074,7 +3074,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
pA->GetDataSize() )
{
- SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), STREAM_READ );
+ SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), StreamMode::READ );
SvtGraphicStroke aStroke;
tools::PolyPolygon aStartArrow, aEndArrow;
@@ -3636,7 +3636,7 @@ SVGWriter::~SVGWriter()
void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler,
const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception )
{
- SvMemoryStream aMemStm( (char*) rMtfSeq.getConstArray(), rMtfSeq.getLength(), STREAM_READ );
+ SvMemoryStream aMemStm( (char*) rMtfSeq.getConstArray(), rMtfSeq.getLength(), StreamMode::READ );
GDIMetaFile aMtf;
ReadGDIMetaFile( aMemStm, aMtf );
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index b56392e8b64d..3aa472c6e875 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -131,7 +131,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference
INetURLObject aURL( aFileURL );
OUString aName( aURL.getName() );
- SvFileStream* pStream = new SvFileStream(aFileURL, STREAM_READ );
+ SvFileStream* pStream = new SvFileStream(aFileURL, StreamMode::READ );
Reference< XInputStream > xInput( new utl::OSeekableInputStreamWrapper( pStream, true ) );
_addFile( xRootFolder, xFactory, xInput, aName );
}
@@ -213,7 +213,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
aExporter.doExport(xOS,rFilters);
}
- Reference< XInputStream > XIS( new utl::OSeekableInputStreamWrapper( new SvFileStream(aTempFileURL, STREAM_READ ), true ) );
+ Reference< XInputStream > XIS( new utl::OSeekableInputStreamWrapper( new SvFileStream(aTempFileURL, StreamMode::READ ), true ) );
OUString szTypeDetection( "TypeDetection.xcu" );
_addFile( xRootFolder, xFactory, XIS, szTypeDetection );
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index c021300183bb..d02fbed34968 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -485,9 +485,9 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
{
aDestURL += aSourceURL.GetName();
- SvFileStream aInputStream(pFilterEntry->maImportTemplate, STREAM_READ );
+ SvFileStream aInputStream(pFilterEntry->maImportTemplate, StreamMode::READ );
Reference< XInputStream > xIS( new utl::OInputStreamWrapper( aInputStream ) );
- SvFileStream aOutputStream(aDestURL, STREAM_WRITE );
+ SvFileStream aOutputStream(aDestURL, StreamMode::WRITE );
Reference< XOutputStream > xOS( new utl::OOutputStreamWrapper( aOutputStream ) );
if( copyStreams( xIS, xOS ) )