diff options
-rw-r--r-- | forms/source/component/clickableimage.cxx | 21 | ||||
-rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/fileobj.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 1 | ||||
-rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 2 |
11 files changed, 2 insertions, 67 deletions
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 8896be84a802..e58d91443674 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -790,26 +790,12 @@ namespace frm #ifdef USE_REGISTER_TRANSFER if( pObjSh ) { - // Medium registrieren, damit abgebrochen werden kann - pObjSh->RegisterTransfer( *m_pMedium ); - // Target-Frame uebertragen, damit auch javascript:-URLs // "geladen" werden koennen. const SfxMedium *pShMedium = pObjSh->GetMedium(); if( pShMedium ) m_pMedium->SetLoadTargetFrame(pShMedium->GetLoadTargetFrame()); } - else - { - // Keine Object-Shell, aber ein Medium? Dann uebernehmen wir - // zumindest den Referer. - if( xModel.is() ) - { - ::rtl::OUString sReferer( xModel->getURL() ); - if( sReferer.getLength() ) - m_pMedium->SetReferer( OUStringToString(sReferer, CHARSET_SYSTEM) ); - } - } #else if( pObjSh ) { @@ -819,13 +805,6 @@ namespace frm if( pShMedium ) m_pMedium->SetLoadTargetFrame(pShMedium->GetLoadTargetFrame()); } - - if( xModel.is() ) - { - ::rtl::OUString sReferer( xModel->getURL() ); - if( !sReferer.isEmpty() ) - m_pMedium->SetReferer( sReferer ); - } #endif // Downloading-Flag auf sal_True setzen. Es werden dann auch diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index deaa077709d1..abf61a071472 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -122,7 +122,6 @@ public: void SetLoadTargetFrame(SfxFrame* pFrame ); SfxFrame* GetLoadTargetFrame() const; - void SetReferer( const String& rRefer ); void SetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig = sal_False); const SfxFilter* GetFilter() const; const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 1fad0b6a7a2e..29710c659349 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -433,7 +433,6 @@ public: // Transfer IFace void AbortImport(); sal_Bool IsAbortingImport() const; - void RegisterTransfer( SfxMedium& rMedium ); sal_Bool IsReloading() const; void FinishedLoading( sal_uInt16 nWhich = SFX_LOADED_ALL ); void TemplateDisconnectionAfterLoad(); diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index e223d3c868dd..9a9c6ff3cc7d 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -267,8 +267,6 @@ sal_Bool SvFileObject::LoadFile_Impl() xMed->setStreamToLoadFrom( aStreamToLoadFrom.m_xInputStreamToLoadFrom, aStreamToLoadFrom.m_bIsReadOnly); - if( sReferer.Len() ) - xMed->SetReferer( sReferer ); if( !bSynchron ) { diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 7ddd42f93a81..fd6578db27d1 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -225,21 +225,13 @@ IMAPOBJ_SETEVENT: return bNewArea; } - -void SfxHTMLParser::StartFileDownload( const String& rURL, - SfxObjectShell *pSh ) +void SfxHTMLParser::StartFileDownload( const String& rURL, SfxObjectShell* /*pSh*/ ) { DBG_ASSERT( !pDLMedium, "StartFileDownload when active Download" ); if( pDLMedium ) return; pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY ); - if( pSh ) - { - // Register the medium, so that it can be stopped. - pSh->RegisterTransfer( *pDLMedium ); - } - pDLMedium->DownLoad(); } diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 99758f45385f..e8534ad261e0 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -287,7 +287,6 @@ public: const SfxFilter* pOrigFilter; rtl::OUString aOrigURL; - String aReferer; DateTime aExpireTime; SfxFrameWeak wLoadTargetFrame; SvKeyValueIteratorRef xAttributes; @@ -3007,15 +3006,6 @@ const INetURLObject& SfxMedium::GetURLObject() const return *pImp->m_pURLObj; } -//---------------------------------------------------------------- - -void SfxMedium::SetReferer( const String& rRefer ) -{ - pImp->aReferer = rRefer; -} - -//---------------------------------------------------------------- - void SfxMedium::SetExpired_Impl( const DateTime& rDateTime ) { pImp->aExpireTime = rDateTime; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 4a147c51e67a..5aa85a219891 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1043,20 +1043,6 @@ void SfxObjectShell::SetActivateEvent_Impl(sal_uInt16 nId ) pImp->nEventId = nId; } -//-------------------------------------------------------------------- - -void SfxObjectShell::RegisterTransfer( SfxMedium& rMedium ) -/* [Description] - - All media, which are placed in order to load parts of a document must be - registered by a related SfxObjectShell. Thus documents can be canceled. -*/ -{ - rMedium.SetReferer( GetMedium()->GetName() ); -} - -//------------------------------------------------------------------------- - void SfxObjectShell::PrepareReload( ) /* [Description] diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index c0c33fbf800d..c5645fdfe1f1 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1622,9 +1622,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Medium commit." ) ); - // transfer data to its destinated location - // the medium commits the storage or the stream it is based on - RegisterTransfer( rMedium ); bOk = rMedium.Commit(); if ( bOk ) diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 3ee52b021afa..f66a4fbeef53 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -875,7 +875,6 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, // this sourcecode is not responsible for the lifetime of the shell, SfxObjectShellLock should not be used SfxObjectShellRef aRef( pDocSh ); - pDocSh->RegisterTransfer( *pMed ); pMed->DownLoad(); // if necessary: start the download if( aRef.Is() && 1 < aRef->GetRefCount() ) // Ref still valid? { diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 36dfe97d31f4..ecc0f5811340 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1742,10 +1742,6 @@ sal_Bool SwHTMLParser::FileDownload( const String& rURL, // Ein Medium anlegen SfxMedium aDLMedium( rURL, STREAM_READ | STREAM_SHARE_DENYWRITE ); - // Medium registrieren, damit abgebrochen werden kann - if( pDoc->GetDocShell() ) - pDoc->GetDocShell()->RegisterTransfer( aDLMedium ); - SvStream* pStream = aDLMedium.GetInStream(); if( pStream ) { diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 9ca89f8dd4bc..7dfbe0296b59 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2032,7 +2032,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe delete pMedium; return -1; } - pDocSh->RegisterTransfer( *pMedium ); + pMedium->DownLoad(); // ggfs. den DownLoad anstossen if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref? { |