diff options
25 files changed, 56 insertions, 57 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 14656b01a337..456245cb666b 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2007,7 +2007,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( if( rStg.Is() && rStg->IsStream( sStrmName ) ) { - SvStorageStreamRef xStrm = rStg->OpenSotStream( sTmp, + SotStorageStreamRef xStrm = rStg->OpenSotStream( sTmp, ( StreamMode::READ | StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE ) ); if( SVSTREAM_OK != xStrm->GetError()) { @@ -2452,7 +2452,7 @@ bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg ) bool bRet = true, bRemove = !pAutocorr_List || pAutocorr_List->empty(); if( !bRemove ) { - SvStorageStreamRef refList = rStg.OpenSotStream( sStrmName, + SotStorageStreamRef refList = rStg.OpenSotStream( sStrmName, ( StreamMode::READ | StreamMode::WRITE | StreamMode::SHARE_DENYWRITE ) ); if( refList.Is() ) { diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8e757f7b5916..dae1e4f9d34e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7060,7 +7060,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( { { sal_uInt8 aTestA[10]; // exist the \1CompObj-Stream ? - SvStorageStreamRef xSrcTst = xObjStg->OpenSotStream( OUString( "\1CompObj" ) ); + SotStorageStreamRef xSrcTst = xObjStg->OpenSotStream( OUString( "\1CompObj" ) ); bValidStorage = xSrcTst.Is() && sizeof( aTestA ) == xSrcTst->Read( aTestA, sizeof( aTestA ) ); if( !bValidStorage ) @@ -7081,7 +7081,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( // is a kind of embedded objects in Word documents // TODO/LATER: should the caller be notified if the aspect changes in future? - SvStorageStreamRef xObjInfoSrc = xObjStg->OpenSotStream( + SotStorageStreamRef xObjInfoSrc = xObjStg->OpenSotStream( OUString( "\3ObjInfo" ), STREAM_STD_READ | StreamMode::NOCREATE ); if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() ) { diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index e2d7e226b28e..c3ba3b0b191d 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -222,7 +222,6 @@ typedef tools::SvRef<SotStorage> SotStorageRef; #define SvStorage SotStorage #define SvStorageRef SotStorageRef #define SvStorageStream SotStorageStream -#define SvStorageStreamRef SotStorageStreamRef #endif // _SVSTOR_HXX diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 6e246ca8c160..dc5bda3dd4e5 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -527,13 +527,13 @@ bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg, { if ( xOleStg.Is() ) { - SvStorageStreamRef pNameStream = xOleStg->OpenSotStream( OUString("\3OCXNAME")); + SotStorageStreamRef pNameStream = xOleStg->OpenSotStream( OUString("\3OCXNAME")); BinaryXInputStream aNameStream( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pNameStream ) ), true ); - SvStorageStreamRef pContents = xOleStg->OpenSotStream( OUString("contents")); + SotStorageStreamRef pContents = xOleStg->OpenSotStream( OUString("contents")); BinaryXInputStream aInStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pContents ) ), true ); - SvStorageStreamRef pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj")); + SotStorageStreamRef pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj")); BinaryXInputStream aClsStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper(*pClsStrm ) ), true ); aClsStrm.skip(12); @@ -588,17 +588,17 @@ bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, S rName = exportHelper.getTypeName(); xOleStg->SetClass( aName, SotClipboardFormatId::EMBEDDED_OBJ_OLE, sFullName); { - SvStorageStreamRef pNameStream = xOleStg->OpenSotStream(OUString("\3OCXNAME")); + SotStorageStreamRef pNameStream = xOleStg->OpenSotStream(OUString("\3OCXNAME")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pNameStream ); exportHelper.exportName( xOut ); } { - SvStorageStreamRef pObjStream = xOleStg->OpenSotStream(OUString("\1CompObj")); + SotStorageStreamRef pObjStream = xOleStg->OpenSotStream(OUString("\1CompObj")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pObjStream ); exportHelper.exportCompObj( xOut ); } { - SvStorageStreamRef pContents = xOleStg->OpenSotStream(OUString("contents")); + SotStorageStreamRef pContents = xOleStg->OpenSotStream(OUString("contents")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pContents ); exportHelper.exportControl( xOut, rSize ); } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 7b27ddce9323..58d486e609a0 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -384,7 +384,7 @@ void ImportExcel8::ReadBasic() rFilterOpt.IsLoadExcelBasicExecutable() ) { // see if we have the XCB stream - SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | StreamMode::NOCREATE ); + SotStorageStreamRef xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | StreamMode::NOCREATE ); if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() ) { ScCTBWrapper wrapper; diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index c99acded1fa4..cda5f9c78fba 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -98,7 +98,7 @@ public: void GetState(SfxItemSet&); SdOptions* GetSdOptions(DocumentType eDocType); - SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode ); + SD_DLLPUBLIC SotStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode ); bool GetWaterCan() const { return bWaterCan; } void SetWaterCan( bool bWC ) { bWaterCan = bWC; } diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 7ce4bf48d9f4..9e54c56bc59c 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1472,7 +1472,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) { - SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") ); + SotStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") ); if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) { sal_uInt32 nLen = xTemp->GetSize(); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 5f1d5bbb2a1e..a04bc548f135 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2512,7 +2512,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a OUString aOleIdentifier; if ( !aUserName.isEmpty() ) { - SvStorageStreamRef xCompObj = xTemp->OpenSotStream( + SotStorageStreamRef xCompObj = xTemp->OpenSotStream( OUString( "\1CompObj" ), StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL ); sal_uInt32 const nStreamLen = xCompObj->remainingSize(); diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index ed968bca3ff2..fbd619d771aa 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -139,7 +139,7 @@ class Section class PropRead { bool mbStatus; - SvStorageStreamRef mpSvStream; + SotStorageStreamRef mpSvStream; sal_uInt16 mnByteOrder; sal_uInt16 mnFormat; diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index e746db3dfa5d..300c35cb2cd9 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -586,7 +586,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) // get the input stream (storage or stream) - SvStorageStreamRef xDocStream; + SotStorageStreamRef xDocStream; Reference<io::XInputStream> xInputStream; uno::Reference < embed::XStorage > xStorage = mrMedium.GetStorage(); diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 422e2a89153b..d4177d68925c 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -172,11 +172,11 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) * if the stream is opened for reading but does not exist, an 'empty' * RefObject is returned */ -SvStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName, +SotStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode ) { ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); - SvStorageStreamRef xStm; + SotStorageStreamRef xStm; if( pDocSh ) { diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index ebd28b18dad1..b3dc63b2b30e 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -79,7 +79,7 @@ void MorphDlg::dispose() void MorphDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , + SotStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , SD_OPTION_LOAD ) ); sal_uInt16 nSteps; bool bOrient, bAttrib; @@ -103,7 +103,7 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , + SotStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , SD_OPTION_STORE ) ); if( xOStm.Is() ) diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index cf69318f7e6e..7d8245e78e56 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl) void SdVectorizeDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( + SotStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString( SD_OPTION_VECTORIZE ) , SD_OPTION_LOAD ) ); sal_uInt16 nLayers; @@ -343,7 +343,7 @@ void SdVectorizeDlg::LoadSettings() void SdVectorizeDlg::SaveSettings() const { - SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( + SotStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_VECTORIZE) , SD_OPTION_STORE ) ); diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 3a052c16841c..ddc1367f9ab6 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -128,7 +128,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener virtual void OnDocumentPrinterChanged( Printer * ) SAL_OVERRIDE; virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE; - void ImplSave( SvStorageStreamRef xStrm ); + void ImplSave( SotStorageStreamRef xStrm ); virtual bool Save() SAL_OVERRIDE; virtual bool SaveAs( SfxMedium& rMedium ) SAL_OVERRIDE; virtual bool ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE; diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index 744032b211a2..7f3c2aa99459 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -32,7 +32,7 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) // code snippet copied from MathType::Parse - SvStorageStreamRef xSrc = pStor->OpenSotStream( + SotStorageStreamRef xSrc = pStor->OpenSotStream( OUString("Equation Native"), STREAM_STD_READ | StreamMode::NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 43aed7833610..782e0a891ed7 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -554,7 +554,7 @@ void MathType::TypeFaceToString(OUString &rTxt,sal_uInt8 nFace) int MathType::Parse(SotStorage *pStor) { - SvStorageStreamRef xSrc = pStor->OpenSotStream( + SotStorageStreamRef xSrc = pStor->OpenSotStream( OUString("Equation Native"), STREAM_STD_READ | StreamMode::NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) @@ -1906,7 +1906,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) 0xB2, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - SvStorageStreamRef xStor( pStor->OpenSotStream(OUString("\1CompObj"))); + SotStorageStreamRef xStor( pStor->OpenSotStream(OUString("\1CompObj"))); xStor->Write(aCompObj,sizeof(aCompObj)); static sal_uInt8 const aOle[] = { @@ -1914,12 +1914,12 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - SvStorageStreamRef xStor2( pStor->OpenSotStream(OUString("\1Ole"))); + SotStorageStreamRef xStor2( pStor->OpenSotStream(OUString("\1Ole"))); xStor2->Write(aOle,sizeof(aOle)); xStor.Clear(); xStor2.Clear(); - SvStorageStreamRef xSrc = pStor->OpenSotStream(OUString("Equation Native")); + SotStorageStreamRef xSrc = pStor->OpenSotStream(OUString("Equation Native")); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return 0; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index ba1d23e2b317..60ca4c8edd30 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -576,7 +576,7 @@ void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pPr if ( aSvDrawStorageRef.Is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( pEntry->aURL ) ); - SvStorageStreamRef pIStm = aSvDrawStorageRef->OpenSotStream( aStmName, StreamMode::READ ); + SotStorageStreamRef pIStm = aSvDrawStorageRef->OpenSotStream( aStmName, StreamMode::READ ); if( pIStm && !pIStm->GetError() ) { @@ -942,7 +942,7 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool ) if( xStor.Is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); - SvStorageStreamRef xIStm( xStor->OpenSotStream( aStmName, StreamMode::READ ) ); + SotStorageStreamRef xIStm( xStor->OpenSotStream( aStmName, StreamMode::READ ) ); if( xIStm.Is() && !xIStm->GetError() ) { @@ -965,7 +965,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo if( xStor.Is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); - SvStorageStreamRef xOStm( xStor->OpenSotStream( aStmName, StreamMode::WRITE | StreamMode::TRUNC ) ); + SotStorageStreamRef xOStm( xStor->OpenSotStream( aStmName, StreamMode::WRITE | StreamMode::TRUNC ) ); if( xOStm.Is() && !xOStm->GetError() ) { @@ -1014,7 +1014,7 @@ bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxMode if( xStor.Is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); - SvStorageStreamRef xIStm( xStor->OpenSotStream( aStmName, StreamMode::READ ) ); + SotStorageStreamRef xIStm( xStor->OpenSotStream( aStmName, StreamMode::READ ) ); if( xIStm.Is() && !xIStm->GetError() ) { @@ -1061,7 +1061,7 @@ bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, if( xStor.Is() ) { const OUString aStmName( GetSvDrawStreamNameFromURL( aURL ) ); - SvStorageStreamRef xOStm( xStor->OpenSotStream( aStmName, StreamMode::WRITE | StreamMode::TRUNC ) ); + SotStorageStreamRef xOStm( xStor->OpenSotStream( aStmName, StreamMode::WRITE | StreamMode::TRUNC ) ); if( xOStm.Is() && !xOStm->GetError() ) { diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index a09678f41a05..ba224a520b08 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3130,8 +3130,8 @@ void WW8Export::ExportDocument_Impl() pFib = new WW8Fib( bWrtWW8 ? 8 : 6, m_bDot ); - SvStorageStreamRef xWwStrm( GetWriter().GetStorage().OpenSotStream( m_aMainStg ) ); - SvStorageStreamRef xTableStrm( xWwStrm ), xDataStrm( xWwStrm ); + SotStorageStreamRef xWwStrm( GetWriter().GetStorage().OpenSotStream( m_aMainStg ) ); + SotStorageStreamRef xTableStrm( xWwStrm ), xDataStrm( xWwStrm ); xWwStrm->SetBufferSize( 32768 ); if( bWrtWW8 ) @@ -3381,7 +3381,7 @@ void WW8Export::PrepareStorage() SvGlobalName aGName( nId1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ); GetWriter().GetStorage().SetClass( aGName, SotClipboardFormatId::NONE, OUString::createFromAscii( pName )); - SvStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) ); + SotStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) ); xStor->Write( pData, nLen ); SwDocShell* pDocShell = m_pDoc->GetDocShell (); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index ed94c91a4851..aa19fd7956ca 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -269,7 +269,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) if ( !xOleStg->IsStream( aObjInfo ) ) { const sal_uInt8 pObjInfoData[] = { 0x40, 0x00, 0x03, 0x00 }; - SvStorageStreamRef rObjInfoStream = xOleStg->OpenSotStream( aObjInfo ); + SotStorageStreamRef rObjInfoStream = xOleStg->OpenSotStream( aObjInfo ); if ( rObjInfoStream.Is() && !rObjInfoStream->GetError() ) { rObjInfoStream->Write( pObjInfoData, sizeof( pObjInfoData ) ); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 32ac0eaebc9d..f93ab799de8f 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -33,7 +33,7 @@ #include "ww8glsy.hxx" #include "ww8par.hxx" -WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion, +WW8Glossary::WW8Glossary(SotStorageStreamRef &refStrm, sal_uInt8 nVersion, SvStorage *pStg) : pGlossary(0), rStrm(refStrm), xStg(pStg), nStrings(0) { diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index 38557d567ac3..17a1633d8905 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -57,7 +57,7 @@ private: class WW8Glossary { public: - WW8Glossary( SvStorageStreamRef &refStrm, sal_uInt8 nVersion, SvStorage *pStg=0); + WW8Glossary( SotStorageStreamRef &refStrm, sal_uInt8 nVersion, SvStorage *pStg=0); bool Load( SwTextBlocks &rBlocks, bool bSaveRelFile ); ~WW8Glossary() { delete pGlossary; } WW8GlossaryFib *GetFib() { return pGlossary; } @@ -65,8 +65,8 @@ public: private: WW8GlossaryFib *pGlossary; - SvStorageStreamRef xTableStream; - SvStorageStreamRef &rStrm; + SotStorageStreamRef xTableStream; + SotStorageStreamRef &rStrm; SvStorageRef xStg; sal_uInt16 nStrings; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index a29e78fb0319..1f9f2b34a698 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4849,10 +4849,10 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, aBasicImporter.import( m_pDocShell->GetMedium()->GetInputStream() ); lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() ); // Read toolbars & menus - SvStorageStreamRef refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" )); + SotStorageStreamRef refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" )); refMainStream->SetEndian(SvStreamEndian::LITTLE); WW8Fib aWwFib( *refMainStream, 8 ); - SvStorageStreamRef xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); + SotStorageStreamRef xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) { @@ -5352,8 +5352,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) return nErrRet; } -sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream, - SvStorageStreamRef &rDataStream) +sal_uLong SwWW8ImplReader::SetSubStreams(SotStorageStreamRef &rTableStream, + SotStorageStreamRef &rDataStream) { sal_uLong nErrRet = 0; // 6 stands for "6 OR 7", 7 stands for "ONLY 7" @@ -5584,7 +5584,7 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos if (m_pWwFib->nFibError) nErrRet = ERR_SWG_READ_ERROR; - SvStorageStreamRef xTableStream, xDataStream; + SotStorageStreamRef xTableStream, xDataStream; if (!nErrRet) nErrRet = SetSubStreams(xTableStream, xDataStream); @@ -6027,7 +6027,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOC() return new WW8Reader(); } -sal_uLong WW8Reader::OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuffSize ) +sal_uLong WW8Reader::OpenMainStream( SotStorageStreamRef& rRef, sal_uInt16& rBuffSize ) { sal_uLong nRet = ERR_SWG_READ_ERROR; OSL_ENSURE( pStg, "Where is my Storage?" ); @@ -6053,7 +6053,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, co sal_uInt16 nOldBuffSize = 32768; bool bNew = !bInsertMode; // New Doc (no inserting) - SvStorageStreamRef refStrm; // So that no one else can steal the Stream + SotStorageStreamRef refStrm; // So that no one else can steal the Stream SvStream* pIn = pStrm; sal_uLong nRet = 0; @@ -6139,7 +6139,7 @@ bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const WW8Reader *pThis = const_cast<WW8Reader *>(this); sal_uInt16 nOldBuffSize = 32768; - SvStorageStreamRef refStrm; + SotStorageStreamRef refStrm; if (!pThis->OpenMainStream(refStrm, nOldBuffSize)) { WW8Glossary aGloss( refStrm, 8, pStg ); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index bc3da9dc7387..b82dd130b7f2 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -130,7 +130,7 @@ struct WW8LFOInfo; class WW8Reader : public StgReader { virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; - sal_uLong OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuffSize ); + sal_uLong OpenMainStream( SotStorageStreamRef& rRef, sal_uInt16& rBuffSize ); public: virtual int GetReaderType() SAL_OVERRIDE; @@ -1536,7 +1536,7 @@ private: void ImportDopTypography(const WW8DopTypography &rTypo); sal_uLong LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss); - sal_uLong SetSubStreams(SvStorageStreamRef &rTableStream, SvStorageStreamRef &rDataStream); + sal_uLong SetSubStreams(SotStorageStreamRef &rTableStream, SotStorageStreamRef &rDataStream); sal_uLong CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos); void ReadDocVars(); diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 52173692c22a..693b8885630e 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -82,7 +82,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) // 0x2c, 0x30 Skalierung x,y in Promille // 0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw - SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( OUString("\3PIC"), + SotStorageStreamRef xSrc3 = rSrc1->OpenSotStream( OUString("\3PIC"), STREAM_STD_READ | StreamMode::NOCREATE); SvStorageStream* pS = xSrc3; pS->SetEndian( SvStreamEndian::LITTLE ); @@ -127,7 +127,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, SvStorageRef& rSrc1) { - SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"), + SotStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"), STREAM_STD_READ | StreamMode::NOCREATE); SvStorageStream* pSt = xSrc2; pSt->SetEndian( SvStreamEndian::LITTLE ); @@ -182,7 +182,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1) { // 03-META-Stream nicht da. Vielleicht ein 03-PICT ? - SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT")); + SotStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT")); SvStorageStream* pStp = xSrc4; pStp->SetEndian( SvStreamEndian::LITTLE ); sal_uInt8 aTestA[10]; // Ist der 01Ole-Stream ueberhaupt vorhanden @@ -424,7 +424,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; { - SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(OUString("\3ObjInfo"), + SotStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(OUString("\3ObjInfo"), STREAM_STD_READ | StreamMode::NOCREATE ); if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() ) { diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 7329a0e5823a..1c9a4b7e40b0 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -79,7 +79,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& // Get data sink ... uno::Reference< io::XOutputStream > xOut; - SvStorageStreamRef xDocStream; + SotStorageStreamRef xDocStream; uno::Reference< document::XGraphicObjectResolver > xGraphicResolver; SvXMLGraphicHelper *pGraphicHelper = 0; uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; |