diff options
| author | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-23 20:21:58 +0000 |
|---|---|---|
| committer | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-23 20:21:58 +0000 |
| commit | 64ffd5a23b712c10d94a8be99d08430d29c33d5e (patch) | |
| tree | 7f111aebf384dc2e74a36f799fba80452e8dd52a /scribus/mergedoc.cpp | |
| parent | 84b7f5f577515aa57554db59d2156dee7fb7c18b (diff) | |
| download | scribus-64ffd5a23b712c10d94a8be99d08430d29c33d5e.tar.gz scribus-64ffd5a23b712c10d94a8be99d08430d29c33d5e.tar.xz scribus-64ffd5a23b712c10d94a8be99d08430d29c33d5e.zip | |
#10393: opening sla from symbolic link breaks relative paths to graphics (+ some refactoring of FileLoader)
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17325 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/mergedoc.cpp')
| -rw-r--r-- | scribus/mergedoc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scribus/mergedoc.cpp b/scribus/mergedoc.cpp index 794dc86..a1f182d 100644 --- a/scribus/mergedoc.cpp +++ b/scribus/mergedoc.cpp @@ -143,15 +143,15 @@ void MergeDoc::changeFile() dirs->set("merge", fn.left(fn.lastIndexOf("/"))); qApp->changeOverrideCursor(QCursor(Qt::WaitCursor)); FileLoader fl(fn); - if (fl.TestFile() == -1) + if (fl.testFile() == -1) //TODO put in nice user warning return; QStringList masterPageNames; bool ret = false; if (masterPages) - ret = fl.ReadPageCount(fn, &dummy, &count, masterPageNames); + ret = fl.readPageCount(&dummy, &count, masterPageNames); else - ret = fl.ReadPageCount(fn, &count, &dummy, masterPageNames); + ret = fl.readPageCount(&count, &dummy, masterPageNames); qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor)); if ((ret) && (count != 0)) { |