mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-27 03:36:39 +00:00
compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24406 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0d47ef086c
commit
b271b9f0f6
@ -1230,7 +1230,7 @@ void GuiDocument::browseLayout()
|
|||||||
if (!file.endsWith(".layout"))
|
if (!file.endsWith(".layout"))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
FileName layoutFile = makeAbsPath(fromqstr(file),
|
FileName layoutFile = support::makeAbsPath(fromqstr(file),
|
||||||
fromqstr(bufferFilepath()));
|
fromqstr(bufferFilepath()));
|
||||||
|
|
||||||
// load the layout file
|
// load the layout file
|
||||||
|
@ -298,7 +298,7 @@ void GuiExternal::getbbClicked()
|
|||||||
if (filename.empty())
|
if (filename.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
FileName const abs_file(makeAbsPath(filename, fromqstr(bufferFilepath())));
|
FileName const abs_file(support::makeAbsPath(filename, fromqstr(bufferFilepath())));
|
||||||
|
|
||||||
// try to get it from the file, if possible
|
// try to get it from the file, if possible
|
||||||
string bb = readBB_from_PSFile(abs_file);
|
string bb = readBB_from_PSFile(abs_file);
|
||||||
|
@ -758,7 +758,7 @@ QString GuiGraphics::browse(QString const & in_name) const
|
|||||||
|
|
||||||
string GuiGraphics::readBoundingBox(string const & file)
|
string GuiGraphics::readBoundingBox(string const & file)
|
||||||
{
|
{
|
||||||
FileName const abs_file = makeAbsPath(file, fromqstr(bufferFilepath()));
|
FileName const abs_file = support::makeAbsPath(file, fromqstr(bufferFilepath()));
|
||||||
|
|
||||||
// try to get it from the file, if possible. Zipped files are
|
// try to get it from the file, if possible. Zipped files are
|
||||||
// unzipped in the readBB_from_PSFile-Function
|
// unzipped in the readBB_from_PSFile-Function
|
||||||
@ -787,7 +787,7 @@ string GuiGraphics::readBoundingBox(string const & file)
|
|||||||
bool GuiGraphics::isFileNameValid(string const & fname) const
|
bool GuiGraphics::isFileNameValid(string const & fname) const
|
||||||
{
|
{
|
||||||
// It may be that the filename is relative.
|
// It may be that the filename is relative.
|
||||||
return makeAbsPath(fname, fromqstr(bufferFilepath())).isReadableFile();
|
return support::makeAbsPath(fname, fromqstr(bufferFilepath())).isReadableFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -334,7 +334,7 @@ void GuiInclude::edit(string const & file)
|
|||||||
else
|
else
|
||||||
// tex file or other text file in verbatim mode
|
// tex file or other text file in verbatim mode
|
||||||
formats.edit(buffer(),
|
formats.edit(buffer(),
|
||||||
makeAbsPath(file, support::onlyPath(buffer().absFileName())),
|
support::makeAbsPath(file, support::onlyPath(buffer().absFileName())),
|
||||||
"text");
|
"text");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user