diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 15:41:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 15:41:30 +0000 |
| commit | b8a0bd0a37828863a4b41d51cfc84ba0eb0aad11 (patch) | |
| tree | b1d8dbd1cafc478498e5275880a2f27fcb3f83ae /sfx2 | |
| parent | 5c0dfa7d984bd8a8ec02015331818156905f22f5 (diff) | |
INTEGRATION: CWS sfxcleanup (1.176.34); FILE MERGED
2006/04/28 13:35:41 mba 1.176.34.3: RESYNC: (1.176-1.178); FILE MERGED
2006/03/31 12:26:20 mba 1.176.34.2: #132394#: remove superfluous code
2006/03/31 12:23:46 mba 1.176.34.1: #132394#: remove superfluous code
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 367191f46a4f..6c8464d30faa 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docfile.cxx,v $ * - * $Revision: 1.178 $ + * $Revision: 1.179 $ * - * last change: $Author: obo $ $Date: 2006-03-27 09:35:31 $ + * last change: $Author: rt $ $Date: 2006-05-02 16:41:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -229,9 +229,6 @@ using namespace ::com::sun::star::io; #include "openflag.hxx" // SFX_STREAM_READONLY etc. #include "sfxresid.hxx" #include "appuno.hxx" -#ifndef _EXTATTR_HXX -#include "extattr.hxx" -#endif //#include "xmlversion.hxx" @@ -367,7 +364,6 @@ public: SfxPoolCancelManager_ImplRef xCancelManager; SfxMedium* pAntiImpl; - SvEaMgr* pEaMgr; long nFileVersion; @@ -446,7 +442,7 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) bForceSynchron( sal_False ), bIsStorage( sal_False ), pAntiImpl( pAntiImplP ), bDontCreateCancellable( sal_False ), pTempDir( NULL ), - bDownloadDone( sal_True ), bDontCallDoneLinkOnSharingError( sal_False ),nFileVersion( 0 ), pEaMgr( NULL ), pTempFile( NULL ), + bDownloadDone( sal_True ), bDontCallDoneLinkOnSharingError( sal_False ),nFileVersion( 0 ), pTempFile( NULL ), nLastStorageError( 0 ), bIsCharsetInitialized( sal_False ), bUseInteractionHandler( sal_True ), @@ -466,8 +462,6 @@ SfxMedium_Impl::~SfxMedium_Impl() aDoneLink.ClearPendingCall(); aAvailableLink.ClearPendingCall(); - delete pEaMgr; - if ( pTempFile ) delete pTempFile; @@ -2505,9 +2499,6 @@ SfxMedium::SfxMedium( const SfxMedium& rMedium, sal_Bool bTemporary ) Init_Impl(); if( bTemporary ) CreateTempFile(); - - if ( rMedium.pImp->pEaMgr ) - GetEaMgr(); } //------------------------------------------------------------------ @@ -3108,23 +3099,6 @@ sal_Bool SfxMedium::IsDownloadDone_Impl() return pImp->bDownloadDone; } -SvEaMgr* SfxMedium::GetEaMgr() -{ - if ( !pImp->pEaMgr && pFilter ) - { - /* the stream in the storage is probably not a filestream ( the stream is - closed anyway! ). Therefor we will always use GetPhysicalName to - create the SvEaMgr. */ - // SvStream *pStream = aStorage.Is() ? aStorage->GetTargetSvStream() : NULL; - // if ( pStream && pStream->IsA() == ID_FILESTREAM ) - // pImp->pEaMgr = new SvEaMgr(*(SvFileStream *)pStream); - // else - pImp->pEaMgr = new SvEaMgr( GetPhysicalName() ); - } - - return pImp->pEaMgr; -} - //---------------------------------------------------------------- void SfxMedium::SetDontCreateCancellable( ) |