From 823e44822e6638824900eee2f7e2e7165af97f8d Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Fri, 10 Apr 2009 11:11:14 +0000
Subject: [PATCH] * remove outdated RC_CUSTOM_EXPORT_COMMAND and
 RC_CUSTOM_EXPORT_FORMAT.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29183 a592a061-630c-0410-9148-cb99ea01b6c8
---
 RELEASE-NOTES                   |  1 +
 src/LyXFunc.cpp                 |  2 --
 src/LyXRC.cpp                   | 41 ---------------------------------
 src/LyXRC.h                     |  6 -----
 src/frontends/qt4/GuiSendto.cpp |  1 -
 5 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6a7f087e5e..0343eec44f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ The following variables are obsoleted in 2.0
 
 - \plaintext_roff_command (was not used anymore)
 - \spell_command and \use_spell_lib (ispell support has been removed)
+- \custom_export_command and \custom_export_format
 
 
 The following new LyX functions have been introduced:
diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 93a83139f1..a08aa07d4a 100644
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -1891,8 +1891,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_COPIER:
 	case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
 	case LyXRC::RC_SCROLL_BELOW_DOCUMENT:
-	case LyXRC::RC_CUSTOM_EXPORT_COMMAND:
-	case LyXRC::RC_CUSTOM_EXPORT_FORMAT:
 	case LyXRC::RC_DATE_INSERT_FORMAT:
 	case LyXRC::RC_DEFAULT_LANGUAGE:
 	case LyXRC::RC_GUI_LANGUAGE:
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 8397f70cbb..d4e214b4d5 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -78,8 +78,6 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\converter_cache_maxage", LyXRC::RC_CONVERTER_CACHE_MAXAGE },
 	{ "\\copier", LyXRC::RC_COPIER },
 	{ "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR },
-	{ "\\custom_export_command", LyXRC::RC_CUSTOM_EXPORT_COMMAND },
-	{ "\\custom_export_format", LyXRC::RC_CUSTOM_EXPORT_FORMAT },
 	{ "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
 	{ "\\def_file", LyXRC::RC_DEFFILE },
 	{ "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
@@ -227,7 +225,6 @@ void LyXRC::setDefaults()
 	document_path.erase();
 	view_dvi_paper_option.erase();
 	default_papersize = PAPER_DEFAULT;
-	custom_export_format = "ps";
 	default_view_format = "pdf2";
 	chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
 	bibtex_command = "bibtex";
@@ -557,14 +554,6 @@ int LyXRC::read(Lexer & lexrc)
 			lexrc >> print_paper_flag;
 			break;
 
-		case RC_CUSTOM_EXPORT_COMMAND:
-			lexrc >> custom_export_command;
-			break;
-
-		case RC_CUSTOM_EXPORT_FORMAT:
-			lexrc >> custom_export_format;
-			break;
-
 		case RC_DEFAULT_PAPERSIZE:
 			if (lexrc.next()) {
 				string const size = ascii_lowercase(lexrc.getString());
@@ -1898,30 +1887,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		if (tag != RC_LAST)
 			break;
 
-		os << "\n#\n"
-		   << "# EXPORT SECTION ####################################\n"
-		   << "#\n\n";
-
-	case RC_CUSTOM_EXPORT_COMMAND:
-		if (ignore_system_lyxrc ||
-		    custom_export_command
-		    != system_lyxrc.custom_export_command) {
-			os << "\\custom_export_command \""
-			   << custom_export_command
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_CUSTOM_EXPORT_FORMAT:
-		if (ignore_system_lyxrc ||
-		    custom_export_format
-		    != system_lyxrc.custom_export_format) {
-			os << "\\custom_export_format \"" << custom_export_format
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-
 		os << "\n#\n"
 		   << "# TEX SECTION #######################################\n"
 		   << "#\n\n";
@@ -2552,12 +2517,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		str = _("Show a small box around a Math Macro with the macro name when the cursor is inside.");
 		break;
 
-	case RC_CUSTOM_EXPORT_COMMAND:
-		break;
-
-	case RC_CUSTOM_EXPORT_FORMAT:
-		break;
-
 	case RC_DATE_INSERT_FORMAT:
 		//xgettext:no-c-format
 		str = _("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
diff --git a/src/LyXRC.h b/src/LyXRC.h
index 329c79201c..15268b850a 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -64,8 +64,6 @@ public:
 		RC_COPIER,
 		RC_CURSOR_FOLLOWS_SCROLLBAR,
 		RC_MAC_LIKE_WORD_MOVEMENT,
-		RC_CUSTOM_EXPORT_COMMAND,
-		RC_CUSTOM_EXPORT_FORMAT,
 		RC_DATE_INSERT_FORMAT,
 		RC_DEFFILE,
 		RC_DEFAULT_LANGUAGE,
@@ -238,10 +236,6 @@ public:
 	std::string print_paper_flag;
 	///
 	std::string print_paper_dimension_flag;
-	///
-	std::string custom_export_command;
-	///
-	std::string custom_export_format;
 	/// option for telling the dvi viewer about the paper size
 	std::string view_dvi_paper_option;
 	/// default paper size for local xdvi/dvips/ghostview/whatever
diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp
index 3eff7f4cc3..8aece21b81 100644
--- a/src/frontends/qt4/GuiSendto.cpp
+++ b/src/frontends/qt4/GuiSendto.cpp
@@ -142,7 +142,6 @@ bool GuiSendTo::isValid()
 bool GuiSendTo::initialiseParams(string const &)
 {
 	format_ = 0;
-	command_ = toqstr(lyxrc.custom_export_command);
 	paramsToDialog(format_, command_);
 	return true;
 }
-- 
2.39.2