The free_spacing patch and fix to the mess that Rob discovered.

[lyx.git] / src / graphics / GraphicsLoader.C

diff --git a/src/graphics/GraphicsLoader.C b/src/graphics/GraphicsLoader.C
index 02f99da7498c13dcb4eb34bcf107e36d57f522e4..5da53f9b84f787e3dd576c2c1ebc0cb5c89a67a2 100644 (file)
--- a/src/graphics/GraphicsLoader.C
+++ b/src/graphics/GraphicsLoader.C
@@ -40,7 +40,7 @@ struct Loader::Impl : boost::signals::trackable {
        void createPixmap();
 
        ///
-       void startLoading(Inset const &);
+       void startLoading();
 
        /// The loading status of the image.
        ImageStatus status_;
@@ -62,10 +62,6 @@ private:
        ///
        Params params_;
 
-       // Multiple Insets can share the same image
-       typedef std::list<Inset const *> InsetList;
-       ///
-       InsetList insets;
 };
 
 
@@ -122,15 +118,7 @@ void Loader::startLoading() const
 {
        if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_.get())
                return;
-       pimpl_->cached_item_->startLoading();
-}
-
-
-void Loader::startLoading(Inset const & inset) const
-{
-       if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_.get())
-               return;
-       pimpl_->startLoading(inset);
+       pimpl_->startLoading();
 }
 
 
@@ -281,17 +269,11 @@ void Loader::Impl::createPixmap()
 }
 
 
-void Loader::Impl::startLoading(Inset const & inset)
+void Loader::Impl::startLoading()
 {
        if (status_ != WaitingToLoad)
                return;
 
-       InsetList::const_iterator it  = insets.begin();
-       InsetList::const_iterator end = insets.end();
-       it = std::find(it, end, &inset);
-       if (it == end)
-               insets.push_back(&inset);
-
        LoaderQueue::get().touch(cached_item_);
 }