summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-04-10 14:49:52 +0200
committerJan Holesovsky <kendy@collabora.com>2014-04-10 15:07:53 +0200
commit31911865e5bda29ff2394ddf80244fbf15517657 (patch)
treea543512d1b65a6007ff80238c1759812aea30a38 /sfx2
parent148d5192fc5d57c10045b837cc245fc018f13f64 (diff)
DownLoad -> Download.
Change-Id: Ia1729f570cc80a0375532da6478de9d58518556e
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/fileobj.cxx16
-rw-r--r--sfx2/source/appl/fileobj.hxx2
-rw-r--r--sfx2/source/appl/opengrf.cxx2
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx2
5 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index e9670aedc584..e123285cbd03 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -58,7 +58,7 @@ SvFileObject::SvFileObject()
, bNativFormat(false)
, bClearMedium(false)
, bStateChangeCalled(false)
- , bInCallDownLoad(false)
+ , bInCallDownload(false)
{
}
@@ -111,7 +111,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
if( !xMed.Is() )
LoadFile_Impl();
- if( !bInCallDownLoad )
+ if( !bInCallDownload )
{
xTmpMed = xMed;
while( bWaitForData )
@@ -263,19 +263,19 @@ bool SvFileObject::LoadFile_Impl()
bWaitForData = true;
SfxMediumRef xTmpMed = xMed;
- bInCallDownLoad = true;
- xMed->DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
- bInCallDownLoad = false;
+ bInCallDownload = true;
+ xMed->Download( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
+ bInCallDownload = false;
bClearMedium = !xMed.Is();
if( bClearMedium )
- xMed = xTmpMed; // If already finished in DownLoad
+ xMed = xTmpMed; // If already finished in Download
return bDataReady;
}
bWaitForData = true;
bDataReady = bInNewData = false;
- xMed->DownLoad();
+ xMed->Download();
bLoadAgain = !xMed->IsRemote();
bWaitForData = false;
@@ -464,7 +464,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
// When we come form here there it can not be an error no more.
pThis->bLoadError = false;
pThis->bWaitForData = false;
- pThis->bInCallDownLoad = false;
+ pThis->bInCallDownload = false;
if( !pThis->bInNewData && !pThis->bDataReady )
{
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 16824f4aa565..d43e1ebe52e3 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -46,7 +46,7 @@ class SvFileObject : public sfx2::SvLinkSource
bool bNativFormat : 1;
bool bClearMedium : 1;
bool bStateChangeCalled : 1;
- bool bInCallDownLoad : 1;
+ bool bInCallDownload : 1;
bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
bool LoadFile_Impl();
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 143dcd9b7a84..21b66fbe0223 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -130,7 +130,7 @@ short SvxOpenGraphicDialog::Execute()
if ( INET_PROT_FILE != aObj.GetProtocol() )
{
SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
- aMed.DownLoad();
+ aMed.Download();
SvStream* pStream = aMed.GetInStream();
if( pStream )
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 6f1c82526a44..0e036c90d222 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -235,7 +235,7 @@ void SfxHTMLParser::StartFileDownload(const OUString& rURL)
return;
pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY );
- pDLMedium->DownLoad();
+ pDLMedium->Download();
}
bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a4c0c72bc811..40f718202ac4 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2391,7 +2391,7 @@ void SfxMedium::SetDoneLink( const Link& rLink )
pImp->aDoneLink = rLink;
}
-void SfxMedium::DownLoad( const Link& aLink )
+void SfxMedium::Download( const Link& aLink )
{
SetDoneLink( aLink );
GetInStream();