diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 16:38:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 11:05:04 +0200 |
| commit | 0241519f323b2b29db747467b8c3d9590c33f0df (patch) | |
| tree | de5e98992f8db0ed8d23f1ff8d972113700295fd /oox | |
| parent | dc47b2e5136f0f767273dc5fdba5c822575e194b (diff) | |
Unwind SotStorageStreamRef typedef
Change-Id: If7652a7c0251b741660365848a717c06954ca419
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 08b126d24f17..4344873d846a 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -473,7 +473,7 @@ MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rInStrm } bool -MSConvertOCXControls::ReadOCXCtlsStream( SotStorageStreamRef& rSrc1, Reference< XFormComponent > & rxFormComp, +MSConvertOCXControls::ReadOCXCtlsStream( tools::SvRef<SotStorageStream>& rSrc1, Reference< XFormComponent > & rxFormComp, sal_Int32 nPos, sal_Int32 nStreamSize) { @@ -527,13 +527,13 @@ bool MSConvertOCXControls::ReadOCXStorage( tools::SvRef<SotStorage>& xOleStg, { if ( xOleStg.Is() ) { - SotStorageStreamRef pNameStream = xOleStg->OpenSotStream( OUString("\3OCXNAME")); + tools::SvRef<SotStorageStream> pNameStream = xOleStg->OpenSotStream( OUString("\3OCXNAME")); BinaryXInputStream aNameStream( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pNameStream ) ), true ); - SotStorageStreamRef pContents = xOleStg->OpenSotStream( OUString("contents")); + tools::SvRef<SotStorageStream> pContents = xOleStg->OpenSotStream( OUString("contents")); BinaryXInputStream aInStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pContents ) ), true ); - SotStorageStreamRef pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj")); + tools::SvRef<SotStorageStream> 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, t rName = exportHelper.getTypeName(); xOleStg->SetClass( aName, SotClipboardFormatId::EMBEDDED_OBJ_OLE, sFullName); { - SotStorageStreamRef pNameStream = xOleStg->OpenSotStream(OUString("\3OCXNAME")); + tools::SvRef<SotStorageStream> pNameStream = xOleStg->OpenSotStream(OUString("\3OCXNAME")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pNameStream ); exportHelper.exportName( xOut ); } { - SotStorageStreamRef pObjStream = xOleStg->OpenSotStream(OUString("\1CompObj")); + tools::SvRef<SotStorageStream> pObjStream = xOleStg->OpenSotStream(OUString("\1CompObj")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pObjStream ); exportHelper.exportCompObj( xOut ); } { - SotStorageStreamRef pContents = xOleStg->OpenSotStream(OUString("contents")); + tools::SvRef<SotStorageStream> pContents = xOleStg->OpenSotStream(OUString("contents")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pContents ); exportHelper.exportControl( xOut, rSize ); } |