View Issue Details

IDProjectCategoryView StatusLast Update
0018012ScribusImport / Exportpublic2026-10-14 10:47
Reporterbuttar Assigned To 
PrioritynormalSeverityminorReproducibilityalways
Status newResolutionopen 
PlatformLinuxOSFedora WorkstationOS Version44
Product Version1.7.4.svn 
Summary0018012: [patch] Fix inline object corruption during page import
DescriptionImporting inline objects could corrupt Undo/Redo state, create stray frames and crash Scribus when closing the document.

## Fix:
- Baseline: r27881 + PIL1 v1.05 (from 0018011).
- Prevent repeated inline-object creation and source-ID collisions.
- Remap inline-object references without modifying existing destination objects.
- Correct inline-object ownership and Undo/Redo handling, preventing stray objects and close-time crashes.
Steps To Reproduce1. Create a source document containing inline objects in text frames.
2. Import its pages into a destination document already containing inline objects.
3. Perform Undo → Redo.
4. Observe stray frames (some empty ones, visible outline when selected); closing the document may crash Scribus.
Tags#please_test
Attached Files
pil2-inline-object-integrity-v1.02.patch (7,111 bytes)   
Index: scribus/pageimportlinks.h
===================================================================
--- scribus/pageimportlinks.h	(revision 27881)
+++ scribus/pageimportlinks.h	(working copy)
@@ -7,6 +7,7 @@
 #ifndef SCRIBUS_PAGEIMPORTLINKS_H
 #define SCRIBUS_PAGEIMPORTLINKS_H
 
+#include <QHash>
 #include <QMap>
 #include <QSet>
 
@@ -39,6 +40,8 @@
 
 	QMap<int, Frame> frames;
 	QSet<int> duplicateIds;
+	// Source inline ID -> destination inline ID, shared across imported pages.
+	QHash<int, int>* inlineIds {nullptr};
 };
 
 #endif
Index: scribus/plugins/fileloader/scribus171format/scribus171format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus171format/scribus171format.cpp	(revision 27881)
+++ scribus/plugins/fileloader/scribus171format/scribus171format.cpp	(working copy)
@@ -5022,10 +5022,17 @@
 
 	if (tagName == QLatin1String("FRAMEOBJECT") || tagName == QLatin1String("FrameObject"))
 	{
-		if (newItem->inlineCharID == -1)
-			FrameItems.append(m_Doc->Items->takeAt(m_Doc->Items->indexOf(newItem)));
+		const int sourceId = newItem->inlineCharID;
+		doc->Items->removeOne(newItem);
+		if (m_pageImportLinks && readObjectParams.loadingPage && m_pageImportLinks->inlineIds && sourceId >= 0)
+		{
+			const int destinationId = doc->addToInlineFrames(newItem);
+			m_pageImportLinks->inlineIds->insert(sourceId, destinationId);
+		}
+		else if (sourceId == -1)
+			FrameItems.append(newItem);
 		else
-			doc->FrameItems.insert(newItem->inlineCharID, doc->Items->takeAt(doc->Items->indexOf(newItem)));
+			doc->FrameItems.insert(sourceId, newItem);
 		newItem->setLayer(doc->firstLayerID());
 	}
 
