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

[scribus-commit]

Revision: 15314
Author: jghali
Date: 2010-07-09T22:40:56.688055Z
Commit message: #9247 : Incorrect layer handling on page import

Changeset: 
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

Diffs:
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 15313)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 15314)
@@ -2859,6 +2859,7 @@
 					Neu->OwnPage = m_Doc->currentPageNumber();
 					if (pg.tagName()=="PAGEOBJECT")
 						Neu->OnMasterPage = "";
+					Neu->LayerID  = layerTrans.value(Neu->LayerID, Neu->LayerID);
 					/*m_Doc->GroupCounter = docGc;*/
 					QDomNode IT=pg.firstChild();
 					LastStyles * last = new LastStyles();
Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 15313)
+++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 15314)
@@ -3261,6 +3261,7 @@
 				newItem->OwnPage = m_Doc->currentPageNumber();
 				if (tagName == "PAGEOBJECT")
 					newItem->OnMasterPage = "";
+				newItem->LayerID = layerTrans.value(newItem->LayerID, newItem->LayerID);
 
 				if (newItem->isTableItem)
 				{
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 15313)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 15314)
@@ -3158,6 +3158,7 @@
 				newItem->OwnPage = m_Doc->currentPageNumber();
 				if (tagName == "PAGEOBJECT")
 					newItem->OnMasterPage = "";
+				newItem->LayerID = layerTrans.value(newItem->LayerID, newItem->LayerID);
 
 				if (newItem->isTableItem)
 				{