From be63934c327a69dd092a8c29a8397a341f0d7040 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Mon, 30 May 2016 21:32:55 +0400 Subject: [PATCH] PageItem cutting and deleting has been forbidden --- limereport/lrpagedesignintf.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp index 7242309..3aa2cf4 100644 --- a/limereport/lrpagedesignintf.cpp +++ b/limereport/lrpagedesignintf.cpp @@ -1224,12 +1224,12 @@ void PageDesignIntf::paste() void PageDesignIntf::deleteSelected() { if (selectedItems().count()==1){ - saveCommand(removeReportItemCommand(dynamic_cast(selectedItems().at(0)))); + if (!dynamic_cast(selectedItems().at(0))) + saveCommand(removeReportItemCommand(dynamic_cast(selectedItems().at(0)))); } else { QList itemsToDelete = selectedItems(); - CommandGroup::Ptr commandGroup = CommandGroup::create(); QList bands; @@ -1270,7 +1270,7 @@ void PageDesignIntf::deleteSelected() } void PageDesignIntf::cut() -{ +{ CommandIf::Ptr command = CutCommand::create(this); saveCommand(command); } @@ -1797,11 +1797,13 @@ CommandIf::Ptr CutCommand::create(PageDesignIntf *page) command->setPage(page); ItemsWriterIntf *writer = new XMLWriter(); foreach(QGraphicsItem * item, page->selectedItems()) { - BaseDesignIntf *reportItem = dynamic_cast(item); - - if (reportItem) { - command->m_itemNames.push_back(reportItem->objectName()); - writer->putItem(reportItem); + if (!dynamic_cast(item)){ + BaseDesignIntf *reportItem = dynamic_cast(item); + + if (reportItem) { + command->m_itemNames.push_back(reportItem->objectName()); + writer->putItem(reportItem); + } } } command->setXML(writer->saveToString());