diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 16:29:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 11:05:03 +0200 |
| commit | 2aa9110ed0bf8c4e678caffa1677143b3290240b (patch) | |
| tree | 60167bf24aa2f594a18e3326823faf09a32b200d /filter | |
| parent | 60bbbcabed5ddf477a17970af79f464fc5e98753 (diff) | |
Remove SvStorageRef alias
Change-Id: Icd1bf88cefac929916ece9a30b9b65c5297ec2a3
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 | ||||
| -rw-r--r-- | filter/source/msfilter/svxmsbas2.cxx | 2 |
2 files changed, 5 insertions, 5 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 |