r23641 by jghali - Fix change committed unintentionally

scribus-commit scribus-commit at lists.scribus.net
Wed Apr 22 00:38:08 UTC 2020


Author: jghali
Date: Wed Apr 22 00:38:08 2020
New Revision: 23641

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23641
Log:
Fix change committed unintentionally 

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23641&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Wed Apr 22 00:38:08 2020
@@ -224,14 +224,6 @@
 	itemRemapF.clear();
 	itemNextF.clear();
 	FrameItems.clear();
-	LinkID.clear();
-
-	markeredItemsMap.clear();
-	markeredMarksMap.clear();
-	nsetRangeItemNamesMap.clear();
-	notesFramesData.clear();
-	notesMasterMarks.clear();
-	notesNSets.clear();
 
 	bool firstElement = true;
 	bool success = true;
@@ -499,10 +491,6 @@
 				}
 			}
 		}
-
-		//update names to pointers
-		updateNames2Ptr();
-
 		if (itemNext.count() != 0)
 		{
 			QMap<int,int>::Iterator lc;
@@ -607,10 +595,6 @@
 				}
 			}
 		}
-
-		//update names to pointers
-		updateNames2Ptr();
-
 		// reestablish textframe links
 		if (itemNext.count() != 0)
 		{
@@ -4394,9 +4378,9 @@
 	QStack< QList<PageItem*> > groupStack;
 	QStack< QList<PageItem*> > groupStackP;
 	QStack<int> groupStack2;
-	QMap<int, PageItem*> TableID2;
+	QMap<int,PageItem*> TableID2;
 	QList<PageItem*> TableItems2;
-	QMap<int, PageItem*> WeldID;
+	QMap<int,PageItem*> WeldID;
 	QList<PageItem*> WeldItems;
 
 	pat.setDoc(doc);
@@ -6153,9 +6137,9 @@
 
 	ScPage* newPage = nullptr;
 	
-	QMap<int, PageItem*> TableID;
+	QMap<int,PageItem*> TableID;
 	QList<PageItem*> TableItems;
-	QMap<int, PageItem*> WeldID;
+	QMap<int,PageItem*> WeldID;
 	QList<PageItem*> WeldItems;
 	QStack< QList<PageItem*> > groupStackFI;
 	QStack< QList<PageItem*> > groupStackMI;
@@ -6191,7 +6175,6 @@
 	FrameItems.clear();
 	WeldItems.clear();
 	WeldID.clear();
-	LinkID.clear();
 
 	markeredItemsMap.clear();
 	markeredMarksMap.clear();




More information about the scribus-commit mailing list