@@ -6004,7 +6011,15 @@
 		int pos = story.length();
 		if (ch == SpecialChars::OBJECT)
 		{
-			if (LinkID.contains(iobj))
+			if (m_pageImportLinks && m_pageImportLinks->inlineIds)
+			{
+				auto it = m_pageImportLinks->inlineIds->constFind(iobj);
+				if (it != m_pageImportLinks->inlineIds->cend())
+					story.insertObject(pos, it.value());
+				else
+					qDebug() << "scribus171format: missing imported inline object:" << iobj;
+			}
+			else if (LinkID.contains(iobj))
 			{
 				if (FrameItems.contains(LinkID[iobj]))
 				{
@@ -8553,16 +8568,51 @@
 				continue;
 			}
 
+			const bool isInlineObject = tagName == QLatin1String("FRAMEOBJECT") || tagName == QLatin1String("FrameObject");
+			const bool mapInlineId = isInlineObject && m_pageImportLinks && m_pageImportLinks->inlineIds;
+			const int sourceInlineId = isInlineObject ? attrs.valueAsInt("InID", -1) : -1;
+			if (isInlineObject && m_pageImportLinks && sourceInlineId < 0)
+			{
+				success = false; // An imported inline object needs a valid source ID.
+				break;
+			}
+			if (mapInlineId && sourceInlineId >= 0 && m_pageImportLinks->inlineIds->contains(sourceInlineId))
+			{
+				reader.readToElementEnd();
+				continue; // Already imported from this source.
+			}
+
 			ItemInfo itemInfo;
-			success = readObject(m_Doc, reader, readObjectParams, itemInfo);
+			if (isInlineObject && m_pageImportLinks)
+			{
+				UndoBlocker blocker; // Inline resources are not ordinary page-item creations.
+				success = readObject(m_Doc, reader, readObjectParams, itemInfo);
+			}
+			else
+				success = readObject(m_Doc, reader, readObjectParams, itemInfo);
 			if (!success)
 				break;
 
 			PageItem* newItem = itemInfo.item;
 			const bool isPageObject = (tagName == QLatin1String("PAGEOBJECT") || tagName == QLatin1String("PageObject"));
-			newItem->moveBy(-pageX + newPage->xOffset() + (isPageObject ? contentShiftX : 0.0),
-			                -pageY + newPage->yOffset() + (isPageObject ? contentShiftY : 0.0));
-			newItem->setOwnerPage(m_Doc->currentPageNumber());
+			if (isInlineObject)
+			{
+				newItem->setOwnerPage(-1);
+				if (mapInlineId && sourceInlineId >= 0 &&
+				    m_pageImportLinks->inlineIds->contains(sourceInlineId) && UndoManager::undoEnabled())
+				{
+					auto* state = new SimpleState("Import Inline Object");
+					state->set("IMPORT_INLINE_OBJECT");
+					state->set("INLINE_ID", m_pageImportLinks->inlineIds->value(sourceInlineId));
+					UndoManager::instance()->action(m_Doc, state);
+				}
+			}
+			else
+			{
+				newItem->moveBy(-pageX + newPage->xOffset() + (isPageObject ? contentShiftX : 0.0),
+				                -pageY + newPage->yOffset() + (isPageObject ? contentShiftY : 0.0));
+				newItem->setOwnerPage(m_Doc->currentPageNumber());
+			}
 			if (isPageObject)
 				newItem->setMasterPageName(QString());
 			else if (Mpage && !renamedPageName.isEmpty())
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 27881)
+++ scribus/scribus.cpp	(working copy)
@@ -3404,6 +3404,7 @@
 		if (nrToImport > 0)
 		{
 			PageImportLinks importLinks;
+			QHash<int, int> inlineIds;
 			bool allPagesLoaded = true;
 			int failedSourcePage = -1;
 			mainWindowProgressBar->reset();
@@ -3413,6 +3414,7 @@
 			{
 				view->GotoPa(counter);
 				PageImportLinks pageLinks;
+				pageLinks.inlineIds = &inlineIds;
 				if (!loadPage(dia->getFromDoc(), pageNs[i] - 1, false, QString(), &pageLinks))
 				{
 					allPagesLoaded = false;
Index: scribus/scribusdoc.h
===================================================================
--- scribus/scribusdoc.h	(revision 27881)
+++ scribus/scribusdoc.h	(working copy)
@@ -1418,6 +1418,8 @@
 		//! The list of page items
 		QList<PageItem*> DocItems;
 		QHash<int, PageItem*> FrameItems;
+		// Imported inline objects detached by Undo and retained for Redo.
+		QHash<int, PageItem*> m_undoneImportInlineFrames;
 		QList<PageItem*> EditFrameItems;
 
 		Selection* const m_Selection;
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 27881)
+++ scribus/scribusdoc.cpp	(working copy)
@@ -612,6 +612,8 @@
 	while (!tmList.isEmpty())
 		delete tmList.takeFirst();
 	FrameItems.clear();
+	qDeleteAll(m_undoneImportInlineFrames);
+	m_undoneImportInlineFrames.clear();
 
 	while (!MasterPages.isEmpty())
 		delete MasterPages.takeFirst();
@@ -1851,6 +1853,23 @@
 	auto *ss = dynamic_cast<SimpleState*>(state);
 	if (!ss)
 		return;
+
+	// Preserve detached inline objects for Redo; the document owns them until destruction.
+	if (ss->contains("IMPORT_INLINE_OBJECT"))
+	{
+		const int id = ss->getInt("INLINE_ID");
+		if (isUndo && !m_undoneImportInlineFrames.contains(id))
+		{
+			if (PageItem* item = FrameItems.take(id))
+				m_undoneImportInlineFrames.insert(id, item);
+		}
+		else if (!isUndo && !FrameItems.contains(id))
+		{
+			if (PageItem* item = m_undoneImportInlineFrames.take(id))
+				FrameItems.insert(id, item);
+		}
+		return;
+	}
 
 	bool layersUndo = false;
 	if (ss->contains("GROUP"))
@@ -17508,7 +17527,7 @@
 	QRandomGenerator* randGen = QRandomGenerator::global();
 
 	int fIndex = randGen->bounded(RAND_MAX);
-	while (FrameItems.contains(fIndex))
+	while (FrameItems.contains(fIndex) || m_undoneImportInlineFrames.contains(fIndex))
 		fIndex = randGen->bounded(RAND_MAX);
 	item->inlineCharID = fIndex;
 
PatchYes

Activities

Issue History

Date Modified Username Field Change
2026-10-14 10:47 buttar New Issue
2026-10-14 10:47 buttar Tag Attached: #please_test
2026-10-14 10:47 buttar File Added: pil2-inline-object-integrity-v1.02.patch