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

1 files changed, 9 insertions, 35 deletions

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 403fa24f06..acc67b0bcc 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;
 
@@ -936,7 +930,7 @@ void SfxMedium::StorageBackup_Impl()
 {
     if ( !pImp->m_aBackupURL.getLength() )
         StorageBackup_Impl();
-    
+
     return pImp->m_aBackupURL;
 }
 
@@ -1016,7 +1010,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage()
             {
                 // the storage will be based on original file, the wrapper should be used
                 xStream = new OPostponedTruncationFileStream( aOutputURL, xFactory, xSimpleFileAccess, sal_True );
-            } 
+            }
             else
             {
                 // the storage will be based on the temporary file, the stream can be truncated directly
@@ -2236,7 +2230,7 @@ void SfxMedium::GetMedium_Impl()
                 pImp->xInputStream->skipBytes(0);
                 if(m_bIsReadOnly)
                     GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
-                
+
                 // m_xInputStreamToLoadFrom = 0;
             }
             else
@@ -2254,7 +2248,7 @@ void SfxMedium::GetMedium_Impl()
                 sal_Bool bReadOnly = aMedium.isStreamReadOnly();
                 if ( bReadOnly && !bFromTempFile )
                     GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
-                
+
                 //TODO/MBA: what happens if property is not there?!
                 GetContent();
                 aMedium[comphelper::MediaDescriptor::PROP_STREAM()] >>= pImp->xStream;
@@ -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( )
@@ -3511,7 +3485,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent )
                                                                     nEncrMode );
                     if ( !xStream.is() )
                         throw uno::RuntimeException();
-                
+
                     if ( xD->signScriptingContent( GetLastCommitReadStorage_Impl(), xStream ) )
                     {
                         uno::Reference< embed::XTransactedObject > xTrans( xMetaInf, uno::UNO_QUERY );
@@ -3532,7 +3506,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent )
                                                                     nEncrMode );
                     if ( !xStream.is() )
                         throw uno::RuntimeException();
-    
+
                     if ( xD->signDocumentContent( GetLastCommitReadStorage_Impl(), xStream ) )
                     {
                         uno::Reference< embed::XTransactedObject > xTrans( xMetaInf, uno::UNO_QUERY );