diff options
Diffstat (limited to 'sot/source/sdstor/stg.cxx')
| -rw-r--r-- | sot/source/sdstor/stg.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 682aa08f504f..2b3e9a146908 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -684,7 +684,7 @@ bool Storage::CopyTo( const OUString& rElem, BaseStorage* pDest, const OUString& if( !nTmpErr ) { p2->SetClassId( p1->GetClassId() ); - p1->CopyTo( p2.get() ); + p1->CopyTo( *p2 ); SetError( p1->GetError() ); nTmpErr = p2->GetError(); @@ -730,27 +730,27 @@ bool Storage::CopyTo( const OUString& rElem, BaseStorage* pDest, const OUString& return false; } -bool Storage::CopyTo( BaseStorage* pDest ) const +bool Storage::CopyTo( BaseStorage& rDest ) const { - if( !Validate() || !pDest || !pDest->Validate( true ) || Equals( *pDest ) ) + if( !Validate() || !rDest.Validate( true ) || Equals( rDest ) ) { SetError( SVSTREAM_ACCESS_DENIED ); return false; } Storage* pThis = const_cast<Storage*>(this); - pDest->SetClassId( GetClassId() ); - pDest->SetDirty(); + rDest.SetClassId( GetClassId() ); + rDest.SetDirty(); SvStorageInfoList aList; FillInfoList( &aList ); bool bRes = true; for( size_t i = 0; i < aList.size() && bRes; i++ ) { SvStorageInfo& rInfo = aList[ i ]; - bRes = pThis->CopyTo( rInfo.GetName(), pDest, rInfo.GetName() ); + bRes = pThis->CopyTo( rInfo.GetName(), &rDest, rInfo.GetName() ); } if( !bRes ) - SetError( pDest->GetError() ); - return Good() && pDest->Good(); + SetError( rDest.GetError() ); + return Good() && rDest.Good(); } bool Storage::IsStorage( const OUString& rName ) const |