r23649 by jghali - Fix missing clear() calls in a few Scribus150Format functions
scribus-commit
scribus-commit at lists.scribus.net
Fri Apr 24 17:37:48 UTC 2020
Author: jghali
Date: Fri Apr 24 17:37:47 2020
New Revision: 23649
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23649
Log:
Fix missing clear() calls in a few Scribus150Format functions
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=23649&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 Fri Apr 24 17:37:47 2020
@@ -183,7 +183,7 @@
void Scribus150Format::getReplacedFontData(bool & getNewReplacement, QMap<QString,QString> &getReplacedFonts, QList<ScFace> &getDummyScFaces)
{
- getNewReplacement=false;
+ getNewReplacement = false;
getReplacedFonts.clear();
}
@@ -224,6 +224,14 @@
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;
@@ -4378,9 +4386,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);
@@ -6137,9 +6145,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;
@@ -6175,6 +6183,7 @@
FrameItems.clear();
WeldItems.clear();
WeldID.clear();
+ LinkID.clear();
markeredItemsMap.clear();
markeredMarksMap.clear();
More information about the scribus-commit
mailing list