anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

While exporting from the command-line, theApp() doesn't exist.

Browse Source 
It was only needed for getting hex names of colors. So, get them
directly from a ColorCache object with default mapping.

Conflicts:
	src/graphics/PreviewLoader.cpp
This commit is contained in:
Tommaso Cucinotta 2012-12-10 23:22:10 +00:00
parent cf7b38ee23
commit 60c96e3a66
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -5,7 +5,7 @@ include $(top_srcdir)/config/common.am
DISTCLEANFILES += libintl.h DISTCLEANFILES += libintl.h
AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_INCLUDES)
if BUILD_CLIENT_SUBDIR if BUILD_CLIENT_SUBDIR
CLIENT = client CLIENT = client

20
src/graphics/PreviewLoader.cpp
View File

@ -27,6 +27,7 @@
#include "TexRow.h" #include "TexRow.h"
#include "frontends/Application.h" // hexName #include "frontends/Application.h" // hexName
#include "frontends/qt4/ColorCache.h"
#include "insets/Inset.h" #include "insets/Inset.h"
@ -36,6 +37,7 @@
#include "support/filetools.h" #include "support/filetools.h"
#include "support/ForkedCalls.h" #include "support/ForkedCalls.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include "support/qstring_helpers.h"
#include "support/bind.h" #include "support/bind.h"
@ -591,16 +593,26 @@ void PreviewLoader::Impl::startLoading(bool wait)
// FIXME XHTML // FIXME XHTML
// The colors should be customizable. // The colors should be customizable.
ColorCode const bg = buffer_.isExporting() ColorCode const bg = buffer_.isExporting()
? Color_white : PreviewLoader::backgroundColor(); ? Color_white : PreviewLoader::backgroundColor();
ColorCode const fg = buffer_.isExporting() ColorCode const fg = buffer_.isExporting()
? Color_black : PreviewLoader::foregroundColor(); ? Color_black : PreviewLoader::foregroundColor();
std::string bg_name, fg_name;
if (theApp()) {
fg_name = theApp()->hexName(fg);
bg_name = theApp()->hexName(bg);
} else {
ColorCache cc;
fg_name = ltrim(fromqstr(cc.get(fg).name()), "#");
bg_name = ltrim(fromqstr(cc.get(bg).name()), "#");
}
// The conversion command. // The conversion command.
ostringstream cs; ostringstream cs;
cs << pconverter_->command << ' ' << pconverter_->to << ' ' cs << pconverter_->command << ' ' << pconverter_->to << ' '
<< quoteName(latexfile.toFilesystemEncoding()) << ' ' << quoteName(latexfile.toFilesystemEncoding()) << ' '
<< int(font_scaling_factor) << ' ' << int(font_scaling_factor) << ' '
<< theApp()->hexName(fg) << ' ' << fg_name << ' '
<< theApp()->hexName(bg); << bg_name;
// FIXME what about LuaTeX? // FIXME what about LuaTeX?
if (buffer_.params().useNonTeXFonts) if (buffer_.params().useNonTeXFonts)
cs << " xelatex"; cs << " xelatex";