Correct the mess introduced in r33250.

[lyx.git] / src / graphics / PreviewLoader.cpp

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 453f36c91ac235ca8e8b62bbf432655d8c646709..f54fb6bc92ed3d1789ec3ebe3933f365c771c6af 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -243,8 +243,6 @@ private:
        PreviewLoader & parent_;
        ///
        Buffer const & buffer_;
-       ///
-       double font_scaling_factor_;
 
        /// We don't own this
        static lyx::Converter const * pconverter_;
@@ -387,14 +385,8 @@ namespace lyx {
 namespace graphics {
 
 PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
-       : parent_(p), buffer_(b), font_scaling_factor_(0.0)
+       : parent_(p), buffer_(b)
 {
-       font_scaling_factor_ = 0.01 * lyxrc.dpi * lyxrc.zoom *
-               lyxrc.preview_scale_factor;
-
-       LYXERR(Debug::GRAPHICS, "The font scaling factor is "
-                               << font_scaling_factor_);
-
        if (!pconverter_){
                if (b.params().encoding().package() == Encoding::japanese)
                        pconverter_ = setConverter("lyxpreview-platex");
@@ -590,13 +582,16 @@ void PreviewLoader::Impl::startLoading()
                return;
        }
 
+       double font_scaling_factor = 0.01 * lyxrc.dpi * lyxrc.zoom
+               * lyxrc.preview_scale_factor;
+
        // The conversion command.
        ostringstream cs;
        cs << pconverter_->command << ' ' << pconverter_->to << ' '
           << quoteName(latexfile.toFilesystemEncoding()) << ' '
-          << int(font_scaling_factor_) << ' '
-          << theApp()->hexName(Color_preview) << ' '
-          << theApp()->hexName(Color_background);
+          << int(font_scaling_factor) << ' '
+          << theApp()->hexName(PreviewLoader::foregroundColor()) << ' '
+          << theApp()->hexName(PreviewLoader::backgroundColor());
 
        string const command = libScriptSearch(cs.str());