[Libreoffice-commits] core.git: forms/source include/sfx2 oox/source sfx2/source svx/source sw/source
Jan Holesovsky
kendy at collabora.com
Thu Apr 10 06:08:23 PDT 2014
forms/source/component/clickableimage.cxx | 2 +-
include/sfx2/docfile.hxx | 2 +-
oox/source/drawingml/fillpropertiesgroupcontext.cxx | 2 +-
sfx2/source/appl/fileobj.cxx | 16 ++++++++--------
sfx2/source/appl/fileobj.hxx | 2 +-
sfx2/source/appl/opengrf.cxx | 2 +-
sfx2/source/bastyp/sfxhtml.cxx | 2 +-
sfx2/source/doc/docfile.cxx | 2 +-
svx/source/gallery2/galmisc.cxx | 2 +-
svx/source/svdraw/svdograf.cxx | 2 +-
sw/source/core/uibase/app/docsh2.cxx | 2 +-
sw/source/core/uibase/docvw/edtwin.cxx | 2 +-
sw/source/core/uibase/uiview/view2.cxx | 2 +-
sw/source/core/unocore/unocrsrhelper.cxx | 2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 31911865e5bda29ff2394ddf80244fbf15517657
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 10 14:49:52 2014 +0200
DownLoad -> Download.
Change-Id: Ia1729f570cc80a0375532da6478de9d58518556e
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index e30ba66..e94b6e1 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -799,7 +799,7 @@ namespace frm
m_bProdStarted = sal_False;
// Download anstossen (Achtung: Kann auch synchron sein).
- m_pMedium->DownLoad(STATIC_LINK(this, OClickableImageBaseModel, DownloadDoneLink));
+ m_pMedium->Download(STATIC_LINK(this, OClickableImageBaseModel, DownloadDoneLink));
}
else
{
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index ab85627..132e2ac 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -134,7 +134,7 @@ public:
const OUString& GetPhysicalName() const;
bool IsRemote();
bool IsOpen() const; // { return aStorage.Is() || pInStream; }
- void DownLoad( const Link& aLink = Link());
+ void Download( const Link& aLink = Link());
void SetDoneLink( const Link& rLink );
sal_uInt32 GetErrorCode() const;
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index ad8cf41..89fdb26 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -159,7 +159,7 @@ BlipContext::BlipContext( ContextHandler2Helper& rParent,
OUString aRelId = rAttribs.getString( R_TOKEN( link ), OUString() );
OUString aTargetLink = getFilter().getAbsoluteUrl( getRelations().getExternalTargetFromRelId( aRelId ) );
SfxMedium xMed( aTargetLink, STREAM_STD_READ );
- xMed.DownLoad();
+ xMed.Download();
Reference< io::XInputStream > xInStrm = xMed.GetInputStream();
if ( xInStrm.is() )
mrBlipProps.mxGraphic = getFilter().getGraphicHelper().importGraphic( xInStrm );
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index e9670ae..e123285 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 16824f4..d43e1eb 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 143dcd9..21b66fb 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 6f1c825..0e036c9 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 a4c0c72..40f7182 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();
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 05a7003..57b3c2a 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -88,7 +88,7 @@ sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
sal_uInt16 nRet = SGA_IMPORT_NONE;
SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
- aMedium.DownLoad();
+ aMedium.Download();
SvStream* pIStm = aMedium.GetInStream();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 7da704e..46b819d 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -71,7 +71,7 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a
Graphic aGraphic;
SfxMedium xMed( aFileName, aReferer, STREAM_STD_READ );
- xMed.DownLoad();
+ xMed.Download();
SvStream* pInStrm = xMed.GetInStream();
if ( pInStrm )
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index 9ae3e47..8c0cfbd 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -1542,7 +1542,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh,
SfxMedium* pMed = new SfxMedium( aTmpObj.GetMainURL(
INetURLObject::NO_DECODE ), STREAM_READ );
if( INET_PROT_FILE == aTmpObj.GetProtocol() )
- pMed->DownLoad(); // Touch the medium (download it)
+ pMed->Download(); // Touch the medium (download it)
const SfxFilter* pSfxFlt = 0;
if( !pMed->GetError() )
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index 2534400..bda06cf 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -299,7 +299,7 @@ inline bool IsMinMove(const Point &rStartPos, const Point &rLPt)
* For MouseButtonDown - determine whether a DrawObject
* an NO SwgFrame was hit! Shift/Ctrl should only result
* in selecting, with DrawObjects; at SwgFlys to trigger
- * hyperlinks if applicable (DownLoad/NewWindow!)
+ * hyperlinks if applicable (Download/NewWindow!)
*/
inline bool IsDrawObjSelectable( const SwWrtShell& rSh, const Point& rPt )
{
diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index ccfd4f7..5964f8e 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -2161,7 +2161,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
return -1;
}
- pMedium->DownLoad(); // start download if needed
+ pMedium->Download(); // start download if needed
if( aRef.Is() && 1 < aRef->GetRefCount() ) // still a valid ref?
{
SwReader* pRdr;
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 71ccd9b..c74bc9f 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1061,7 +1061,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, const OUString& rURL,
// this sourcecode is not responsible for the lifetime of the shell, SfxObjectShellLock should not be used
SfxObjectShellRef aRef( pDocSh );
- pMed->DownLoad(); // if necessary: start the download
+ pMed->Download(); // if necessary: start the download
if( aRef.Is() && 1 < aRef->GetRefCount() ) // Ref still valid?
{
SwReader* pRdr;
More information about the Libreoffice-commits
mailing list