explain why ownsClipbiard() does not work on Windows and OS X

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index fa327785dadd188a85976ccb42f90777708a94f2..5de348e18138d14a11de5ddb3ff4e3baaef4cc1d 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -53,9 +53,9 @@ namespace os = support::os;
 
 namespace {
 
-string const token_from("$$i");
-string const token_path("$$p");
-string const token_socket("$$a");
+string const token_from_format("$$i");
+string const token_path_format("$$p");
+string const token_socket_format("$$a");
 
 
 class FormatNamesEqual : public std::unary_function<Format, bool> {
@@ -155,7 +155,7 @@ string Formats::getFormatFromFile(FileName const & filename) const
                        find_if(formatlist.begin(), formatlist.end(),
                                FormatExtensionsEqual(ext));
                if (cit != formats.end()) {
-                       lyxerr[Debug::GRAPHICS]
+                       LYXERR(Debug::GRAPHICS)
                                << "\twill guess format from file extension: "
                                << ext << " -> " << cit->name() << std::endl;
                        return cit->name();
@@ -309,13 +309,13 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
                        command += 'r';
        }
 
-       if (!contains(command, token_from))
-               command += ' ' + token_from;
+       if (!contains(command, token_from_format))
+               command += ' ' + token_from_format;
 
-       command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
-       command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
-       command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
-       lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
+       command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
+       command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
+       command = subst(command, token_socket_format, quoteName(theLyXServerSocket().address()));
+       LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
        // FIXME UNICODE utf8 can be wrong for files
        buffer.message(_("Executing command: ") + from_utf8(command));
 
@@ -368,13 +368,13 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
 
        string command = format->editor();
 
-       if (!contains(command, token_from))
-               command += ' ' + token_from;
+       if (!contains(command, token_from_format))
+               command += ' ' + token_from_format;
 
-       command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
-       command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
-       command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
-       lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
+       command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
+       command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
+       command = subst(command, token_socket_format, quoteName(theLyXServerSocket().address()));
+       LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
        // FIXME UNICODE utf8 can be wrong for files
        buffer.message(_("Executing command: ") + from_utf8(command));