From 2aa9110ed0bf8c4e678caffa1677143b3290240b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 6 May 2015 16:29:44 +0200 Subject: Remove SvStorageRef alias Change-Id: Icd1bf88cefac929916ece9a30b9b65c5297ec2a3 --- filter/source/msfilter/msdffimp.cxx | 8 ++++---- filter/source/msfilter/svxmsbas2.cxx | 2 +- include/sot/storage.hxx | 1 - sd/inc/sdmod.hxx | 2 +- sd/source/filter/eppt/eppt.cxx | 16 ++++++++-------- sd/source/filter/eppt/eppt.hxx | 4 ++-- sd/source/filter/eppt/epptso.cxx | 2 +- sd/source/filter/sdpptwrp.cxx | 6 +++--- starmath/source/document.cxx | 2 +- starmath/source/mathtype.cxx | 2 +- starmath/source/unofilter.cxx | 2 +- svx/source/gallery2/galtheme.cxx | 10 +++++----- sw/source/core/undo/unins.cxx | 2 +- sw/source/filter/ww8/wrtw8esh.cxx | 4 ++-- sw/source/filter/ww8/wrtww8.hxx | 6 +++--- sw/source/filter/ww8/wrtww8gr.cxx | 6 +++--- sw/source/filter/ww8/ww8glsy.hxx | 2 +- sw/source/filter/ww8/ww8par.cxx | 4 ++-- sw/source/filter/ww8/ww8par.hxx | 4 ++-- sw/source/filter/ww8/ww8par4.cxx | 12 ++++++------ sw/source/filter/ww8/ww8par5.cxx | 4 ++-- sw/source/filter/xml/xmlimp.hxx | 2 +- sw/source/uibase/app/docsh.cxx | 2 +- 23 files changed, 52 insertions(+), 53 deletions(-) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index dae1e4f9d34e..b3ebbccdfdff 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6501,7 +6501,7 @@ void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader return; // will be overridden by SJ in Draw } -bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, SvStorageRef&, uno::Reference < embed::XStorage >& ) const +bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, SotStorageRef&, uno::Reference < embed::XStorage >& ) const { return false; } @@ -6521,7 +6521,7 @@ SdrObject* SvxMSDffManager::ImportOLE( long nOLEId, { SdrObject* pRet = 0; OUString sStorageName; - SvStorageRef xSrcStg; + SotStorageRef xSrcStg; ErrCode nError = ERRCODE_NONE; uno::Reference < embed::XStorage > xDstStg; if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg )) @@ -7054,7 +7054,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( aDstStgName += OUString::number( ++nMSOleObjCntr ); { - SvStorageRef xObjStg = rSrcStorage->OpenSotStorage( rStorageName, + SotStorageRef xObjStg = rSrcStorage->OpenSotStorage( rStorageName, STREAM_READWRITE| StreamMode::SHARE_DENYALL ); if( xObjStg.Is() ) { @@ -7144,7 +7144,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( else { // or is it an OLE-1 Stream in the DataStream? - SvStorageRef xObjStor = SotStorage::OpenOLEStorage( xDestStorage, aDstStgName ); + SotStorageRef xObjStor = SotStorage::OpenOLEStorage( xDestStorage, aDstStgName ); //TODO/MBA: remove metafile conversion from ConvertToOle2 //when is this code used?! GDIMetaFile aMtf; diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx index 62be056be3cf..313e76ff27d4 100644 --- a/filter/source/msfilter/svxmsbas2.cxx +++ b/filter/source/msfilter/svxmsbas2.cxx @@ -64,7 +64,7 @@ sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto, sal_uLong SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocSh) { uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() ); - SvStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, GetMSBasicStorageName(), + SotStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, GetMSBasicStorageName(), StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL )); return ( xVBAStg.Is() && !xVBAStg->GetError() ) ? ERRCODE_SVX_VBASIC_STORAGE_EXIST diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index f6d29e270479..3ce2e978fb6a 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -220,7 +220,6 @@ typedef tools::SvRef SotStorageRef; #endif #define SvStorage SotStorage -#define SvStorageRef SotStorageRef #endif // _SVSTOR_HXX diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index cda5f9c78fba..071f54327688 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -137,7 +137,7 @@ protected: SdOptions* pDrawOptions; SvxSearchItem* pSearchItem; SvNumberFormatter* pNumberFormatter; - SvStorageRef xOptionStorage; + SotStorageRef xOptionStorage; bool bWaterCan; SfxErrorHandler* mpErrorHdl; /** This device is used for printer independent layout. It is virtual diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 9e54c56bc59c..8688b6126531 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -66,7 +66,7 @@ using ::com::sun::star::beans::XPropertySet; //============================ PPTWriter ================================== -PPTWriter::PPTWriter( SvStorageRef& rSvStorage, +PPTWriter::PPTWriter( SotStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) : @@ -1278,13 +1278,13 @@ void PPTWriter::ImplWriteOLE( ) ::uno::Reference < embed::XEmbeddedObject > xObj( static_cast(pSdrObj)->GetObjRef() ); if( xObj.is() ) { - SvStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), true ) ); + SotStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), true ) ); aOleExport.ExportOLEObject( xObj, *xTempStorage ); //TODO/MBA: testing OUString aPersistStream( SVEXT_PERSIST_STREAM ); SvMemoryStream aStream; - SvStorageRef xCleanStorage( new SvStorage( false, aStream ) ); + SotStorageRef xCleanStorage( new SvStorage( false, aStream ) ); xTempStorage->CopyTo( xCleanStorage ); // create a dummy content stream, the dummy content is necessary for ppt, but not for // doc files, so we can't share code. @@ -1311,7 +1311,7 @@ void PPTWriter::ImplWriteOLE( ) OUString aName; //Initialize the graphic size which will be used on export ::com::sun::star::awt::Size aSize( pPtr->xShape->getSize() ); - SvStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); + SotStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName ); if ( bOk ) pStrm = xDest->CreateMemoryStream(); @@ -1448,7 +1448,7 @@ bool PPTWriter::ImplWriteAtomEnding() // - exported function - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SotStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) @@ -1462,14 +1462,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) { - SvStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); + SotStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); aMSVBas.SaveOrDelMSVBAStorage( true, OUString( "_MS_VBA_Overhead" ) ); - SvStorageRef xOverhead = xDest->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); + SotStorageRef xOverhead = xDest->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) { - SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); + SotStorageRef xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) { SotStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") ); diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 6be4b515d5f8..7fa831df39c0 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -177,7 +177,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider bool mbFontIndependentLineSpacing; sal_uInt32 mnTextSize; - SvStorageRef mrStg; + SotStorageRef mrStg; SvStream* mpCurUserStrm; SvStream* mpStrm; SvStream* mpPicStrm; @@ -274,7 +274,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; public: - PPTWriter( SvStorageRef& rSvStorage, + PPTWriter( SotStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index a04bc548f135..248a2f314be5 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2505,7 +2505,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ::com::sun::star::awt::Size aSize; OUString aControlName; - SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), true ) ); + SotStorageRef xTemp( new SvStorage( new SvMemoryStream(), true ) ); if ( oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xTemp, aXControlModel, aSize, aControlName ) ) { OUString aUserName( xTemp->GetUserName() ); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 379098391e45..a4da29346f4e 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_Bool ( SAL_CALL *ExportPPTPointer )( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&, +typedef sal_Bool ( SAL_CALL *ExportPPTPointer )( const std::vector< com::sun::star::beans::PropertyValue >&, SotStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, SvMemoryStream*, sal_uInt32 nCnvrtFlags ); @@ -50,7 +50,7 @@ typedef sal_Bool ( SAL_CALL *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& #ifdef DISABLE_DYNLOADING -extern "C" sal_Bool ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&, +extern "C" sal_Bool ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >&, SotStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, SvMemoryStream*, sal_uInt32 nCnvrtFlags ); @@ -82,7 +82,7 @@ bool SdPPTFilter::Import() { /* check if there is a dualstorage, then the document is probably a PPT95 containing PPT97 */ - SvStorageRef xDualStorage; + SotStorageRef xDualStorage; OUString sDualStorage( "PP97_DUALSTORAGE" ); if ( pStorage->IsContained( sDualStorage ) ) { diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 986e109d6ef1..b17665f36a1b 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -724,7 +724,7 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium) { if ( SotStorage::IsStorageFile( pStream ) ) { - SvStorageRef aStorage = new SotStorage( pStream, false ); + SotStorageRef aStorage = new SotStorage( pStream, false ); if ( aStorage->IsStream(OUString("Equation Native")) ) { // is this a MathType Storage? diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 782e0a891ed7..c93abc95dd31 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -1885,7 +1885,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) SvStream *pStream = rMedium.GetOutStream(); if ( pStream ) { - SvStorageRef pStor = new SotStorage( pStream, false ); + SotStorageRef pStor = new SotStorage( pStream, false ); SvGlobalName aGName(0x0002ce02L, 0x0000, 0x0000,0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46 ); diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx index 423c46c7ee4f..c89f21532dd0 100644 --- a/starmath/source/unofilter.cxx +++ b/starmath/source/unofilter.cxx @@ -75,7 +75,7 @@ sal_Bool MathTypeFilter::filter(const uno::Sequence& rDesc { if (SotStorage::IsStorageFile(pStream.get())) { - SvStorageRef aStorage(new SotStorage(pStream.get(), false)); + SotStorageRef aStorage(new SotStorage(pStream.get(), false)); // Is this a MathType Storage? if (aStorage->IsStream(OUString("Equation Native"))) { diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 60ca4c8edd30..e07efdb5903d 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -663,7 +663,7 @@ void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pPr try { - SvStorageRef aTempStorageRef( new SvStorage( false, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) ); + SotStorageRef aTempStorageRef( new SvStorage( false, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) ); aSvDrawStorageRef->CopyTo( aTempStorageRef ); nStorErr = aSvDrawStorageRef->GetError(); } @@ -937,7 +937,7 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool ) if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) ) { const INetURLObject aURL( ImplGetURL( pObject ) ); - SvStorageRef xStor( GetSvDrawStorage() ); + SotStorageRef xStor( GetSvDrawStorage() ); if( xStor.Is() ) { @@ -959,7 +959,7 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool ) bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos ) { INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); - SvStorageRef xStor( GetSvDrawStorage() ); + SotStorageRef xStor( GetSvDrawStorage() ); bool bRet = false; if( xStor.Is() ) @@ -1009,7 +1009,7 @@ bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxMode if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) ) { const INetURLObject aURL( ImplGetURL( pObject ) ); - SvStorageRef xStor( GetSvDrawStorage() ); + SotStorageRef xStor( GetSvDrawStorage() ); if( xStor.Is() ) { @@ -1055,7 +1055,7 @@ bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxMode bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, sal_uIntPtr nInsertPos ) { INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); - SvStorageRef xStor( GetSvDrawStorage() ); + SotStorageRef xStor( GetSvDrawStorage() ); bool bRet = false; if( xStor.Is() ) diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 8889225dda5c..b9dbcc060fa6 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -429,7 +429,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext) case ND_OLENODE: { // StarView does not yet provide an option to copy a StarOBJ - SvStorageRef aRef = new SvStorage( OUString() ); + SotStorageRef aRef = new SvStorage( OUString() ); SwOLEObj& rSwOLE = (SwOLEObj&)static_cast(pCNd)->GetOLEObj(); // temporary storage until object is inserted diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 3a9d1b405235..729d7f2f02de 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -3159,7 +3159,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo aSize.Height = TWIPS_TO_MM(aRect.Bottom()); //Open the ObjectPool - SvStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage( + SotStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage( OUString(SL::aObjectPool), STREAM_READWRITE | StreamMode::SHARE_DENYALL); @@ -3167,7 +3167,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo OUStringBuffer sStorageName; sal_uInt32 nObjId = GenerateObjectID(); sStorageName.append('_').append( static_cast( nObjId )); - SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(), + SotStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(), STREAM_READWRITE|StreamMode::SHARE_DENYALL); if (!xOleStg.Is()) diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index b15f28294021..8aa4c37a859b 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -959,7 +959,7 @@ protected: WW8AttributeOutput *m_pAttrOutput; ///< Converting attributes to stream data private: - SvStorageRef xEscherStg; /// memory leak #i120098#, to hold the reference to unnamed SotStorage obj + SotStorageRef xEscherStg; /// memory leak #i120098#, to hold the reference to unnamed SotStorage obj public: /// Access to the attribute output class. @@ -1049,8 +1049,8 @@ public: void StartCommentOutput( const OUString& rName ); void EndCommentOutput( const OUString& rName ); void OutGrf(const sw::Frame &rFrame); - bool TestOleNeedsGraphic(const SwAttrSet& rSet, SvStorageRef xOleStg, - SvStorageRef xObjStg, OUString &rStorageName, SwOLENode *pOLENd); + bool TestOleNeedsGraphic(const SwAttrSet& rSet, SotStorageRef xOleStg, + SotStorageRef xObjStg, OUString &rStorageName, SwOLENode *pOLENd); virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index aa19fd7956ca..5ac3aada3e15 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -94,7 +94,7 @@ void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ ) } bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, - SvStorageRef xOleStg, SvStorageRef xObjStg, OUString &rStorageName, + SotStorageRef xOleStg, SotStorageRef xObjStg, OUString &rStorageName, SwOLENode *pOLENd) { bool bGraphicNeeded = false; @@ -227,7 +227,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) } pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well. - SvStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage( + SotStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage( OUString(SL::aObjectPool), STREAM_READWRITE | StreamMode::SHARE_DENYALL ); @@ -250,7 +250,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) Set_UInt32(pDataAdr, nPictureId); OUString sStorageName('_'); sStorageName += OUString::number( nPictureId ); - SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName, + SotStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName, STREAM_READWRITE| StreamMode::SHARE_DENYALL ); if( xOleStg.Is() ) { diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index 17a1633d8905..dd4dd376c68c 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -67,7 +67,7 @@ private: WW8GlossaryFib *pGlossary; SotStorageStreamRef xTableStream; SotStorageStreamRef &rStrm; - SvStorageRef xStg; + SotStorageRef xStg; sal_uInt16 nStrings; static bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool bSaveRelFile, diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 1f9f2b34a698..c70366319822 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -578,7 +578,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId, uno::Reference < embed::XStorage > xDstStg; if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg )) { - SvStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName, + SotStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName, STREAM_READWRITE| StreamMode::SHARE_DENYALL ); OSL_ENSURE(rReader.m_pFormImpl, "No Form Implementation!"); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; @@ -6149,7 +6149,7 @@ bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const } bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName, - SvStorageRef& rSrcStorage, uno::Reference < embed::XStorage >& rDestStorage) const + SotStorageRef& rSrcStorage, uno::Reference < embed::XStorage >& rDestStorage) const { bool bRet = false; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index b82dd130b7f2..66ae20fb98d3 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -761,7 +761,7 @@ private: std::map aOldEscherBlipCache; virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName, - SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE; + SotStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE; virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const SAL_OVERRIDE; // #i32596# - new parameter <_nCalledByGroup>, which // indicates, if the OLE object is imported inside a group object @@ -1889,7 +1889,7 @@ public: // eigentlich private, geht aber leider nur public static bool GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc); static void PicRead( SvStream *pDataStream, WW8_PIC *pPic, bool bVer67); - static bool ImportOleWMF( SvStorageRef xSrc1, GDIMetaFile &rWMF, + static bool ImportOleWMF( SotStorageRef xSrc1, GDIMetaFile &rWMF, long &rX, long &rY); static ColorData GetCol(sal_uInt8 nIco); diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index bb5359aab99b..bddb76b1ad8e 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -67,7 +67,7 @@ struct OLE_MFP using namespace ::com::sun::star; -static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) +static bool SwWw8ReadScaling(long& rX, long& rY, SotStorageRef& rSrc1) { // Skalierungsfaktoren holen: // Informationen in PIC-Stream ( durch ausprobieren ) @@ -125,7 +125,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) } static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, - SvStorageRef& rSrc1) + SotStorageRef& rSrc1) { SotStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"), STREAM_STD_READ | StreamMode::NOCREATE); @@ -179,7 +179,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, return true; } -static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1) +static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SotStorageRef& rSrc1) { // 03-META-Stream nicht da. Vielleicht ein 03-PICT ? SotStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT")); @@ -309,7 +309,7 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf, return pFmt; } -bool SwWW8ImplReader::ImportOleWMF(SvStorageRef xSrc1,GDIMetaFile &rWMF, +bool SwWW8ImplReader::ImportOleWMF(SotStorageRef xSrc1,GDIMetaFile &rWMF, long &rX,long &rY) { bool bOk = false; @@ -349,8 +349,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, // ergibt Name "_4711" aSrcStgName += OUString::number( m_nObjLocFc ); - SvStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool)); - SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName, + SotStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool)); + SotStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName, STREAM_READWRITE| StreamMode::SHARE_DENYALL ); if (pGrf) diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 4ff82eb834e2..cdc629fd9ca3 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -605,8 +605,8 @@ sal_uInt16 SwWW8ImplReader::End_Field() OUString sOleId('_'); sOleId += OUString::number( m_aFieldStack.back().mnObjLocFc ); - SvStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool)); - SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, StreamMode::READ ); + SotStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool)); + SotStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, StreamMode::READ ); // Store it now! uno::Reference< embed::XStorage > xDocStg = GetDoc().GetDocStorage(); diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 74588f1b91b6..1da2d5c2416e 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -63,7 +63,7 @@ class SwXMLImport: public SvXMLImport SvXMLItemMapEntriesRef xTableColItemMap; SvXMLItemMapEntriesRef xTableRowItemMap; SvXMLItemMapEntriesRef xTableCellItemMap; - SvStorageRef xPackage; + SotStorageRef xPackage; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xLateInitSettings; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index d85c98de3bc8..07ad1142e228 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -545,7 +545,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) if ( bSave ) { - SvStorageRef xStg = new SotStorage( rMedium.GetOutStream(), false ); + SotStorageRef xStg = new SotStorage( rMedium.GetOutStream(), false ); OSL_ENSURE( !xStg->GetError(), "No storage available for storing VBA macros!" ); if ( !xStg->GetError() ) { -- cgit