summaryrefslogtreecommitdiff
path: root/sc
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 /sc
parent8db77209e0755d21d9efc34f70a2978d1df5d2c6 (diff)
fdo#84938: convert STREAM_ #defines to 'enum class'
Change-Id: Ibbf14c7e9a5c1883c1311d4c86f948f74f8e473e
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/autoform.cxx4
-rw-r--r--sc/source/core/tool/rechead.cxx2
-rw-r--r--sc/source/filter/excel/excimp8.cxx2
-rw-r--r--sc/source/filter/ftools/ftools.cxx2
-rw-r--r--sc/source/filter/html/htmlexp.cxx8
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx2
-rw-r--r--sc/source/ui/app/drwtrans.cxx2
-rw-r--r--sc/source/ui/app/transobj.cxx2
-rw-r--r--sc/source/ui/docshell/datastream.cxx2
-rw-r--r--sc/source/ui/docshell/impex.cxx2
-rw-r--r--sc/source/ui/inc/impex.hxx2
-rw-r--r--sc/source/ui/unoobj/confuno.cxx2
-rw-r--r--sc/source/ui/view/viewfun4.cxx2
13 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index e9265b95388a..ac81ac5b0d2b 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1011,7 +1011,7 @@ bool ScAutoFormat::Load()
aURL.setFinalSlash();
aURL.Append( OUString( sAutoTblFmtName ) );
- SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ );
+ SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), StreamMode::READ );
SvStream* pStream = aMedium.GetInStream();
bool bRet = (pStream && pStream->GetError() == 0);
if (bRet)
@@ -1072,7 +1072,7 @@ bool ScAutoFormat::Save()
aURL.setFinalSlash();
aURL.Append(sAutoTblFmtName);
- SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE );
+ SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), StreamMode::WRITE );
SvStream* pStream = aMedium.GetOutStream();
bool bRet = (pStream && pStream->GetError() == 0);
if (bRet)
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index 32d3d96fe7b3..f7566fe9cd97 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -52,7 +52,7 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
rStream.ReadUInt32( nSizeTableLen );
pBuf = new sal_uInt8[nSizeTableLen];
rStream.Read( pBuf, nSizeTableLen );
- pMemStream = new SvMemoryStream( (char*)pBuf, nSizeTableLen, STREAM_READ );
+ pMemStream = new SvMemoryStream( (char*)pBuf, nSizeTableLen, StreamMode::READ );
}
nEndPos = rStream.Tell();
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index ae83bca1e22b..e9aa7a68f1de 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -390,7 +390,7 @@ void ImportExcel8::ReadBasic( void )
rFilterOpt.IsLoadExcelBasicExecutable() )
{
// see if we have the XCB stream
- SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | STREAM_NOCREATE );
+ SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | StreamMode::NOCREATE );
if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
{
ScCTBWrapper wrapper;
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 23adece956e1..f23fdd576c15 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -195,7 +195,7 @@ SotStorageStreamRef ScfTools::OpenStorageStreamWrite( SotStorageRef xStrg, const
OSL_ENSURE( !xStrg || !xStrg->IsContained( rStrmName ), "ScfTools::OpenStorageStreamWrite - stream exists already" );
SotStorageStreamRef xStrm;
if( xStrg.Is() )
- xStrm = xStrg->OpenSotStream( rStrmName, STREAM_STD_WRITE | STREAM_TRUNC );
+ xStrm = xStrg->OpenSotStream( rStrmName, STREAM_STD_WRITE | StreamMode::TRUNC );
return xStrm;
}
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index aa4c01061a57..614af46b9a24 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1257,7 +1257,7 @@ bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
pFileNameMap.reset( new std::map<OUString, OUString>() );
}
- SvFileStream aTmp( aFileUrl.PathToFileName(), STREAM_READ );
+ SvFileStream aTmp( aFileUrl.PathToFileName(), StreamMode::READ );
OUString aSrc = rFileNm;
OUString aDest = aTargetUrl.GetPartBeforeLastName();
@@ -1266,7 +1266,7 @@ bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
if( bFileToFile )
{
INetURLObject aCpyURL( aDest );
- SvFileStream aCpy( aCpyURL.PathToFileName(), STREAM_WRITE );
+ SvFileStream aCpy( aCpyURL.PathToFileName(), StreamMode::WRITE );
aCpy.WriteStream( aTmp );
aCpy.Close();
@@ -1274,10 +1274,10 @@ bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
}
else
{
- SfxMedium aMedium( aDest, STREAM_WRITE | STREAM_SHARE_DENYNONE );
+ SfxMedium aMedium( aDest, StreamMode::WRITE | StreamMode::SHARE_DENYNONE );
{
- SvFileStream aCpy( aMedium.GetPhysicalName(), STREAM_WRITE );
+ SvFileStream aCpy( aMedium.GetPhysicalName(), StreamMode::WRITE );
aCpy.WriteStream( aTmp );
}
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 9a306b44541b..9ed9f94c344e 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -892,7 +892,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) );
aStorageName += OUString::createFromAscii(aBuf);
SotStorageRef xOleStg = pRootStorage->OpenSotStorage( aStorageName,
- STREAM_READWRITE| STREAM_SHARE_DENYALL );
+ STREAM_READWRITE| StreamMode::SHARE_DENYALL );
if( xOleStg.Is() )
{
uno::Reference < embed::XEmbeddedObject > xObj( static_cast<const SdrOle2Obj&>(rOleObj).GetObjRef() );
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index afbc7ae5418c..745e23863025 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -567,7 +567,7 @@ bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj
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/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index cb822e238134..1d7f57c03f49 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -455,7 +455,7 @@ bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject,
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/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 92f9519d93bc..b859d0be9b05 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -428,7 +428,7 @@ void DataStream::StartImport()
if (mnSettings & SCRIPT_STREAM)
pStream = new SvScriptStream(msURL);
else
- pStream = new SvFileStream(msURL, STREAM_READ);
+ pStream = new SvFileStream(msURL, StreamMode::READ);
mxReaderThread = new datastreams::ReaderThread(pStream, maStartRange.aEnd.Col() - maStartRange.aStart.Col() + 1);
mxReaderThread->launch();
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index e6d7e8b5cc5f..4d8817480935 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -293,7 +293,7 @@ bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt )
{
rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
OString aTmp( rText.getStr(), rText.getLength(), eEnc );
- SvMemoryStream aStrm( (void*)aTmp.getStr(), aTmp.getLength() * sizeof(sal_Char), STREAM_READ );
+ SvMemoryStream aStrm( (void*)aTmp.getStr(), aTmp.getLength() * sizeof(sal_Char), StreamMode::READ );
aStrm.SetStreamCharSet( eEnc );
SetNoEndianSwap( aStrm ); //! no swapping in memory
return ImportStream( aStrm, OUString(), nFmt );
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 1d070c142568..f5b7b8c1bc11 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -187,7 +187,7 @@ class ScImportStringStream : public SvMemoryStream
public:
ScImportStringStream( const OUString& rStr )
: SvMemoryStream( (void*)rStr.getStr(),
- rStr.getLength() * sizeof(sal_Unicode), STREAM_READ)
+ rStr.getLength() * sizeof(sal_Unicode), StreamMode::READ)
{
SetStreamCharSet( RTL_TEXTENCODING_UNICODE );
#ifdef OSL_BIGENDIAN
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index ceafa0738f1a..ed59eebd832d 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -201,7 +201,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
// #i75610# if the sequence is empty, do nothing (don't create any printer)
if ( nSize != 0 )
{
- SvMemoryStream aStream (aSequence.getArray(), nSize, STREAM_READ );
+ SvMemoryStream aStream (aSequence.getArray(), nSize, StreamMode::READ );
aStream.Seek ( STREAM_SEEK_TO_BEGIN );
SfxItemSet* pSet = new SfxItemSet( *rDoc.GetPool(),
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 452bfa9b85b9..8f0ed950c2e0 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -589,7 +589,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink
// nur nach eigenen Filtern suchen, ohne Auswahlbox (wie in ScDocumentLoader)
SfxFilterMatcher aMatcher( ScDocShell::Factory().GetFilterContainer()->GetName() );
- SfxMedium aSfxMedium( aStrURL, (STREAM_READ | STREAM_SHARE_DENYNONE) );
+ SfxMedium aSfxMedium( aStrURL, (StreamMode::READ | StreamMode::SHARE_DENYNONE) );
// #i73992# GuessFilter no longer calls UseInteractionHandler.
// This is UI, so it can be called here.
aSfxMedium.UseInteractionHandler(true);