r22224 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Thu Nov 23 19:23:09 UTC 2017


Author: jghali
Date: Thu Nov 23 19:23:08 2017
New Revision: 22224

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22224
Log:
#15047: Scribus hangs after trying to save or export an old file containing complex group

Modified:
    trunk/Scribus/scribus/collect4output.cpp
    trunk/Scribus/scribus/documentchecker.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/pageitem_group.cpp
    trunk/Scribus/scribus/pageitem_group.h
    trunk/Scribus/scribus/pageitem_table.cpp
    trunk/Scribus/scribus/pageitem_table.h
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/sctextstruct.cpp
    trunk/Scribus/scribus/ui/annot.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/picstatus.cpp
    trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
    trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
    trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
    trunk/Scribus/scribus/ui/selfield.cpp
    trunk/Scribus/scribus/ui/tabpdfoptions.cpp

Modified: trunk/Scribus/scribus/collect4output.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/collect4output.cpp
==============================================================================
--- trunk/Scribus/scribus/collect4output.cpp	(original)
+++ trunk/Scribus/scribus/collect4output.cpp	Thu Nov 23 19:23:08 2017
@@ -216,7 +216,7 @@
 					break;
 			}
 			if (ite->isGroup())
-				allItems = ite->getItemList();
+				allItems = ite->getAllChildren();
 			else
 				allItems.append(ite);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -233,7 +233,7 @@
 	{
 		PageItem *it = itf.value();
 		if (it->isGroup())
-			allItems = it->asGroupFrame()->getItemList();
+			allItems = it->asGroupFrame()->getAllChildren();
 		else
 			allItems.append(it);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -252,7 +252,7 @@
 		{
 			ite = pa.items.at(o);
 			if (ite->isGroup())
-				allItems = ite->getItemList();
+				allItems = ite->getAllChildren();
 			else
 				allItems.append(ite);
 			for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/documentchecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/documentchecker.cpp
==============================================================================
--- trunk/Scribus/scribus/documentchecker.cpp	(original)
+++ trunk/Scribus/scribus/documentchecker.cpp	Thu Nov 23 19:23:08 2017
@@ -170,7 +170,7 @@
 	{
 		PageItem* currItem = currDoc->MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -415,7 +415,7 @@
 	{
 		PageItem* currItem = currDoc->DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Thu Nov 23 19:23:08 2017
@@ -4432,7 +4432,13 @@
 		toggleLock();
 }
 
-QList<PageItem*> PageItem::getItemList() const
+QList<PageItem*> PageItem::getChildren() const
+{
+	QList<PageItem*> ret;
+	return ret;
+}
+
+QList<PageItem*> PageItem::getAllChildren() const
 {
 	QList<PageItem*> ret;
 	return ret;

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h	(original)
+++ trunk/Scribus/scribus/pageitem.h	Thu Nov 23 19:23:08 2017
@@ -477,7 +477,11 @@
 	void setDashes(QVector<double> val) { DashValues = val; }
 	double dashOffset() const { return DashOffset; }
 	void setDashOffset(double val) { DashOffset = val; }
-	virtual QList<PageItem*> getItemList() const;
+
+	/// Retrieve child items of this item
+	virtual QList<PageItem*> getChildren() const;
+	/// Retrieve all children of item, including children of children
+	virtual QList<PageItem*> getAllChildren() const;
 
 	//<< ********* Attributes of the item *********
 	//Position

Modified: trunk/Scribus/scribus/pageitem_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/pageitem_group.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_group.cpp	Thu Nov 23 19:23:08 2017
@@ -70,7 +70,7 @@
 	}
 }
 
-QList<PageItem*> PageItem_Group::getItemList() const
+QList<PageItem*> PageItem_Group::getAllChildren() const
 {
 	QList<PageItem*> ret;
 	for (int em = 0; em < groupItemList.count(); ++em)
@@ -78,7 +78,7 @@
 		PageItem* embedded = groupItemList.at(em);
 		ret.append(embedded);
 		if (embedded->isGroup())
-			ret += embedded->getItemList();
+			ret += embedded->getAllChildren();
 	}
 	return ret;
 }

Modified: trunk/Scribus/scribus/pageitem_group.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/pageitem_group.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.h	(original)
+++ trunk/Scribus/scribus/pageitem_group.h	Thu Nov 23 19:23:08 2017
@@ -1,63 +1,67 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-/***************************************************************************
-                          pageitem_symbol.h  -  description
-                             -------------------
-    copyright            : Scribus Team
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef PAGEITEM_GROUP_H
-#define PAGEITEM_GROUP_H
-
-#include <QString>
-#include <QRectF>
-
-#include "scribusapi.h"
-#include "pageitem.h"
-class ScPainter;
-class ScribusDoc;
-
-
-class SCRIBUS_API PageItem_Group : public PageItem
-{
-	Q_OBJECT
-
-public:
-	PageItem_Group(ScribusDoc *pa, double x, double y, double w, double h, double w2, QString fill, QString outline);
-	PageItem_Group(const PageItem & p) : PageItem(p) {}
-	~PageItem_Group();
-
-	virtual PageItem_Group * asGroupFrame() { return this; }
-	virtual bool isGroup() const { return true; }
-	virtual ItemType realItemType() const { return PageItem::Group; }
-	void adjustXYPosition();
-	virtual QList<PageItem*> getItemList() const;
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+/***************************************************************************
+                          pageitem_symbol.h  -  description
+                             -------------------
+    copyright            : Scribus Team
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef PAGEITEM_GROUP_H
+#define PAGEITEM_GROUP_H
+
+#include <QString>
+#include <QRectF>
+
+#include "scribusapi.h"
+#include "pageitem.h"
+class ScPainter;
+class ScribusDoc;
+
+
+class SCRIBUS_API PageItem_Group : public PageItem
+{
+	Q_OBJECT
+
+public:
+	PageItem_Group(ScribusDoc *pa, double x, double y, double w, double h, double w2, QString fill, QString outline);
+	PageItem_Group(const PageItem & p) : PageItem(p) {}
+	~PageItem_Group();
+
+	virtual PageItem_Group * asGroupFrame() { return this; }
+	virtual bool isGroup() const { return true; }
+	virtual ItemType realItemType() const { return PageItem::Group; }
+	void adjustXYPosition();
 	virtual void setLayer(int layerId);
 	virtual void setMasterPage(int page, const QString& mpName);
-	virtual void setMasterPageName(const QString& mpName);
-	virtual void getNamedResources(ResourceCollection& lists) const;
-	virtual void replaceNamedResources(ResourceCollection& newNames);
-	virtual void applicableActions(QStringList& actionList);
-	virtual QString infoDescription();
-
-	virtual void layout();
-	
-protected:
-	virtual void DrawObj_Item(ScPainter *p, QRectF e);
-
-};
-
-#endif 
+	virtual void setMasterPageName(const QString& mpName);
+	virtual void getNamedResources(ResourceCollection& lists) const;
+	virtual void replaceNamedResources(ResourceCollection& newNames);
+	virtual void applicableActions(QStringList& actionList);
+	virtual QString infoDescription();
+
+	/// Retrieve child items of this item
+	virtual QList<PageItem*> getChildren() const { return groupItemList; }
+	/// Retrieve all children of item, including children of children
+	virtual QList<PageItem*> getAllChildren() const;
+
+	virtual void layout();
+	
+protected:
+	virtual void DrawObj_Item(ScPainter *p, QRectF e);
+
+};
+
+#endif 

Modified: trunk/Scribus/scribus/pageitem_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/pageitem_table.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_table.cpp	Thu Nov 23 19:23:08 2017
@@ -80,7 +80,7 @@
 		parStyle = this->itemText.defaultStyle();
 }
 
-QList<PageItem*> PageItem_Table::getItemList() const
+QList<PageItem*> PageItem_Table::getChildren() const
 {
 	QList<PageItem*> ret;
 

Modified: trunk/Scribus/scribus/pageitem_table.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/pageitem_table.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.h	(original)
+++ trunk/Scribus/scribus/pageitem_table.h	Thu Nov 23 19:23:08 2017
@@ -96,7 +96,10 @@
 	virtual void currentTextProps(ParagraphStyle& parStyle) const;
 
 	/// Return the list of cell items
-	virtual QList<PageItem*> getItemList() const;
+	virtual QList<PageItem*> getChildren() const;
+
+	/// Return the list of cell items
+	virtual QList<PageItem*> getAllChildren() const { return getChildren(); }
 
 	/// Returns the number of rows in the table.
 	int rows() const { return m_rows; }

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Thu Nov 23 19:23:08 2017
@@ -1240,7 +1240,7 @@
 		pgit = allItems.takeFirst();
 		if (pgit->isGroup() || pgit->isTable())
 		{
-			allItems = pgit->getItemList() + allItems;
+			allItems = pgit->getChildren() + allItems;
 			continue;
 		}
 		if ((pgit->itemType() == PageItem::TextFrame) || (pgit->itemType() == PageItem::PathText))
@@ -1275,7 +1275,7 @@
 		pgit = allItems.takeFirst();
 		if (pgit->isGroup() || pgit->isTable())
 		{
-			allItems = pgit->getItemList() + allItems;
+			allItems = pgit->getChildren() + allItems;
 			continue;
 		}
 		if ((pgit->itemType() == PageItem::TextFrame) || (pgit->itemType() == PageItem::PathText))
@@ -1310,7 +1310,7 @@
 		pgit = allItems.takeFirst();
 		if (pgit->isGroup() || pgit->isTable())
 		{
-			allItems = pgit->getItemList() + allItems;
+			allItems = pgit->getChildren() + allItems;
 			continue;
 		}
 		if ((pgit->itemType() == PageItem::TextFrame) || (pgit->itemType() == PageItem::PathText))
@@ -1352,7 +1352,7 @@
 			pgit = allItems.takeFirst();
 			if (pgit->isGroup() || pgit->isTable())
 			{
-				allItems = pgit->getItemList() + allItems;
+				allItems = pgit->getChildren() + allItems;
 				continue;
 			}
 			if ((pgit->itemType() == PageItem::TextFrame) || (pgit->itemType() == PageItem::PathText))

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Thu Nov 23 19:23:08 2017
@@ -1327,7 +1327,7 @@
 		QList<PageItem*> allItems;
 		PageItem* item = m_Doc->DocItems.at(i);
 		if (item->isGroup())
-			allItems = item->asGroupFrame()->getItemList();
+			allItems = item->getAllChildren();
 		else
 			allItems.append(item);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -1348,7 +1348,7 @@
 		QList<PageItem*> allItems;
 		PageItem* item = m_Doc->MasterItems.at(i);
 		if (item->isGroup())
-			allItems = item->asGroupFrame()->getItemList();
+			allItems = item->getAllChildren();
 		else
 			allItems.append(item);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -2175,7 +2175,7 @@
 					QList<PageItem*> allItems;
 					PageItem* item = m_Doc->DocItems.at(i);
 					if (item->isGroup())
-						allItems = item->asGroupFrame()->getItemList();
+						allItems = item->getAllChildren();
 					else
 						allItems.append(item);
 					for (int ii = 0; ii < allItems.count(); ii++)
@@ -2196,7 +2196,7 @@
 					QList<PageItem*> allItems;
 					PageItem* item = m_Doc->MasterItems.at(i);
 					if (item->isGroup())
-						allItems = item->asGroupFrame()->getItemList();
+						allItems = item->getAllChildren();
 					else
 						allItems.append(item);
 					for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Thu Nov 23 19:23:08 2017
@@ -1149,7 +1149,7 @@
 		QList<PageItem*> allItems;
 		PageItem* item = m_Doc->DocItems.at(i);
 		if (item->isGroup())
-			allItems = item->asGroupFrame()->getItemList();
+			allItems = item->getAllChildren();
 		else
 			allItems.append(item);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -1170,7 +1170,7 @@
 		QList<PageItem*> allItems;
 		PageItem* item = m_Doc->MasterItems.at(i);
 		if (item->isGroup())
-			allItems = item->asGroupFrame()->getItemList();
+			allItems = item->getAllChildren();
 		else
 			allItems.append(item);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -2473,7 +2473,7 @@
 		QList<PageItem*> allItems;
 		PageItem* item = m_Doc->DocItems.at(i);
 		if (item->isGroup())
-			allItems = item->asGroupFrame()->getItemList();
+			allItems = item->getAllChildren();
 		else
 			allItems.append(item);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -2494,7 +2494,7 @@
 		QList<PageItem*> allItems;
 		PageItem* item = m_Doc->MasterItems.at(i);
 		if (item->isGroup())
-			allItems = item->asGroupFrame()->getItemList();
+			allItems = item->getAllChildren();
 		else
 			allItems.append(item);
 		for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp	Thu Nov 23 19:23:08 2017
@@ -194,7 +194,7 @@
 	{
 		PageItem *currItem = m_Doc->MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -216,7 +216,7 @@
 	{
 		PageItem *currItem = m_Doc->Items->at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -629,7 +629,7 @@
 	{
 		PageItem *currItem = m_Doc->MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -649,7 +649,7 @@
 	{
 		PageItem *currItem = m_Doc->Items->at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp	Thu Nov 23 19:23:08 2017
@@ -208,7 +208,7 @@
 			originalWidthG.append(bxi->groupWidth);
 			originalHeightG.append(bxi->groupHeight);
 			patternItemG.append(bxi);
-			QList<PageItem*> bxiL = bxi->getItemList();
+			QList<PageItem*> bxiL = bxi->getAllChildren();
 			for (int bx = 0; bx < bxiL.count(); ++bx)
 			{
 				PageItem* cIte = bxiL.at(bx);

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Thu Nov 23 19:23:08 2017
@@ -2475,7 +2475,7 @@
 		{
 			PageItem *currItem = doc->Items->at(i);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -5637,7 +5637,7 @@
 	{
 		PageItem *currItem = doc->DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -5651,7 +5651,7 @@
 	{
 		PageItem *currItem = doc->MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -9128,7 +9128,7 @@
 		currItem = doc->m_Selection->itemAt(0);
 	QList<PageItem*> allItems;
 	if (currItem->isGroup())
-		allItems = currItem->asGroupFrame()->getItemList();
+		allItems = currItem->getAllChildren();
 	else
 		allItems.append(currItem);
 	QStringList results;

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Thu Nov 23 19:23:08 2017
@@ -627,7 +627,7 @@
 	{
 		PageItem *currItem = DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -647,7 +647,7 @@
 	{
 		PageItem *currItem = MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -667,7 +667,7 @@
 	{
 		PageItem *currItem = itf.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -691,7 +691,7 @@
 		{
 			PageItem *currItem = pa.items.at(j);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int k = 0; k < allItems.count(); k++)
@@ -821,7 +821,7 @@
 		PageItem* embedded = items.at(em);
 		ret.append(embedded);
 		if (embedded->isGroup())
-			ret += embedded->asGroupFrame()->getItemList();
+			ret += embedded->getAllChildren();
 	}
 	return ret;
 }
@@ -3592,7 +3592,7 @@
 	{
 		PageItem* currItem = MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -3608,7 +3608,7 @@
 	{
 		PageItem* currItem = DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -3844,7 +3844,7 @@
 	{
 		PageItem *currItem = DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -3859,7 +3859,7 @@
 	{
 		PageItem *currItem = MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -3874,7 +3874,7 @@
 	{
 		PageItem *currItem = itf.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -3893,7 +3893,7 @@
 		{
 			PageItem *currItem = pa.items.at(o);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -3933,7 +3933,7 @@
 	{
 		PageItem* currItem = MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -3958,7 +3958,7 @@
 	{
 		PageItem* currItem = DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -3983,7 +3983,7 @@
 	{
 		PageItem *currItem = itf.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int i = 0; i < allItems.count(); i++)
@@ -4010,7 +4010,7 @@
 		{
 			PageItem* currItem = it.value().items.at(i);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int j = 0; j < allItems.count(); j++)
@@ -4047,7 +4047,7 @@
 			PageItem *currItem = customSelection->itemAt(i);
 			QList<PageItem*> allItems;
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int j = 0; j < allItems.count(); j++)
@@ -4096,7 +4096,7 @@
 	{
 		QList<PageItem*> allItems;
 		if (pat->items.at(i)->isGroup())
-			allItems = pat->items.at(i)->asGroupFrame()->getItemList();
+			allItems = pat->items.at(i)->getAllChildren();
 		else
 			allItems.append(pat->items.at(i));
 		for (int j = 0; j < allItems.count(); j++)
@@ -4176,7 +4176,7 @@
 	{
 		PageItem* currItem = MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -4198,7 +4198,7 @@
 	{
 		PageItem* currItem = DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int j = 0; j < allItems.count(); j++)
@@ -4218,7 +4218,7 @@
 	{
 		PageItem *currItem = itf.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int i = 0; i < allItems.count(); i++)
@@ -4240,7 +4240,7 @@
 		{
 			PageItem* currItem = it.value().items.at(i);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int j = 0; j < allItems.count(); j++)
@@ -4307,7 +4307,7 @@
 			it = allItems.takeFirst();
 			if (it->isGroup() || it->isTable())
 			{
-				allItems = it->getItemList() + allItems;
+				allItems = it->getChildren() + allItems;
 				continue;
 			}
 			if ((it->itemType() == PageItem::TextFrame) || (it->itemType() == PageItem::PathText))
@@ -4337,7 +4337,7 @@
 		PageItem *it = allItems.takeFirst();
 		if (it->isGroup() || it->isTable())
 		{
-			allItems = it->getItemList() + allItems;
+			allItems = it->getChildren() + allItems;
 			continue;
 		}
 		if ((it->itemType() == PageItem::TextFrame) || (it->itemType() == PageItem::PathText))
@@ -4368,7 +4368,7 @@
 			PageItem *it = allItems.takeFirst();
 			if (it->isGroup() || it->isTable())
 			{
-				allItems = it->getItemList() + allItems;
+				allItems = it->getChildren() + allItems;
 				continue;
 			}
 			if ((it->itemType() == PageItem::TextFrame) || (it->itemType() == PageItem::PathText))
@@ -4421,7 +4421,7 @@
 			it = allItems.takeFirst();
 			if (it->isGroup() || it->isTable())
 			{
-				allItems = it->getItemList() + allItems;
+				allItems = it->getChildren() + allItems;
 				continue;
 			}
 			checkItemForFonts(it, Really, i);
@@ -4434,7 +4434,7 @@
 		PageItem *ite = allItems.takeFirst();
 		if (it->isGroup() || it->isTable())
 		{
-			allItems = it->getItemList() + allItems;
+			allItems = it->getChildren() + allItems;
 			continue;
 		}
 		checkItemForFonts(ite, Really, 3);
@@ -4450,7 +4450,7 @@
 			it = allItems.takeFirst();
 			if (it->isGroup() || it->isTable())
 			{
-				allItems = it->getItemList() + allItems;
+				allItems = it->getChildren() + allItems;
 				continue;
 			}
 			checkItemForFonts(it, Really, 3);
@@ -4684,7 +4684,7 @@
 			else if (lc == 1)
 				it = DocItems.at(d);
 			if (it->isGroup())
-				allItems = it->asGroupFrame()->getItemList();
+				allItems = it->getAllChildren();
 			else
 				allItems.append(it);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -4701,7 +4701,7 @@
 	{
 		PageItem *it = itf.value();
 		if (it->isGroup())
-			allItems = it->asGroupFrame()->getItemList();
+			allItems = it->getAllChildren();
 		else
 			allItems.append(it);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -4993,7 +4993,7 @@
 	{
 		PageItem *ite = itemList->at(c);
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -5038,7 +5038,7 @@
 {
 	QList<PageItem*> allItems;
 	if (item->isGroup())
-		allItems = item->asGroupFrame()->getItemList();
+		allItems = item->getAllChildren();
 	else
 		allItems.append(item);
 	for (int ii = 0; ii < allItems.count(); ii++)
@@ -5113,7 +5113,7 @@
 	{
 		PageItem *ite = it.value();
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -5163,7 +5163,7 @@
 			QList<PageItem*> allItems;
 			PageItem *ite = pa.items.at(o);
 			if (ite->isGroup())
-				allItems = ite->asGroupFrame()->getItemList();
+				allItems = ite->getAllChildren();
 			else
 				allItems.append(ite);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -5990,7 +5990,7 @@
 {
 	if (!currItem->isGroup())
 		return;
-	QList<PageItem*> Objects = currItem->asGroupFrame()->getItemList();
+	QList<PageItem*> Objects = currItem->getAllChildren();
 	int Off_Page = -1;
 	int On_Page = 999999;
 	uint objectCount = Objects.count();
@@ -6024,7 +6024,7 @@
 		pageNr = currItem->OwnPage;
 
 		// TODO check group owner
-		if (currItem->getItemList().count() > 0)
+		if (currItem->getAllChildren().count() > 0)
 			continue;
 
 		// If item has a valid page, check that
@@ -6577,7 +6577,7 @@
 			return true;
 		if (currItem->isGroup())
 		{
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				if (checkItemName == allItems.at(ii)->itemName())
@@ -7332,7 +7332,7 @@
 	{
 		PageItem *it = itf.value();
 		if (it->isGroup())
-			allItems = it->asGroupFrame()->getItemList();
+			allItems = it->getAllChildren();
 		else
 			allItems.append(it);
 		for (int i = 0; i < allItems.count(); i++)
@@ -7378,7 +7378,7 @@
 	{
 		it = items->at(i);
 		if (it->isGroup())
-			allItems = it->asGroupFrame()->getItemList();
+			allItems = it->getAllChildren();
 		else
 			allItems.append(it);
 		for (int j = 0; j < allItems.count(); j++)
@@ -9862,7 +9862,7 @@
 	{
 		PageItem *currItem = DocItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -9887,7 +9887,7 @@
 	{
 		PageItem *currItem = MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -9912,7 +9912,7 @@
 	{
 		PageItem *currItem = it.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -9943,7 +9943,7 @@
 		{
 			PageItem *currItem = pa.items.at(o);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -9992,7 +9992,7 @@
 	{
 		PageItem *currItem = DocItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10021,7 +10021,7 @@
 	{
 		PageItem *currItem = MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10050,7 +10050,7 @@
 	{
 		PageItem *currItem = it.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10085,7 +10085,7 @@
 		{
 			PageItem *currItem = pa.items.at(o);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -10143,7 +10143,7 @@
 	{
 		PageItem *currItem = DocItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10158,7 +10158,7 @@
 	{
 		PageItem *currItem = MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10173,7 +10173,7 @@
 	{
 		PageItem *currItem = it.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10191,7 +10191,7 @@
 		{
 			PageItem *currItem = pa.items.at(o);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -10208,7 +10208,7 @@
 	{
 		PageItem *currItem = DocItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10242,7 +10242,7 @@
 	{
 		PageItem *currItem = MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10277,7 +10277,7 @@
 	{
 		PageItem *currItem = it.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10316,7 +10316,7 @@
 		{
 			PageItem *currItem = pa.items.at(o);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -10378,7 +10378,7 @@
 	{
 		PageItem *currItem = DocItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10397,7 +10397,7 @@
 	{
 		PageItem *currItem = MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10416,7 +10416,7 @@
 	{
 		PageItem *currItem = it.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -10441,7 +10441,7 @@
 		{
 			PageItem *currItem = pa.items.at(o);
 			if (currItem->isGroup())
-				allItems = currItem->asGroupFrame()->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -11189,7 +11189,7 @@
 	{
 		PageItem *currItem = DocItems.at(c);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -11211,7 +11211,7 @@
 	{
 		PageItem *currItem = MasterItems.at(c);
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -11233,7 +11233,7 @@
 	{
 		PageItem *currItem = it.value();
 		if (currItem->isGroup())
-			allItems = currItem->asGroupFrame()->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -13332,7 +13332,7 @@
 	{
 		PageItem *ite = DocItems.at(c);
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -13346,7 +13346,7 @@
 	{
 		PageItem *ite = MasterItems.at(c);
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -13366,7 +13366,7 @@
 	{
 		PageItem *ite = DocItems.at(c);
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -13383,7 +13383,7 @@
 		{
 			PageItem *ite = MasterItems.at(c);
 			if (ite->isGroup())
-				allItems = ite->asGroupFrame()->getItemList();
+				allItems = ite->getAllChildren();
 			else
 				allItems.append(ite);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -13405,7 +13405,7 @@
 	{
 		PageItem *ite = DocItems.at(c);
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -13420,7 +13420,7 @@
 	{
 		PageItem *ite = MasterItems.at(c);
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -15648,7 +15648,7 @@
 		currItem = itemSelection.itemAt(0);
 	QList<PageItem*> allItems;
 	if (currItem->isGroup())
-		allItems = currItem->asGroupFrame()->getItemList();
+		allItems = currItem->getAllChildren();
 	else
 		allItems.append(currItem);
 	QStringList results;
@@ -16002,7 +16002,7 @@
 	{
 		PageItem* ite = DocItems.at(i);
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -16326,7 +16326,7 @@
 					break;
 			}
 			if (it->isGroup())
-				allItems = it->asGroupFrame()->getItemList();
+				allItems = it->getAllChildren();
 			else
 				allItems.append(it);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -16357,7 +16357,7 @@
 	{
 		PageItem *ite = itf.value();
 		if (ite->isGroup())
-			allItems = ite->asGroupFrame()->getItemList();
+			allItems = ite->getAllChildren();
 		else
 			allItems.append(ite);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -16391,7 +16391,7 @@
 		{
 			it = pa.items.at(o);
 			if (it->isGroup())
-				allItems = it->asGroupFrame()->getItemList();
+				allItems = it->getAllChildren();
 			else
 				allItems.append(it);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -18116,7 +18116,7 @@
 		PageItem* item = allItems.takeFirst();
 		if (item->isGroup() || item->isTable())
 		{
-			allItems = item->getItemList() + allItems;
+			allItems = item->getChildren() + allItems;
 			continue;
 		}
 		if (item->isTextFrame())
@@ -18270,7 +18270,7 @@
 					break;
 			}
 			if (it->isGroup())
-				allItems = it->asGroupFrame()->getItemList();
+				allItems = it->getAllChildren();
 			else
 				allItems.append(it);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -18294,7 +18294,7 @@
 	{
 		it = itf.value();
 		if (it->isGroup())
-			allItems = it->asGroupFrame()->getItemList();
+			allItems = it->getAllChildren();
 		else
 			allItems.append(it);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -18321,7 +18321,7 @@
 		{
 			it = pa.items.at(o);
 			if (it->isGroup())
-				allItems = it->asGroupFrame()->getItemList();
+				allItems = it->getAllChildren();
 			else
 				allItems.append(it);
 			for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h	(original)
+++ trunk/Scribus/scribus/scribusdoc.h	Thu Nov 23 19:23:08 2017
@@ -1095,7 +1095,7 @@
 		{
 			QList<PageItem*> allItems;
 			if (item->isGroup())
-				allItems = item->asGroupFrame()->getItemList();
+				allItems = item->asGroupFrame()->getAllChildren();
 			else
 				allItems.append(item);
 			for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Thu Nov 23 19:23:08 2017
@@ -2801,7 +2801,7 @@
 			currItem = itemList.takeFirst();
 			if (currItem->isGroup())
 			{
-				itemList = currItem->getItemList() + itemList;
+				itemList = currItem->getChildren() + itemList;
 				continue;
 			}
 			if (!currItem->asImageFrame() || !currItem->imageIsAvailable)
@@ -2831,7 +2831,7 @@
 			currItem = itemList.takeFirst();
 			if (currItem->isGroup())
 			{
-				itemList = currItem->getItemList() + itemList;
+				itemList = currItem->getChildren() + itemList;
 				continue;
 			}
 			double w = currItem->visualWidth();

Modified: trunk/Scribus/scribus/sctextstruct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/sctextstruct.cpp
==============================================================================
--- trunk/Scribus/scribus/sctextstruct.cpp	(original)
+++ trunk/Scribus/scribus/sctextstruct.cpp	Thu Nov 23 19:23:08 2017
@@ -54,7 +54,7 @@
 		PageItem* dItem = doc->FrameItems[embedded];
 		result.append(dItem);
 		if (dItem->isGroup())
-			result = dItem->getItemList();
+			result = dItem->getAllChildren();
 	}
 	return result;
 }

Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp	(original)
+++ trunk/Scribus/scribus/ui/annot.cpp	Thu Nov 23 19:23:08 2017
@@ -474,7 +474,7 @@
 	{
 		PageItem *currItem = view->Doc->Items->at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Thu Nov 23 19:23:08 2017
@@ -662,7 +662,7 @@
 					{
 						PageItem *currItem = currDoc->Items->at(a);
 						if (currItem->isGroup())
-							allItems = currItem->getItemList();
+							allItems = currItem->getAllChildren();
 						else
 							allItems.append(currItem);
 						for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/ui/picstatus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/picstatus.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picstatus.cpp	(original)
+++ trunk/Scribus/scribus/ui/picstatus.cpp	Thu Nov 23 19:23:08 2017
@@ -125,7 +125,7 @@
 	{
 		PageItem *currItem = m_Doc->MasterItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -149,7 +149,7 @@
 	{
 		PageItem *currItem = m_Doc->DocItems.at(i);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	Thu Nov 23 19:23:08 2017
@@ -313,7 +313,7 @@
 		{
 			PageItem *currItem = it.value();
 			if (currItem->isGroup())
-				allItems = currItem->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -328,7 +328,7 @@
 		{
 			PageItem *currItem = m_doc->MasterItems.at(a);
 			if (currItem->isGroup())
-				allItems = currItem->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)
@@ -343,7 +343,7 @@
 		{
 			PageItem *currItem = m_doc->DocItems.at(a);
 			if (currItem->isGroup())
-				allItems = currItem->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp	Thu Nov 23 19:23:08 2017
@@ -111,7 +111,7 @@
 		{
 			PageItem *currItem = m_Doc->DocItems.at(a);
 			if (currItem->isGroup())
-				allItems = currItem->getItemList();
+				allItems = currItem->getAllChildren();
 			else
 				allItems.append(currItem);
 			for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp	Thu Nov 23 19:23:08 2017
@@ -1205,7 +1205,7 @@
 	{
 		PageItem *currItem = m_doc->Items->at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/ui/selfield.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/selfield.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selfield.cpp	(original)
+++ trunk/Scribus/scribus/ui/selfield.cpp	Thu Nov 23 19:23:08 2017
@@ -47,7 +47,7 @@
 	{
 		PageItem *currItem = Doc->Items->at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)

Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22224&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp	(original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp	Thu Nov 23 19:23:08 2017
@@ -420,7 +420,7 @@
 	{
 		PageItem *currItem = it.value();
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -440,7 +440,7 @@
 	{
 		PageItem *currItem = m_Doc->MasterItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)
@@ -460,7 +460,7 @@
 	{
 		PageItem *currItem = m_Doc->DocItems.at(a);
 		if (currItem->isGroup())
-			allItems = currItem->getItemList();
+			allItems = currItem->getAllChildren();
 		else
 			allItems.append(currItem);
 		for (int ii = 0; ii < allItems.count(); ii++)




More information about the scribus-commit mailing list