summaryrefslogtreecommitdiffstats
path: root/filter/source/msfilter
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source/msfilter')
-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
4 files changed, 16 insertions, 16 deletions
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;
generated by cgit (git 2.34.1) at 2024-08-03 23:24:37 +0000