diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-18 21:15:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-19 09:30:43 +0100 |
| commit | 1aae9d1634909cba0e3825fab289479a21e48fbc (patch) | |
| tree | 2d61b00a1acc08d4718ad5a87b20f6b56709b25c /sfx2 | |
| parent | 671615786f1bd832bfd612dd3b4204e78de1e073 (diff) | |
remove extra arg and method
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/sfxhtml.hxx | 5 | ||||
| -rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 14 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 88e3cecf026e..bd64f8038adc 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -43,8 +43,6 @@ class SfxObjectShell; class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser { - DECL_DLLPRIVATE_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void* ); - String aScriptType; SfxMedium* pMedium; @@ -92,8 +90,7 @@ protected: // up by FinishFileDownload. To cancel the download should a shell be // left. It can only exist a single download at the same time, For every // started download FinshFileDownload must be called. - void StartFileDownload( const String& rURL, int nToken, - SfxObjectShell *pSh=0 ); + void StartFileDownload( const String& rURL, SfxObjectShell *pSh=0 ); // End of an asynchronous file download. Returns TRUE if the download // was successful. The read file is then passed into String. diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 78e29be661cf..c575b7f755f0 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -239,7 +239,7 @@ IMAPOBJ_SETEVENT: } -void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken, +void SfxHTMLParser::StartFileDownload( const String& rURL, SfxObjectShell *pSh ) { DBG_ASSERT( !pDLMedium, "StartFileDownload when active Download" ); @@ -290,18 +290,6 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr ) return bOK; } -IMPL_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void*, EMPTYARG ) -{ - // The Download is now completed. also the Data-Available-Link - // must or are allowed to be passed through. - pThis->SetDownloadingFile( sal_False ); - - // ... and call once, thus will continue reading. - pThis->CallAsyncCallLink(); - - return 0; -} - void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader ) { aScriptType = DEFINE_CONST_UNICODE(SVX_MACRO_LANGUAGE_JAVASCRIPT); |