summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-20 11:01:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-20 15:45:54 +0200
commite75e6b850a8791237dca6654b526831f1b0c7bc6 (patch)
tree4045cf93268dfa46c05417523e7236bf1ccc3738 /sfx2
parent6ea4b982fada0bbca957dfa0729e2c3225c8a460 (diff)
loplugin:unusedfields
Change-Id: I9c80805788d49b13552c168a36fdf395da19df26 Reviewed-on: https://gerrit.libreoffice.org/53196 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/fileobj.cxx7
-rw-r--r--sfx2/source/appl/fileobj.hxx2
2 files changed, 1 insertions, 8 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 371d8839f75a..d785cec58fa8 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -56,10 +56,8 @@ SvFileObject::SvFileObject()
, bWaitForData(false)
, bInNewData(false)
, bDataReady(false)
- , bNativFormat(false)
, bClearMedium(false)
, bStateChangeCalled(false)
- , bInCallDownload(false)
{
}
@@ -175,9 +173,7 @@ bool SvFileObject::LoadFile_Impl()
bWaitForData = true;
tools::SvRef<SfxMedium> xTmpMed = xMed;
- bInCallDownload = true;
xMed->Download( LINK( this, SvFileObject, LoadGrfReady_Impl ) );
- bInCallDownload = false;
bClearMedium = !xMed.is();
if( bClearMedium )
@@ -210,7 +206,7 @@ bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
// To avoid that a native link is created
if( !rGrf.IsGfxLink() &&
- !rGrf.GetContext() && !bNativFormat )
+ !rGrf.GetContext() )
rGrf.SetGfxLink( GfxLink() );
if( !pStream )
@@ -370,7 +366,6 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void )
// When we come form here there it can not be an error no more.
bLoadError = false;
bWaitForData = false;
- bInCallDownload = false;
if( !bInNewData && !bDataReady )
{
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index f55e7885713d..86219ef5a1d5 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -44,10 +44,8 @@ class SvFileObject : public sfx2::SvLinkSource
bool bWaitForData : 1;
bool bInNewData : 1;
bool bDataReady : 1;
- bool bNativFormat : 1;
bool bClearMedium : 1;
bool bStateChangeCalled : 1;
- bool bInCallDownload : 1;
bool GetGraphic_Impl( Graphic&, SvStream* pStream );
bool LoadFile_Impl();