diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/filters-test.cxx | 2 | ||||
-rw-r--r-- | sd/qa/unit/sdmodeltestbase.hxx | 6 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 8 | ||||
-rw-r--r-- | sd/source/filter/ppt/propread.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod.cxx | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx index c08f6c0dd142..647f9ddc094f 100644 --- a/sd/qa/unit/filters-test.cxx +++ b/sd/qa/unit/filters-test.cxx @@ -70,7 +70,7 @@ bool SdFiltersTest::load(const OUString &rFilter, const OUString &rURL, const_cast<SfxFilter*>(pFilter.get())->SetVersion(nFilterVersion); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); - SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ); + SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ); pSrcMed->SetFilter(pFilter); bool bLoaded = xDocShRef->DoLoad(pSrcMed); xDocShRef->DoClose(); diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index cf7337f38e11..8fc2b3af94b0 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -135,7 +135,7 @@ protected: std::shared_ptr<const SfxFilter> pFilt(pFilter); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); - SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, pFilt, pParams); + SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ, pFilt, pParams); if ( !xDocShRef->DoLoad(pSrcMed) || !xDocShRef.Is() ) { if (xDocShRef.Is()) @@ -157,7 +157,7 @@ protected: void exportTo(sd::DrawDocShell* pShell, FileFormat* pFormat, utl::TempFile& rTempFile) { - SfxMedium aStoreMedium(rTempFile.GetURL(), STREAM_STD_WRITE); + SfxMedium aStoreMedium(rTempFile.GetURL(), StreamMode::STD_WRITE); SotClipboardFormatId nExportFormat = SotClipboardFormatId::NONE; if (pFormat->nFormatType == ODP_FORMAT_TYPE) nExportFormat = SotClipboardFormatId::STARCALC_8; @@ -176,7 +176,7 @@ protected: void save(sd::DrawDocShell* pShell, FileFormat* pFormat, utl::TempFile& rTempFile) { - SfxMedium aStoreMedium(rTempFile.GetURL(), STREAM_STD_WRITE); + SfxMedium aStoreMedium(rTempFile.GetURL(), StreamMode::STD_WRITE); SotClipboardFormatId nExportFormat = SotClipboardFormatId::NONE; if (pFormat->nFormatType == ODP_FORMAT_TYPE) nExportFormat = SotClipboardFormatId::STARCHART_8; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index ce1b85f36bfa..40c51d0e57ac 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -132,7 +132,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SotSt #endif PowerPointImportParam aParam( rDocStream, nImportFlags ); - SvStream* pCurrentUserStream = rStorage.OpenSotStream( "Current User", STREAM_STD_READ ); + SvStream* pCurrentUserStream = rStorage.OpenSotStream( "Current User", StreamMode::STD_READ ); if( pCurrentUserStream ) { ReadPptCurrentUserAtom( *pCurrentUserStream, aParam.aCurrentUserAtom ); @@ -191,7 +191,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorag { sal_uLong nPosMerk = rStCtrl.Tell(); - pStData = rStorage_.OpenSotStream( "Pictures", STREAM_STD_READ ); + pStData = rStorage_.OpenSotStream( "Pictures", StreamMode::STD_READ ); rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 ); sal_uLong nDocLen = maDocHd.GetRecEndFilePos(); @@ -2761,13 +2761,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(const OUString &rURL if (xStorage->GetError()) return false; - tools::SvRef<SotStorageStream> xDocStream(xStorage->OpenSotStream( "PowerPoint Document", STREAM_STD_READ)); + tools::SvRef<SotStorageStream> xDocStream(xStorage->OpenSotStream( "PowerPoint Document", StreamMode::STD_READ)); if (!xDocStream) return false; SdDLL::Init(); - SfxMedium aSrcMed(rURL, STREAM_STD_READ); + SfxMedium aSrcMed(rURL, StreamMode::STD_READ); xDocStream->SetVersion(xStorage->GetVersion()); xDocStream->SetCryptMaskKey(xStorage->GetKey()); diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 9e7d16cb18a8..f91888b08fc8 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -552,7 +552,7 @@ PropRead::PropRead( SotStorage& rStorage, const OUString& rName ) : { if ( rStorage.IsStream( rName ) ) { - mpSvStream = rStorage.OpenSotStream( rName, STREAM_STD_READ ); + mpSvStream = rStorage.OpenSotStream( rName, StreamMode::STD_READ ); if ( mpSvStream ) { mpSvStream->SetEndian( SvStreamEndian::LITTLE ); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 049d3dad0af1..d64a1e145005 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -84,10 +84,10 @@ bool SdPPTFilter::Import() OUString sDualStorage( "PP97_DUALSTORAGE" ); if ( pStorage->IsContained( sDualStorage ) ) { - xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ ); + xDualStorage = pStorage->OpenSotStorage( sDualStorage, StreamMode::STD_READ ); pStorage = xDualStorage; } - SvStream* pDocStream = pStorage->OpenSotStream( "PowerPoint Document" , STREAM_STD_READ ); + SvStream* pDocStream = pStorage->OpenSotStream( "PowerPoint Document" , StreamMode::STD_READ ); if( pDocStream ) { pDocStream->SetVersion( pStorage->GetVersion() ); diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index f665d7f5960a..9f0ff7de6be2 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -183,7 +183,7 @@ tools::SvRef<SotStorageStream> SdModule::GetOptionStream( const OUString& rOptio aURL.Append( "drawing.cfg" ); - SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE ); + SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READWRITE ); if( pStm ) xOptionStorage = new SotStorage( pStm, true ); |