X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fformat.C;h=869bfb4d52ff02bf40a30f048cd054240236fcd6;hb=7338f3b980d4dc5793ff80be814b7a74e1c72274;hp=4f85ce34e9f8b669ad07b3d10c9162a8ee2332b0;hpb=0e9bd2e87dbf1f2791cead146f114b555d2ca86d;p=lyx.git

diff --git a/src/format.C b/src/format.C
index 4f85ce34e9..869bfb4d52 100644
--- a/src/format.C
+++ b/src/format.C
@@ -5,24 +5,29 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-#include "config.h"
+#include <config.h>
+
 #include "format.h"
+#include "buffer.h"
+#include "buffer_funcs.h"
 #include "lyxrc.h"
 #include "debug.h"
-#include "lyx_cb.h" // for ShowMessage() ... to be removed?
 #include "gettext.h"
 #include "LString.h"
 
 #include "frontends/Alert.h" //to be removed?
 
+#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
 #include "support/lyxfunctional.h"
 
+using namespace lyx::support;
+
 
 namespace {
 
@@ -169,12 +174,12 @@ bool Formats::view(Buffer const * buffer, string const & filename,
 	if (format_name == "dvi" &&
 	    !lyxrc.view_dvi_paper_option.empty()) {
 		command += ' ' + lyxrc.view_dvi_paper_option;
-		string paper_size = papersize(buffer);
+		string paper_size = buffer->params.paperSizeName();
 		if (paper_size == "letter")
 			paper_size = "us";
 		command += ' ' + paper_size;
 		if (buffer->params.orientation
-		    == BufferParams::ORIENTATION_LANDSCAPE)
+		    == ORIENTATION_LANDSCAPE)
 			command += 'r';
 	}
 
@@ -186,7 +191,7 @@ bool Formats::view(Buffer const * buffer, string const & filename,
 	command = subst(command, token_path, QuoteName(OnlyPath(filename)));
 
 	lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-	ShowMessage(buffer, _("Executing command:"), command);
+	buffer->message(_("Executing command: ") + command);
 
 	Path p(OnlyPath(filename));
 	Systemcall one;
@@ -222,30 +227,6 @@ string const Formats::extension(string const & name) const
 }
 
 
-string const papersize(Buffer const * buffer)
-{
-	char real_papersize = buffer->params.papersize;
-	if (real_papersize == BufferParams::PAPER_DEFAULT)
-		real_papersize = lyxrc.default_papersize;
-
-	switch (real_papersize) {
-	case BufferParams::PAPER_A3PAPER:
-		return "a3";
-	case BufferParams::PAPER_A4PAPER:
-		return "a4";
-	case BufferParams::PAPER_A5PAPER:
-		return "a5";
-	case BufferParams::PAPER_B5PAPER:
-		return "b5";
-	case BufferParams::PAPER_EXECUTIVEPAPER:
-		return "foolscap";
-	case BufferParams::PAPER_LEGALPAPER:
-		return "legal";
-	case BufferParams::PAPER_USLETTER:
-	default:
-		return "letter";
-	}
-}
 
 
 Formats formats;