[Libreoffice-commits] core.git: filter/source idl/source sc/source starmath/source sw/source
Takeshi Abe
tabe at fixedpoint.jp
Thu Jun 2 10:53:19 UTC 2016
filter/source/msfilter/msdffimp.cxx | 2 +-
idl/source/cmptools/lex.cxx | 2 +-
idl/source/prj/command.cxx | 2 +-
sc/source/filter/excel/excimp8.cxx | 2 +-
starmath/source/eqnolefilehdr.cxx | 2 +-
starmath/source/mathtype.cxx | 2 +-
sw/source/filter/basflt/iodetect.cxx | 2 +-
sw/source/filter/ww8/ww8par.cxx | 2 +-
sw/source/filter/ww8/ww8par4.cxx | 6 +++---
9 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 53bc54209388f608521de48e289226188c138cec
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Jun 2 14:30:41 2016 +0900
STREAM_STD_READ already includes StreamMode::NOCREATE
Change-Id: Ib8c81056619a383cedc828b945c1802ff1ce42ca
Reviewed-on: https://gerrit.libreoffice.org/25802
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9753f6e..996fa28 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -7113,7 +7113,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
// TODO/LATER: should the caller be notified if the aspect changes in future?
tools::SvRef<SotStorageStream> xObjInfoSrc = xObjStg->OpenSotStream(
- "\3ObjInfo", STREAM_STD_READ | StreamMode::NOCREATE );
+ "\3ObjInfo", STREAM_STD_READ );
if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
{
sal_uInt8 nByte = 0;
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 6084489..56d696a 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -84,7 +84,7 @@ void SvTokenStream::InitCtor()
}
SvTokenStream::SvTokenStream( const OUString & rFileName )
- : pInStream( new SvFileStream( rFileName, STREAM_STD_READ | StreamMode::NOCREATE ) )
+ : pInStream( new SvFileStream( rFileName, STREAM_STD_READ ) )
, aFileName( rFileName )
{
InitCtor();
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 66ab61c..fb5e9d7 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -144,7 +144,7 @@ static bool ResponseFile( StringList * pList, int argc, char ** argv )
{
if( '@' == **(argv +i) )
{ // when @, then response file
- SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | StreamMode::NOCREATE );
+ SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ );
if( aStm.GetError() != SVSTREAM_OK )
return false;
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 71551f4..91f9d80 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -374,7 +374,7 @@ void ImportExcel8::ReadBasic()
rFilterOpt.IsLoadExcelBasicExecutable() )
{
// see if we have the XCB stream
- tools::SvRef<SotStorageStream> xXCB = xRootStrg->OpenSotStream( "XCB", STREAM_STD_READ | StreamMode::NOCREATE );
+ tools::SvRef<SotStorageStream> xXCB = xRootStrg->OpenSotStream( "XCB", STREAM_STD_READ );
if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
{
ScCTBWrapper wrapper;
diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx
index 63e9d09..0465149 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -31,7 +31,7 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream(
"Equation Native",
- STREAM_STD_READ | StreamMode::NOCREATE);
+ STREAM_STD_READ);
if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError()))
return bSuccess;
SotStorageStream *pS = &xSrc;
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index d18ef63..dd61e26 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -557,7 +557,7 @@ bool MathType::Parse(SotStorage *pStor)
{
tools::SvRef<SotStorageStream> xSrc = pStor->OpenSotStream(
"Equation Native",
- STREAM_STD_READ | StreamMode::NOCREATE);
+ STREAM_STD_READ);
if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError()))
return false;
pS = &xSrc;
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 2ac92f7..8de8f0d 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -127,7 +127,7 @@ bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
{
tools::SvRef<SotStorageStream> xRef =
rStg.OpenSotStream("WordDocument",
- STREAM_STD_READ | StreamMode::NOCREATE );
+ STREAM_STD_READ );
xRef->Seek(10);
sal_uInt8 nByte;
xRef->ReadUChar( nByte );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 48ad5d0..0719b4c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5446,7 +5446,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(tools::SvRef<SotStorageStream> &rTableS
m_pTableStream->SetEndian( SvStreamEndian::LITTLE );
rDataStream = m_pStg->OpenSotStream(OUString(SL::aData),
- STREAM_STD_READ | StreamMode::NOCREATE );
+ STREAM_STD_READ );
if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
{
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 940d3a3..70932d4 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -83,7 +83,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, tools::SvRef<SotStorage>& rSrc1
// 0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw
tools::SvRef<SotStorageStream> xSrc3 = rSrc1->OpenSotStream( "\3PIC",
- STREAM_STD_READ | StreamMode::NOCREATE);
+ STREAM_STD_READ );
SotStorageStream* pS = xSrc3;
pS->SetEndian( SvStreamEndian::LITTLE );
pS->Seek( STREAM_SEEK_TO_END );
@@ -128,7 +128,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
tools::SvRef<SotStorage>& rSrc1)
{
tools::SvRef<SotStorageStream> xSrc2 = rSrc1->OpenSotStream( "\3META",
- STREAM_STD_READ | StreamMode::NOCREATE);
+ STREAM_STD_READ );
SotStorageStream* pSt = xSrc2;
pSt->SetEndian( SvStreamEndian::LITTLE );
sal_uLong nRead = pSt->Read( pMfp, sizeof(*pMfp ) );
@@ -424,7 +424,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
{
tools::SvRef<SotStorageStream> xObjInfoSrc = xSrc1->OpenSotStream("\3ObjInfo",
- STREAM_STD_READ | StreamMode::NOCREATE );
+ STREAM_STD_READ );
if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
{
sal_uInt8 nByte = 0;
More information about the Libreoffice-commits
mailing list