cmake: fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33645 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a7d19dc303dc0ce700e627bb3a6a6fce3b1e4bcd..4214e31384ae3e9307630b47db4c476982db496a 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1308,7 +1308,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
                if (!original_path.empty()) {
                        // FIXME UNICODE
                        // We don't know the encoding of inputpath
-                       docstring const inputpath = from_utf8(latex_path(original_path));
+                       docstring const inputpath = from_utf8(support::latex_path(original_path));
                        docstring uncodable_glyphs;
                        Encoding const * const enc = runparams.encoding;
                        if (enc) {

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 06bd898b5f1599e82f60f183f0809866813d95ce..9a64ec6cf5e6a859de99c7e8eddcb7056eaab53b 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1280,7 +1280,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                                incfile = mangled;
                        // \includeonly doesn't want an extension 
                        incfile = changeExtension(incfile, string());
-                       incfile = latex_path(incfile);
+                       incfile = support::latex_path(incfile);
                        if (!incfile.empty()) {
                                if (!first)
                                        os << ",";