r15313 by jghali - #9247 : Incorrect layer handling on page import

[scribus-commit]

Revision: 15313
Author: jghali
Date: 2010-07-09T22:39:43.603153Z
Commit message: #9247 : Incorrect layer handling on page import

Changeset: 
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

Diffs:
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 15312)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 15313)
@@ -2830,6 +2830,7 @@
 					Neu->OwnPage = m_Doc->currentPageNumber();
 					if (pg.tagName()=="PAGEOBJECT")
 						Neu->OnMasterPage = "";
+					Neu->LayerNr = layerTrans.value(Neu->LayerNr, Neu->LayerNr);
 					/*m_Doc->GroupCounter = docGc;*/
 					QDomNode IT=pg.firstChild();
 					LastStyles * last = new LastStyles();
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 15312)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 15313)
@@ -3021,6 +3021,7 @@
 					Neu->OwnPage = m_Doc->currentPageNumber();
 					if (pg.tagName()=="PAGEOBJECT")
 						Neu->OnMasterPage = "";
+					Neu->LayerNr = layerTrans.value(Neu->LayerNr, Neu->LayerNr);
 					/*m_Doc->GroupCounter = docGc;*/
 					tmpf = pg.attribute("IFONT", m_Doc->toolSettings.defFont);
 					m_AvailableFonts->findFont(tmpf, m_Doc);
@@ -3230,6 +3231,7 @@
 					Neu->setRedrawBounding();
 					Neu->OwnPage = pite.attribute("OwnPage").toInt();
 					Neu->OnMasterPage = "";
+					Neu->LayerNr = layerTrans.value(Neu->LayerNr, Neu->LayerNr);
 					/*m_Doc->GroupCounter = docGc;*/
 					tmpf = pite.attribute("IFONT", m_Doc->toolSettings.defFont);
 					m_AvailableFonts->findFont(tmpf, m_Doc);