X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=0c567631b0d4d47d7c46fe5eb53d97a6df092cb3;hb=25ef8e7eef8dfb2b6d6d4f2935ae6775ebf2ba60;hp=ee2bbce4d1479dbc41c24e72bd4802bc2f08837a;hpb=61b2bd5e7fd9399128342d9048aa814ae5f086fc;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index ee2bbce4d1..0c567631b0 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -13,6 +13,7 @@
 #include "insets/RenderPreview.h"
 #include "insets/Inset.h"
 
+#include "Buffer.h"
 #include "BufferView.h"
 #include "Dimension.h"
 #include "LyX.h"
@@ -24,7 +25,6 @@
 
 #include "graphics/PreviewImage.h"
 #include "graphics/PreviewLoader.h"
-#include "graphics/Previews.h"
 
 #include "support/FileName.h"
 #include "support/gettext.h"
@@ -41,7 +41,7 @@ namespace lyx {
 
 LyXRC_PreviewStatus RenderPreview::status()
 {
-	return graphics::Previews::status();
+	return lyxrc.preview;
 }
 
 
@@ -74,19 +74,13 @@ RenderBase * RenderPreview::clone(Inset const * inset) const
 
 namespace {
 
-graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
-{
-	return thePreviews().loader(buffer);
-}
-
-
 docstring const statusMessage(BufferView const * bv, string const & snippet)
 {
 	LASSERT(bv, /**/);
 
 	Buffer const & buffer = bv->buffer();
-	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-	graphics::PreviewLoader::Status const status = loader.status(snippet);
+	graphics::PreviewLoader const * loader = buffer.loader();
+	graphics::PreviewLoader::Status const status = loader->status(snippet);
 
 	docstring message;
 	switch (status) {
@@ -111,8 +105,9 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 graphics::PreviewImage const *
 RenderPreview::getPreviewImage(Buffer const & buffer) const
 {
-	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-	return loader.preview(snippet_);
+	graphics::PreviewLoader const * loader = buffer.loader();
+	LASSERT(loader, return 0);
+	return loader->preview(snippet_);
 }
 
 
@@ -175,31 +170,35 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void RenderPreview::startLoading(Buffer const & buffer) const
+void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
 {
-	if (status() == LyXRC::PREVIEW_OFF || snippet_.empty())
+	if (!forexport && (status() == LyXRC::PREVIEW_OFF || snippet_.empty()))
 		return;
 
-	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-	loader.startLoading();
+	graphics::PreviewLoader * loader = buffer.loader();
+	LASSERT(loader, return);
+	loader->startLoading(forexport);
 }
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-			       Buffer const & buffer)
+                               Buffer const & buffer, 
+                               bool ignore_lyxrc)
 {
-	if (status() == LyXRC::PREVIEW_OFF)
+	if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
-	graphics::PreviewLoader & loader = getPreviewLoader(buffer);
-	addPreview(latex_snippet, loader);
+	graphics::PreviewLoader * loader = buffer.loader();
+	LASSERT(loader, return);
+	addPreview(latex_snippet, *loader, ignore_lyxrc);
 }
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-			       graphics::PreviewLoader & ploader)
+                               graphics::PreviewLoader & ploader, 
+                               bool ignore_lyxrc)
 {
-	if (status() == LyXRC::PREVIEW_OFF)
+	if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
 	// FIXME UNICODE
@@ -228,8 +227,9 @@ void RenderPreview::removePreview(Buffer const & buffer)
 	if (snippet_.empty())
 		return;
 
-	graphics::PreviewLoader & loader = getPreviewLoader(buffer);
-	loader.remove(snippet_);
+	graphics::PreviewLoader * loader = buffer.loader();
+	LASSERT(loader, return);
+	loader->remove(snippet_);
 	snippet_.erase();
 }