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/scribusdoc.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/scribusdoc.cpp')
| -rw-r--r-- | scribus/scribusdoc.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scribus/scribusdoc.cpp b/scribus/scribusdoc.cpp index ed2a538..3d25431 100644 --- a/scribus/scribusdoc.cpp +++ b/scribus/scribusdoc.cpp @@ -1182,21 +1182,21 @@ void ScribusDoc::loadStylesFromFile(QString fileName) if (!fileName.isEmpty()) { FileLoader fl(fileName); - if (fl.TestFile() == -1) + if (fl.testFile() == -1) //TODO put in nice user warning return; - if (!fl.ReadStyles(fileName, this, *wrkStyles)) + if (!fl.readStyles(this, *wrkStyles)) { //TODO put in nice user warning } - if (!fl.ReadCharStyles(fileName, this, *wrkCharStyles)) + if (!fl.readCharStyles(this, *wrkCharStyles)) { //TODO put in nice user warning } - if (!fl.ReadLineStyles(fileName, wrkLineStyles)) + if (!fl.readLineStyles(wrkLineStyles)) { //TODO put in nice user warning } @@ -1219,21 +1219,21 @@ void ScribusDoc::loadStylesFromFile(QString fileName, StyleSet<ParagraphStyle> * if (!fileName.isEmpty()) { FileLoader fl(fileName); - if (fl.TestFile() == -1) + if (fl.testFile() == -1) //TODO put in nice user warning return; - if (!fl.ReadStyles(fileName, this, *wrkStyles)) + if (!fl.readStyles(this, *wrkStyles)) { //TODO put in nice user warning } - if (!fl.ReadCharStyles(fileName, this, *wrkCharStyles)) + if (!fl.readCharStyles(this, *wrkCharStyles)) { //TODO put in nice user warning } - if (!fl.ReadLineStyles(fileName, wrkLineStyles)) + if (!fl.readLineStyles(wrkLineStyles)) { //TODO put in nice user warning } @@ -3517,7 +3517,7 @@ bool ScribusDoc::save(const QString& fileName, QString* savedFile) mainWindowProgressBar->reset(); } FileLoader fl(fileName); - bool ret = fl.SaveFile(fileName, this, savedFile); + bool ret = fl.saveFile(fileName, this, savedFile); if (ret) { setName(fileName); |