summaryrefslogtreecommitdiffstats
path: root/scribus/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'scribus/plugins')
-rw-r--r--scribus/plugins/fileloader/scribus134format/scribus134format.cpp14
-rw-r--r--scribus/plugins/fileloader/scribus13format/scribus13format.cpp10
2 files changed, 2 insertions, 22 deletions
diff --git a/scribus/plugins/fileloader/scribus134format/scribus134format.cpp b/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
index ce76c8a..ce4a598 100644
--- a/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
+++ b/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
@@ -182,7 +182,6 @@ bool Scribus134Format::loadFile(const QString & fileName, const FileFormat & /*
struct ScribusDoc::BookMa bok;
int counter;//, Pgc;
//bool AtFl;
- bool newVersion = false;
QString tmp, tmpf, PgNam, Defont;
QMap<int,int> TableID;
QList<PageItem*> TableItems;
@@ -230,8 +229,6 @@ bool Scribus134Format::loadFile(const QString & fileName, const FileFormat & /*
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
if (m_mwProgressBar!=0)
{
@@ -2766,9 +2763,8 @@ bool Scribus134Format::loadPage(const QString & fileName, int pageNumber, bool M
QMap<int,int> TableID;
QList<PageItem*> TableItems;
QMap<PageItem*, int> groupID;
- int a, counter, baseobj;
+ int a, counter;
double pageX = 0, pageY = 0;
- bool newVersion = false;
bool VorLFound = false;
QMap<int,int> layerTrans;
int maxLayer = 0;
@@ -2806,11 +2802,8 @@ bool Scribus134Format::loadPage(const QString & fileName, int pageNumber, bool M
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
counter = m_Doc->Items->count();
- baseobj = counter;
// PrefsManager* prefsManager=PrefsManager::instance();
while(!DOC.isNull())
{
@@ -3713,8 +3706,3 @@ bool Scribus134Format::readPageCount(const QString& fileName, int *num1, int *nu
*num2 = counter2;
return true;
}
-
-
-
-
-
diff --git a/scribus/plugins/fileloader/scribus13format/scribus13format.cpp b/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
index b1c8354..529053b 100644
--- a/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
+++ b/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
@@ -168,8 +168,6 @@ bool Scribus13Format::loadFile(const QString & fileName, const FileFormat & /* f
ParagraphStyle vg;
struct ScribusDoc::BookMa bok;
int counter;//, Pgc;
- //bool AtFl;
- bool newVersion = false;
QString tmp, tmpf, tmp2, tmp3, tmp4, PgNam, Defont, tmf;
QFont fo;
QMap<int,int> TableID;
@@ -216,8 +214,6 @@ bool Scribus13Format::loadFile(const QString & fileName, const FileFormat & /* f
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
if (m_mwProgressBar!=0)
{
@@ -2022,9 +2018,8 @@ bool Scribus13Format::loadPage(const QString & fileName, int pageNumber, bool Mp
newReplacement = false;
QMap<int,int> TableID;
QList<PageItem*> TableItems;
- int a, counter, baseobj;
+ int a, counter;
double pageX = 0, pageY = 0;
- bool newVersion = false;
bool VorLFound = false;
QMap<int,int> layerTrans;
int maxLayer = 0;
@@ -2062,11 +2057,8 @@ bool Scribus13Format::loadPage(const QString & fileName, int pageNumber, bool Mp
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
counter = m_Doc->Items->count();
- baseobj = counter;
while(!DOC.isNull())
{
QDomElement dc=DOC.toElement();