diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-20 21:44:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-20 21:59:20 +0100 |
| commit | e8169a821c40ee4b0c427f5c2e9b7fa6ab3b4536 (patch) | |
| tree | ca969f0a6410ccd059de7e562c3e71127accf11f /sfx2/source/appl/fileobj.hxx | |
| parent | b3ce63e5a5899088def6458ae80a354c926f9891 (diff) | |
Revert "tdf#95614 fix freezing with linked images"
This reverts commit 58e2a9efe554ff2ac09a902d13a18e954487b672.
It breaks CppunitTest_sw_globalfilter.
Change-Id: I0eb787d698276b86bf4d77a5300ea98cce0fdea5
Diffstat (limited to 'sfx2/source/appl/fileobj.hxx')
| -rw-r--r-- | sfx2/source/appl/fileobj.hxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index b6f878c33178..a84126f06017 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -22,13 +22,10 @@ #include <sfx2/linksrc.hxx> #include <sfx2/docfile.hxx> #include <sfx2/linkmgr.hxx> -#include <unordered_set> class Graphic; namespace sfx2 { class FileDialogHelper; } -typedef std::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > FnHashSet; - class SvFileObject : public sfx2::SvLinkSource { OUString sFileNm; @@ -39,7 +36,6 @@ class SvFileObject : public sfx2::SvLinkSource ImplSVEvent* nPostUserEventId; tools::SvRef<SfxMedium> mxDelMed; VclPtr<vcl::Window> pOldParent; - static FnHashSet m_aAsyncLoadsInProgress; sal_uInt8 nType; @@ -53,7 +49,6 @@ class SvFileObject : public sfx2::SvLinkSource bool bClearMedium : 1; bool bStateChangeCalled : 1; bool bInCallDownload : 1; - bool bAsyncLoadsInProgress : 1; bool GetGraphic_Impl( Graphic&, SvStream* pStream = nullptr ); bool LoadFile_Impl(); |