Kaydet (Commit) 1aae9d16 authored tarafından Caolán McNamara's avatar Caolán McNamara

remove extra arg and method

üst 67161578
...@@ -43,8 +43,6 @@ class SfxObjectShell; ...@@ -43,8 +43,6 @@ class SfxObjectShell;
class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
{ {
DECL_DLLPRIVATE_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void* );
String aScriptType; String aScriptType;
SfxMedium* pMedium; SfxMedium* pMedium;
...@@ -92,8 +90,7 @@ protected: ...@@ -92,8 +90,7 @@ protected:
// up by FinishFileDownload. To cancel the download should a shell be // 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 // left. It can only exist a single download at the same time, For every
// started download FinshFileDownload must be called. // started download FinshFileDownload must be called.
void StartFileDownload( const String& rURL, int nToken, void StartFileDownload( const String& rURL, SfxObjectShell *pSh=0 );
SfxObjectShell *pSh=0 );
// End of an asynchronous file download. Returns TRUE if the download // End of an asynchronous file download. Returns TRUE if the download
// was successful. The read file is then passed into String. // was successful. The read file is then passed into String.
......
...@@ -239,7 +239,7 @@ IMAPOBJ_SETEVENT: ...@@ -239,7 +239,7 @@ IMAPOBJ_SETEVENT:
} }
void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken, void SfxHTMLParser::StartFileDownload( const String& rURL,
SfxObjectShell *pSh ) SfxObjectShell *pSh )
{ {
DBG_ASSERT( !pDLMedium, "StartFileDownload when active Download" ); DBG_ASSERT( !pDLMedium, "StartFileDownload when active Download" );
...@@ -290,18 +290,6 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr ) ...@@ -290,18 +290,6 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr )
return bOK; 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 ) void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
{ {
aScriptType = DEFINE_CONST_UNICODE(SVX_MACRO_LANGUAGE_JAVASCRIPT); aScriptType = DEFINE_CONST_UNICODE(SVX_MACRO_LANGUAGE_JAVASCRIPT);
......
...@@ -1836,7 +1836,7 @@ void SwHTMLParser::InsertLink() ...@@ -1836,7 +1836,7 @@ void SwHTMLParser::InsertLink()
if( GetMedium() ) if( GetMedium() )
{ {
// Download des Style-Source starten // Download des Style-Source starten
StartFileDownload( sHRef, 0, pDoc->GetDocShell() ); StartFileDownload(sHRef, pDoc->GetDocShell());
if( IsParserWorking() ) if( IsParserWorking() )
{ {
// Der Style wurde synchron geladen und wir koennen // Der Style wurde synchron geladen und wir koennen
......
...@@ -939,7 +939,6 @@ SfxFrameDescriptor::TakeProperties(SfxFrameProperties const&) ...@@ -939,7 +939,6 @@ SfxFrameDescriptor::TakeProperties(SfxFrameProperties const&)
SfxFrameHTMLWriter::CreateURL(SfxFrame*) SfxFrameHTMLWriter::CreateURL(SfxFrame*)
SfxFrameProperties::SfxFrameProperties(SfxFrameDescriptor const*) SfxFrameProperties::SfxFrameProperties(SfxFrameDescriptor const*)
SfxFrameWindow_Impl::LinkStubCloserHdl(void*, void*) SfxFrameWindow_Impl::LinkStubCloserHdl(void*, void*)
SfxHTMLParser::FileDownloadDone(SfxHTMLParser*, void*)
SfxHintPoster::SfxHintPoster() SfxHintPoster::SfxHintPoster()
SfxImageItem::GetURL() const SfxImageItem::GetURL() const
SfxImageItem::SfxImageItem(unsigned short, String const&) SfxImageItem::SfxImageItem(unsigned short, String const&)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment